Commit 15e692a6 authored by Peter Maydell's avatar Peter Maydell Committed by Riku Voipio
Browse files

linux-user/ppc: Report correct fault address for data faults 

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: default avatarLaurent Vivier <laurent@vivier.eu>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent f2d34df3

linux-user/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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         */