[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 01/68] linux-user/nios2: Hoist pc advance to the top of EXCP_T
From: |
Richard Henderson |
Subject: |
[PATCH v8 01/68] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP |
Date: |
Fri, 22 Apr 2022 09:51:31 -0700 |
Note that this advance *should* be done by the translator, as
that's the pc value that's supposed to be generated by hardware.
However, that's a much larger change across sysemu as well.
In the meantime, produce the correct PC for any signals raised
by the trap instruction. Note the special case of TRAP_BRKPT,
which itself is special cased within the kernel.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220421151735.31996-2-richard.henderson@linaro.org>
---
linux-user/nios2/cpu_loop.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/linux-user/nios2/cpu_loop.c b/linux-user/nios2/cpu_loop.c
index 1e93ef34e6..2e9296750d 100644
--- a/linux-user/nios2/cpu_loop.c
+++ b/linux-user/nios2/cpu_loop.c
@@ -40,6 +40,12 @@ void cpu_loop(CPUNios2State *env)
break;
case EXCP_TRAP:
+ /*
+ * TODO: This advance should be done in the translator, as
+ * hardware produces an advanced pc as part of all exceptions.
+ */
+ env->regs[R_PC] += 4;
+
switch (env->error_code) {
case 0:
qemu_log_mask(CPU_LOG_INT, "\nSyscall\n");
@@ -56,7 +62,6 @@ void cpu_loop(CPUNios2State *env)
env->regs[2] = abs(ret);
/* Return value is 0..4096 */
env->regs[7] = ret > 0xfffff000u;
- env->regs[R_PC] += 4;
break;
case 1:
@@ -69,6 +74,8 @@ void cpu_loop(CPUNios2State *env)
break;
case 31:
qemu_log_mask(CPU_LOG_INT, "\nTrap 31\n");
+ /* Match kernel's breakpoint_c(). */
+ env->regs[R_PC] -= 4;
force_sig_fault(TARGET_SIGTRAP, TARGET_TRAP_BRKPT,
env->regs[R_PC]);
break;
default:
@@ -99,7 +106,6 @@ void cpu_loop(CPUNios2State *env)
o = env->regs[5];
n = env->regs[6];
env->regs[2] = qatomic_cmpxchg(h, o, n) - o;
- env->regs[R_PC] += 4;
}
break;
}
--
2.34.1
- [PATCH v8 00/68] nios2 fixes, cleanups, shadow reg sets, Richard Henderson, 2022/04/22
- [PATCH v8 02/68] linux-user/nios2: Fix clone child return, Richard Henderson, 2022/04/22
- [PATCH v8 03/68] linux-user/nios2: Drop syscall 0 "workaround", Richard Henderson, 2022/04/22
- [PATCH v8 04/68] linux-user/nios2: Adjust error return, Richard Henderson, 2022/04/22
- [PATCH v8 01/68] linux-user/nios2: Hoist pc advance to the top of EXCP_TRAP,
Richard Henderson <=
- [PATCH v8 05/68] linux-user/nios2: Handle special qemu syscall return values, Richard Henderson, 2022/04/22
- [PATCH v8 06/68] linux-user/nios2: Remove do_sigreturn, Richard Henderson, 2022/04/22
- [PATCH v8 07/68] linux-user/nios2: Use QEMU_ESIGRETURN from do_rt_sigreturn, Richard Henderson, 2022/04/22
- [PATCH v8 08/68] tests/tcg/nios2: Re-enable linux-user tests, Richard Henderson, 2022/04/22
- [PATCH v8 09/68] target/nios2: Remove user-only nios2_cpu_do_interrupt, Richard Henderson, 2022/04/22
- [PATCH v8 10/68] target/nios2: Remove nios2_cpu_record_sigsegv, Richard Henderson, 2022/04/22
- [PATCH v8 11/68] target/nios2: Build helper.c for system only, Richard Henderson, 2022/04/22
- [PATCH v8 12/68] linux-user/nios2: Use force_sig_fault for EXCP_DEBUG, Richard Henderson, 2022/04/22
- [PATCH v8 14/68] target/nios2: Stop generating code if gen_check_supervisor fails, Richard Henderson, 2022/04/22
- [PATCH v8 13/68] target/nios2: Check supervisor on eret, Richard Henderson, 2022/04/22