david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ppc: Fix fault PC reporting for lve*/stve* VMX instructions

Browse Source 
We forgot to do gen_update_nip() for these like we do with other
helpers. Fix this, but in a more efficient way by passing the RA
to the accessors instead so the overhead is only taken on faults.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Benjamin Herrenschmidt 2016-07-27 08:20:55 +10:00 committed by David Gibson
parent aaf89c8a49
commit bcd510b141
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
target-ppc/mem_helper.c
View File

@ -232,16 +232,16 @@ target_ulong helper_lscbx(CPUPPCState *env, target_ulong addr, uint32_t reg,
\ \
if (needs_byteswap(env)) { \ if (needs_byteswap(env)) { \
r->element[LO_IDX ? index : (adjust - index)] = \ r->element[LO_IDX ? index : (adjust - index)] = \
swap(access(env, addr)); \ swap(access(env, addr, GETPC())); \
} else { \ } else { \
r->element[LO_IDX ? index : (adjust - index)] = \ r->element[LO_IDX ? index : (adjust - index)] = \
access(env, addr); \ access(env, addr, GETPC()); \
} \ } \
} }
#define I(x) (x) #define I(x) (x)
LVE(lvebx, cpu_ldub_data, I, u8) LVE(lvebx, cpu_ldub_data_ra, I, u8)
LVE(lvehx, cpu_lduw_data, bswap16, u16) LVE(lvehx, cpu_lduw_data_ra, bswap16, u16)
LVE(lvewx, cpu_ldl_data, bswap32, u32) LVE(lvewx, cpu_ldl_data_ra, bswap32, u32)
#undef I #undef I
#undef LVE #undef LVE
@ -259,16 +259,17 @@ LVE(lvewx, cpu_ldl_data, bswap32, u32)
\ \
if (needs_byteswap(env)) { \ if (needs_byteswap(env)) { \
access(env, addr, swap(r->element[LO_IDX ? index : \ access(env, addr, swap(r->element[LO_IDX ? index : \
(adjust - index)])); \ (adjust - index)]), \
GETPC()); \
} else { \ } else { \
access(env, addr, r->element[LO_IDX ? index : \ access(env, addr, r->element[LO_IDX ? index : \
(adjust - index)]); \ (adjust - index)], GETPC()); \
} \ } \
} }
#define I(x) (x) #define I(x) (x)
STVE(stvebx, cpu_stb_data, I, u8) STVE(stvebx, cpu_stb_data_ra, I, u8)
STVE(stvehx, cpu_stw_data, bswap16, u16) STVE(stvehx, cpu_stw_data_ra, bswap16, u16)
STVE(stvewx, cpu_stl_data, bswap32, u32) STVE(stvewx, cpu_stl_data_ra, bswap32, u32)
#undef I #undef I
#undef LVE #undef LVE