target-mips: ll and lld cause AdEL exception for unaligned address

Backports commit 6489dd250a4d6e86ecbb4badf82cc102afe26f33 from qemu
This commit is contained in:
Leon Alrae 2018-02-11 17:14:30 -05:00 committed by Lioncash
parent c0fc9b280e
commit 4d259dda9a
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -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