[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 48/66] target/ppc: Move SPR_DSISR setting to powerpc_excp
From: |
Richard Henderson |
Subject: |
[PATCH v6 48/66] target/ppc: Move SPR_DSISR setting to powerpc_excp |
Date: |
Sat, 30 Oct 2021 10:16:17 -0700 |
By doing this while sending the exception, we will have already
done the unwinding, which makes the ppc_cpu_do_unaligned_access
code a bit cleaner.
Update the comment about the expected instruction format.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/ppc/excp_helper.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index b7d1767920..88a8de4b80 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -454,13 +454,15 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int
excp_model, int excp)
break;
}
case POWERPC_EXCP_ALIGN: /* Alignment exception */
- /* Get rS/rD and rA from faulting opcode */
/*
- * Note: the opcode fields will not be set properly for a
- * direct store load/store, but nobody cares as nobody
- * actually uses direct store segments.
+ * Get rS/rD and rA from faulting opcode.
+ * Note: We will only invoke ALIGN for atomic operations,
+ * so all instructions are X-form.
*/
- env->spr[SPR_DSISR] |= (env->error_code & 0x03FF0000) >> 16;
+ {
+ uint32_t insn = cpu_ldl_code(env, env->nip);
+ env->spr[SPR_DSISR] |= (insn & 0x03FF0000) >> 16;
+ }
break;
case POWERPC_EXCP_PROGRAM: /* Program exception */
switch (env->error_code & ~0xF) {
@@ -1462,14 +1464,9 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr
vaddr,
int mmu_idx, uintptr_t retaddr)
{
CPUPPCState *env = cs->env_ptr;
- uint32_t insn;
-
- /* Restore state and reload the insn we executed, for filling in DSISR. */
- cpu_restore_state(cs, retaddr, true);
- insn = cpu_ldl_code(env, env->nip);
cs->exception_index = POWERPC_EXCP_ALIGN;
- env->error_code = insn & 0x03FF0000;
- cpu_loop_exit(cs);
+ env->error_code = 0;
+ cpu_loop_exit_restore(cs, retaddr);
}
#endif
--
2.25.1
- [PATCH v6 50/66] target/ppc: Restrict ppc_cpu_do_unaligned_access to sysemu, (continued)
- [PATCH v6 50/66] target/ppc: Restrict ppc_cpu_do_unaligned_access to sysemu, Richard Henderson, 2021/10/30
- [PATCH v6 49/66] target/ppc: Set fault address in ppc_cpu_do_unaligned_access, Richard Henderson, 2021/10/30
- [PATCH v6 59/66] tcg: Add helper_unaligned_{ld, st} for user-only sigbus, Richard Henderson, 2021/10/30
- [PATCH v6 57/66] accel/tcg: Report unaligned atomics for user-only, Richard Henderson, 2021/10/30
- [PATCH v6 60/66] linux-user: Handle BUS_ADRALN in host_signal_handler, Richard Henderson, 2021/10/30
- [PATCH v6 56/66] target/sparc: Set fault address in sparc_cpu_do_unaligned_access, Richard Henderson, 2021/10/30
- [PATCH v6 62/66] linux-user: Disable more prctl subcodes, Richard Henderson, 2021/10/30
- [PATCH v6 54/66] target/sparc: Remove DEBUG_UNALIGNED, Richard Henderson, 2021/10/30
- [PATCH v6 53/66] target/sh4: Set fault address in superh_cpu_do_unaligned_access, Richard Henderson, 2021/10/30
- [PATCH v6 65/66] target/hppa: Implement prctl_unalign_sigbus, Richard Henderson, 2021/10/30
- [PATCH v6 48/66] target/ppc: Move SPR_DSISR setting to powerpc_excp,
Richard Henderson <=
- [PATCH v6 58/66] accel/tcg: Report unaligned load/store for user-only, Richard Henderson, 2021/10/30
- [PATCH v6 63/66] linux-user: Add code for PR_GET/SET_UNALIGN, Richard Henderson, 2021/10/30
- [PATCH v6 47/66] target/microblaze: Do not set MO_ALIGN for user-only, Richard Henderson, 2021/10/30
- [PATCH v6 55/66] target/sparc: Split out build_sfsr, Richard Henderson, 2021/10/30
- [PATCH v6 61/66] linux-user: Split out do_prctl and subroutines, Richard Henderson, 2021/10/30
- [PATCH v6 64/66] target/alpha: Implement prctl_unalign_sigbus, Richard Henderson, 2021/10/30
- [PATCH v6 66/66] target/sh4: Implement prctl_unalign_sigbus, Richard Henderson, 2021/10/30
- Re: [PATCH v6 00/66] user-only: Cleanup SIGSEGV and SIGBUS handling, Philippe Mathieu-Daudé, 2021/10/31