ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-sparc: Don't use {ld, st}*_raw functions 

Instead of using the _raw family of ld/st accessor functions, use
cpu_*_data. All this code is CONFIG_USER_ONLY, so the two are the
same semantically, but the _raw functions are really a detail of
the implementation which has leaked into a few callsites like this one.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1421334118-3287-4-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2015-01-20 15:19:32 +00:00
parent 24e60305c5
commit eb513f82f0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
target-sparc/ldst_helper.c
View File

@ -1122,17 +1122,17 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr, int asi, int size,
{ {
switch (size) { switch (size) {
case 1: case 1:
ret = ldub_raw(addr); ret = cpu_ldub_data(env, addr);
break; break;
case 2: case 2:
ret = lduw_raw(addr); ret = cpu_lduw_data(env, addr);
break; break;
case 4: case 4:
ret = ldl_raw(addr); ret = cpu_ldl_data(env, addr);
break; break;
default: default:
case 8: case 8:
ret = ldq_raw(addr); ret = cpu_ldq_data(env, addr);
break; break;
} }
} }
@ -1239,17 +1239,17 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
{ {
switch (size) { switch (size) {
case 1: case 1:
stb_raw(addr, val); cpu_stb_data(env, addr, val);
break; break;
case 2: case 2:
stw_raw(addr, val); cpu_stw_data(env, addr, val);
break; break;
case 4: case 4:
stl_raw(addr, val); cpu_stl_data(env, addr, val);
break; break;
case 8: case 8:
default: default:
stq_raw(addr, val); cpu_stq_data(env, addr, val);
break; break;
} }
} }
@ -2289,8 +2289,8 @@ void helper_ldqf(CPUSPARCState *env, target_ulong addr, int mem_idx)
break; break;
} }
#else #else
u.ll.upper = ldq_raw(address_mask(env, addr)); u.ll.upper = cpu_ldq_data(env, address_mask(env, addr));
u.ll.lower = ldq_raw(address_mask(env, addr + 8)); u.ll.lower = cpu_ldq_data(env, address_mask(env, addr + 8));
QT0 = u.q; QT0 = u.q;
#endif #endif
} }
@ -2326,8 +2326,8 @@ void helper_stqf(CPUSPARCState *env, target_ulong addr, int mem_idx)
} }
#else #else
u.q = QT0; u.q = QT0;
stq_raw(address_mask(env, addr), u.ll.upper); cpu_stq_data(env, address_mask(env, addr), u.ll.upper);
stq_raw(address_mask(env, addr + 8), u.ll.lower); cpu_stq_data(env, address_mask(env, addr + 8), u.ll.lower);
#endif #endif
} }