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

target-sparc: Fix address masking in ldqf and stqf.

Browse Source 
Use address_mask on both addr and addr+8 in both these routines,
rather than explicit masking with 0xffffffff.

Reformulate address_mask to return a result, rather than masking
a pass-by-reference argument.

Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Richard Henderson 2010-04-22 22:56:42 -07:00 committed by Blue Swirl
parent 6c557ab975
commit 41db525e9c
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
target-sparc/op_helper.c
View File

@ -201,12 +201,13 @@ static void replace_tlb_1bit_lru(SparcTLBEntry *tlb,
#endif #endif
static inline void address_mask(CPUState *env1, target_ulong *addr) static inline target_ulong address_mask(CPUState *env1, target_ulong addr)
{ {
#ifdef TARGET_SPARC64 #ifdef TARGET_SPARC64
if (AM_CHECK(env1)) if (AM_CHECK(env1))
*addr &= 0xffffffffULL; addr &= 0xffffffffULL;
#endif #endif
return addr;
} }
static void raise_exception(int tt) static void raise_exception(int tt)
@ -1923,7 +1924,7 @@ uint64_t helper_ld_asi(target_ulong addr, int asi, int size, int sign)
raise_exception(TT_PRIV_ACT); raise_exception(TT_PRIV_ACT);
helper_check_align(addr, size - 1); helper_check_align(addr, size - 1);
address_mask(env, &addr); addr = address_mask(env, addr);
switch (asi) { switch (asi) {
case 0x82: // Primary no-fault case 0x82: // Primary no-fault
@ -2026,7 +2027,7 @@ void helper_st_asi(target_ulong addr, target_ulong val, int asi, int size)
raise_exception(TT_PRIV_ACT); raise_exception(TT_PRIV_ACT);
helper_check_align(addr, size - 1); helper_check_align(addr, size - 1);
address_mask(env, &addr); addr = address_mask(env, addr);
/* Convert to little endian */ /* Convert to little endian */
switch (asi) { switch (asi) {
@ -2944,8 +2945,7 @@ void helper_stdf(target_ulong addr, int mem_idx)
break; break;
} }
#else #else
address_mask(env, &addr); stfq_raw(address_mask(env, addr), DT0);
stfq_raw(addr, DT0);
#endif #endif
} }
@ -2969,8 +2969,7 @@ void helper_lddf(target_ulong addr, int mem_idx)
break; break;
} }
#else #else
address_mask(env, &addr); DT0 = ldfq_raw(address_mask(env, addr));
DT0 = ldfq_raw(addr);
#endif #endif
} }
@ -3003,9 +3002,8 @@ void helper_ldqf(target_ulong addr, int mem_idx)
break; break;
} }
#else #else
address_mask(env, &addr); u.ll.upper = ldq_raw(address_mask(env, addr));
u.ll.upper = ldq_raw(addr); u.ll.lower = ldq_raw(address_mask(env, addr + 8));
u.ll.lower = ldq_raw((addr + 8) & 0xffffffffULL);
QT0 = u.q; QT0 = u.q;
#endif #endif
} }
@ -3040,9 +3038,8 @@ void helper_stqf(target_ulong addr, int mem_idx)
} }
#else #else
u.q = QT0; u.q = QT0;
address_mask(env, &addr); stq_raw(address_mask(env, addr), u.ll.upper);
stq_raw(addr, u.ll.upper); stq_raw(address_mask(env, addr + 8), u.ll.lower);
stq_raw((addr + 8) & 0xffffffffULL, u.ll.lower);
#endif #endif
} }