From 4d259dda9a0db5434203aac467fcc50dc2d1ff71 Mon Sep 17 00:00:00 2001 From: Leon Alrae Date: Sun, 11 Feb 2018 17:14:30 -0500 Subject: [PATCH] target-mips: ll and lld cause AdEL exception for unaligned address Backports commit 6489dd250a4d6e86ecbb4badf82cc102afe26f33 from qemu --- qemu/target-mips/op_helper.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/qemu/target-mips/op_helper.c b/qemu/target-mips/op_helper.c index 38369d82..3e28c65a 100644 --- a/qemu/target-mips/op_helper.c +++ b/qemu/target-mips/op_helper.c @@ -303,16 +303,20 @@ static inline hwaddr do_translate_address(CPUMIPSState *env, } } -#define HELPER_LD_ATOMIC(name, insn) \ +#define HELPER_LD_ATOMIC(name, insn, almask) \ target_ulong helper_##name(CPUMIPSState *env, target_ulong arg, int mem_idx) \ { \ + if (arg & almask) { \ + env->CP0_BadVAddr = arg; \ + helper_raise_exception(env, EXCP_AdEL); \ + } \ env->lladdr = do_translate_address(env, arg, 0); \ env->llval = do_##insn(env, arg, mem_idx); \ return env->llval; \ } -HELPER_LD_ATOMIC(ll, lw) +HELPER_LD_ATOMIC(ll, lw, 0x3) #ifdef TARGET_MIPS64 -HELPER_LD_ATOMIC(lld, ld) +HELPER_LD_ATOMIC(lld, ld, 0x7) #endif #undef HELPER_LD_ATOMIC