[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/15] linux-user/ppc: Report correct fault address f
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 12/15] linux-user/ppc: Report correct fault address for data faults |
Date: |
Mon, 20 Nov 2017 23:21:40 +0200 |
From: Peter Maydell <address@hidden>
For faults on loads and stores, ppc_cpu_handle_mmu_fault() in
target/ppc/user_only_helper.c stores the offending address
in env->spr[SPR_DAR]. Report this correctly to the guest
in si_addr, rather than incorrectly using the address of the
instruction that caused the fault.
This fixes the test case in
https://bugs.launchpad.net/qemu/+bug/1077116
for ppc, ppc64 and ppc64le.
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
linux-user/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index b6dd9efd2d..6286661bd3 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1420,7 +1420,7 @@ void cpu_loop(CPUPPCState *env)
info.si_code = TARGET_SEGV_MAPERR;
break;
}
- info._sifields._sigfault._addr = env->nip;
+ info._sifields._sigfault._addr = env->spr[SPR_DAR];
queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);
break;
case POWERPC_EXCP_ISI: /* Instruction storage exception */
--
2.14.2
- [Qemu-devel] [PULL 03/15] linux-user/hppa: Fix cpu_clone_regs, (continued)
- [Qemu-devel] [PULL 03/15] linux-user/hppa: Fix cpu_clone_regs, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 04/15] linux-user/hppa: Fix typo for TARGET_NR_epoll_wait, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 02/15] linux-user/hppa: Fix TARGET_SA_* defines, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 05/15] linux-user/hppa: Fix TARGET_MAP_TYPE, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 06/15] linux-user/hppa: Fix TARGET_F_RDLCK, TARGET_F_WRLCK, TARGET_F_UNLCK, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 08/15] linux-user/syscall.c: Handle SH4's exceptional alignment for p{read, write}64, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 11/15] linux-user/s390x: Mask si_addr for SIGSEGV, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 07/15] linux-user: Handle TARGET_MAP_STACK and TARGET_MAP_HUGETLB, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 09/15] linux-user: fix 'finshed' typo in comment, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 10/15] linux-user: return EINVAL from prctl(PR_*_SECCOMP), riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 12/15] linux-user/ppc: Report correct fault address for data faults,
riku . voipio <=
- [Qemu-devel] [PULL 13/15] linux-user/sparc: Put address for data faults where linux-user expects it, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 14/15] linux-user: Handle rt_sigaction correctly for SPARC, riku . voipio, 2017/11/20
- [Qemu-devel] [PULL 15/15] linux-user: Fix calculation of auxv length, riku . voipio, 2017/11/20
- Re: [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11, no-reply, 2017/11/20
- Re: [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11, Peter Maydell, 2017/11/21
- Re: [Qemu-devel] [PULL 00/15] late linux-user fixes for 2.11, no-reply, 2017/11/21