diff options
| author | Leon Alrae <leon.alrae@imgtec.com> | 2015-01-26 16:06:43 +0000 |
|---|---|---|
| committer | Leon Alrae <leon.alrae@imgtec.com> | 2015-02-13 14:11:29 +0000 |
| commit | 6489dd250a4d6e86ecbb4badf82cc102afe26f33 (patch) | |
| tree | 13dafc0678da88d99f5e9c8bc5ed2ecc1664b106 | |
| parent | fe2372910a09034591fd2cfc2d70cca43fccaa95 (diff) | |
| download | focaccia-qemu-6489dd250a4d6e86ecbb4badf82cc102afe26f33.tar.gz focaccia-qemu-6489dd250a4d6e86ecbb4badf82cc102afe26f33.zip | |
target-mips: ll and lld cause AdEL exception for unaligned address
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com> Reviewed-by: Maciej W. Rozycki <macro@linux-mips.org>
| -rw-r--r-- | target-mips/op_helper.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index ea7d95f36c..73a8e458fc 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -304,16 +304,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 |