[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 51/84] target/mips: Adjust exception_resume_pc()
From: |
Aleksandar Markovic |
Subject: |
[Qemu-devel] [PATCH v9 51/84] target/mips: Adjust exception_resume_pc() for nanoMIPS |
Date: |
Thu, 16 Aug 2018 16:57:44 +0200 |
From: James Hogan <address@hidden>
We shouldn't set the ISA bit in CP0_EPC for nanoMIPS.
Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: James Hogan <address@hidden>
Signed-off-by: Yongbok Kim <address@hidden>
Signed-off-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Stefan Markovic <address@hidden>
---
target/mips/helper.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/mips/helper.c b/target/mips/helper.c
index b25e000..b429671 100644
--- a/target/mips/helper.c
+++ b/target/mips/helper.c
@@ -656,7 +656,8 @@ target_ulong exception_resume_pc (CPUMIPSState *env)
target_ulong bad_pc;
target_ulong isa_mode;
- isa_mode = !!(env->hflags & MIPS_HFLAG_M16);
+ isa_mode = env->hflags & MIPS_HFLAG_M16 &&
+ !(env->insn_flags & ISA_NANOMIPS32);
bad_pc = env->active_tc.PC | isa_mode;
if (env->hflags & MIPS_HFLAG_BMASK) {
/* If the exception was raised from a delay slot, come back to
--
2.7.4
- [Qemu-devel] [PATCH v9 19/84] target/mips: Add placeholder and invocation of decode_nanomips_opc(), (continued)
- [Qemu-devel] [PATCH v9 19/84] target/mips: Add placeholder and invocation of decode_nanomips_opc(), Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 25/84] target/mips: Add emulation of nanoMIPS 16-bit load and store instructions, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 20/84] target/mips: Add nanoMIPS decoding and extraction utilities, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 24/84] target/mips: Add emulation of nanoMIPS 16-bit misc instructions, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 26/84] target/mips: Add emulation of nanoMIPS 16-bit logic instructions, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 11/84] elf: Remove duplicate preprocessor constant definition, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 23/84] target/mips: Add emulation of nanoMIPS 16-bit shift instructions, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 32/84] target/mips: Add emulation of misc nanoMIPS instructions (pool32a0), Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 31/84] target/mips: Add emulation of nanoMIPS FP instructions, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 51/84] target/mips: Adjust exception_resume_pc() for nanoMIPS,
Aleksandar Markovic <=
- [Qemu-devel] [PATCH v9 30/84] target/mips: Add emulation of nanoMIPS 48-bit instructions, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 27/84] target/mips: Add emulation of nanoMIPS 16-bit save and restore instructions, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 18/84] target/mips: Add nanoMIPS DSP ASE opcodes, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 34/84] target/mips: Add emulation of misc nanoMIPS instructions (p_lsx), Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 33/84] target/mips: Add emulation of misc nanoMIPS instructions (pool32axf), Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 36/84] target/mips: Implement emulation of nanoMIPS EXTW instruction, Aleksandar Markovic, 2018/08/16
- [Qemu-devel] [PATCH v9 39/84] target/mips: Add emulation of nanoMIPS 32-bit branch instructions, Aleksandar Markovic, 2018/08/16