diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-20 16:19:58 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-20 16:19:58 +0000 |
| commit | 699eae17b841e6784dc3864bf357e26bff1e9dfe (patch) | |
| tree | 3f46b5de6be3f2033fb67b4d93bb031a98d8e69a /target-mips/op_helper.c | |
| parent | a5bd4470ed34b7cf49bda7ea3dcad3a269c99ada (diff) | |
| parent | de5ee4a888667ca0a198f0743d70075d70564117 (diff) | |
| download | qemu-699eae17b841e6784dc3864bf357e26bff1e9dfe.zip qemu-699eae17b841e6784dc3864bf357e26bff1e9dfe.tar.gz qemu-699eae17b841e6784dc3864bf357e26bff1e9dfe.tar.bz2 | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-misc-20150120' into staging
Miscellaneous cross-tree patches:
* load/store helper cleanup
* drop TARGET_HAS_ICE define and checks
* scripts/qapi-types.py: Add dummy member to empty structs
* cpu_ldst.h: Don't define helpers if MMU_MODE*_SUFFIX not defined
# gpg: Signature made Tue 20 Jan 2015 15:43:38 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
* remotes/pmaydell/tags/pull-misc-20150120:
cpu_ldst.h: Don't define helpers if MMU_MODE*_SUFFIX not defined
cpu_ldst.h, cpu-all.h, bswap.h: Update documentation on ld/st accessors
cpu_ldst_template.h: Drop unused cpu_ldfq/stfq/ldfl/stfl accessors
cpu_ldst.h: Drop unused _raw macros, saddr() and laddr()
cpu_ldst_template.h: Use ld*_p directly rather than via ld*_raw macros
cpu_ldst.h: Use inline functions for usermode cpu_ld/st accessors
cpu_ldst.h: Remove unused very short ld*/st* defines
cpu_ldst.h: Drop unused ld/st*_kernel defines
target-mips: Don't use _raw load/store accessors
linux-user/main.c (m68k): Use get_user_u16 rather than lduw in cpu_loop
linux-user/vm86.c: Use cpu_ldl_data &c rather than plain ldl &c
bsd-user/elfload.c: Don't use ldl() or ldq_raw()
linux-user/elfload.c: Don't use _raw accessor functions
target-sparc: Don't use {ld, st}*_raw functions
monitor.c: Use ld*_p() instead of ld*_raw()
cpu_ldst.h: Remove unused ldul_ macros
exec.c: Drop TARGET_HAS_ICE define and checks
scripts/qapi-types.py: Add dummy member to empty structs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-mips/op_helper.c')
| -rw-r--r-- | target-mips/op_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index d619ba4..ea7d95f 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -74,7 +74,7 @@ void helper_raise_exception(CPUMIPSState *env, uint32_t exception) static inline type do_##name(CPUMIPSState *env, target_ulong addr, \ int mem_idx) \ { \ - return (type) insn##_raw(addr); \ + return (type) cpu_##insn##_data(env, addr); \ } #else #define HELPER_LD(name, insn, type) \ @@ -101,7 +101,7 @@ HELPER_LD(ld, ldq, int64_t) static inline void do_##name(CPUMIPSState *env, target_ulong addr, \ type val, int mem_idx) \ { \ - insn##_raw(addr, val); \ + cpu_##insn##_data(env, addr, val); \ } #else #define HELPER_ST(name, insn, type) \ |