From 3190a32782a36109a90811349f96f4379cbdb87c Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Sun, 11 Feb 2018 17:06:31 -0500 Subject: [PATCH] target-mips: Don't use _raw load/store accessors Use cpu_*_data instead of the direct *_raw load/store accessors. Backports commit 15353001197c413f3ddebd51152a514dce08c458 from qemu --- qemu/target-mips/op_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/target-mips/op_helper.c b/qemu/target-mips/op_helper.c index 15b85a74..38369d82 100644 --- a/qemu/target-mips/op_helper.c +++ b/qemu/target-mips/op_helper.c @@ -73,7 +73,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) \ @@ -100,7 +100,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) \