[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 49/60] target/ppc: Set fault address in ppc_cpu_do_unaligned_acces
From: |
Richard Henderson |
Subject: |
[PULL 49/60] target/ppc: Set fault address in ppc_cpu_do_unaligned_access |
Date: |
Tue, 2 Nov 2021 07:07:29 -0400 |
We ought to have been recording the virtual address for reporting
to the guest trap handler.
Cc: qemu-ppc@nongnu.org
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/ppc/excp_helper.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 88a8de4b80..e568a54536 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -1465,6 +1465,20 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr
vaddr,
{
CPUPPCState *env = cs->env_ptr;
+ switch (env->mmu_model) {
+ case POWERPC_MMU_SOFT_4xx:
+ case POWERPC_MMU_SOFT_4xx_Z:
+ env->spr[SPR_40x_DEAR] = vaddr;
+ break;
+ case POWERPC_MMU_BOOKE:
+ case POWERPC_MMU_BOOKE206:
+ env->spr[SPR_BOOKE_DEAR] = vaddr;
+ break;
+ default:
+ env->spr[SPR_DAR] = vaddr;
+ break;
+ }
+
cs->exception_index = POWERPC_EXCP_ALIGN;
env->error_code = 0;
cpu_loop_exit_restore(cs, retaddr);
--
2.25.1
- [PULL 33/60] target/openrisc: Make openrisc_cpu_tlb_fill sysemu only, (continued)
- [PULL 33/60] target/openrisc: Make openrisc_cpu_tlb_fill sysemu only, Richard Henderson, 2021/11/02
- [PULL 40/60] target/xtensa: Make xtensa_cpu_tlb_fill sysemu only, Richard Henderson, 2021/11/02
- [PULL 42/60] hw/core: Add TCGCPUOps.record_sigbus, Richard Henderson, 2021/11/02
- [PULL 45/60] target/arm: Implement arm_cpu_record_sigbus, Richard Henderson, 2021/11/02
- [PULL 44/60] target/alpha: Implement alpha_cpu_record_sigbus, Richard Henderson, 2021/11/02
- [PULL 43/60] linux-user: Add cpu_loop_exit_sigbus, Richard Henderson, 2021/11/02
- [PULL 46/60] linux-user/hppa: Remove EXCP_UNALIGN handling, Richard Henderson, 2021/11/02
- [PULL 48/60] target/ppc: Move SPR_DSISR setting to powerpc_excp, Richard Henderson, 2021/11/02
- [PULL 41/60] accel/tcg: Restrict TCGCPUOps::tlb_fill() to sysemu, Richard Henderson, 2021/11/02
- [PULL 47/60] target/microblaze: Do not set MO_ALIGN for user-only, Richard Henderson, 2021/11/02
- [PULL 49/60] target/ppc: Set fault address in ppc_cpu_do_unaligned_access,
Richard Henderson <=
- [PULL 50/60] target/ppc: Restrict ppc_cpu_do_unaligned_access to sysemu, Richard Henderson, 2021/11/02
- [PULL 52/60] target/s390x: Implement s390x_cpu_record_sigbus, Richard Henderson, 2021/11/02
- [PULL 54/60] target/sparc: Remove DEBUG_UNALIGNED, Richard Henderson, 2021/11/02
- [PULL 57/60] accel/tcg: Report unaligned atomics for user-only, Richard Henderson, 2021/11/02
- [PULL 56/60] target/sparc: Set fault address in sparc_cpu_do_unaligned_access, Richard Henderson, 2021/11/02
- [PULL 55/60] target/sparc: Split out build_sfsr, Richard Henderson, 2021/11/02
- [PULL 51/60] linux-user/ppc: Remove POWERPC_EXCP_ALIGN handling, Richard Henderson, 2021/11/02
- [PULL 53/60] target/sh4: Set fault address in superh_cpu_do_unaligned_access, Richard Henderson, 2021/11/02
- [PULL 58/60] accel/tcg: Report unaligned load/store for user-only, Richard Henderson, 2021/11/02
- [PULL 60/60] linux-user: Handle BUS_ADRALN in host_signal_handler, Richard Henderson, 2021/11/02