[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/14] target-mips: ll and lld cause AdEL exception f
From: |
Leon Alrae |
Subject: |
[Qemu-devel] [PULL 10/14] target-mips: ll and lld cause AdEL exception for unaligned address |
Date: |
Fri, 13 Feb 2015 10:02:08 +0000 |
Signed-off-by: Leon Alrae <address@hidden>
Reviewed-by: Maciej W. Rozycki <address@hidden>
---
target-mips/op_helper.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index ea7d95f..73a8e45 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
--
2.1.0
- [Qemu-devel] [PULL 05/14] piix4: use PCI address space instead of system memory, (continued)
- [Qemu-devel] [PULL 05/14] piix4: use PCI address space instead of system memory, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 03/14] jazz: remove usage of isa_mem_base, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 13/14] target-mips: pass 0 instead of -1 as rs in microMIPS LUI instruction, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 07/14] isa: remove isa_mem_base variable, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 02/14] jazz: do not explode QEMUMachineInitArgs structure, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 06/14] gt64xxx: remove isa_mem_base usage, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 01/14] isa: add memory space parameter to isa_bus_new, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 11/14] target-mips: use CP0EnLo_XI instead of magic number, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 12/14] target-mips: fix broken snapshotting, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 08/14] target-mips: Make CP0.Status.CU1 read-only for the 5Kc and 5KEc processors, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 10/14] target-mips: ll and lld cause AdEL exception for unaligned address,
Leon Alrae <=
- [Qemu-devel] [PULL 14/14] linux-user: correct stat structure in MIPS N32, Leon Alrae, 2015/02/13
- [Qemu-devel] [PULL 09/14] target-mips: fix detection of the end of the page during translation, Leon Alrae, 2015/02/13
- Re: [Qemu-devel] [PULL 00/14] target-mips queue, Peter Maydell, 2015/02/13