Commit 8d8cb956 authored by Peter Maydell's avatar Peter Maydell Committed by Riku Voipio
Browse files

linux-user/sparc: Put address for data faults where linux-user expects it 



In the user-mode-only version of sparc_cpu_handle_mmu_fault(),
we must save the fault address for a data fault into the CPU
state's mmu registers, because the code in linux-user/main.c
expects to find it there in order to populate the si_addr
field of the guest siginfo.

Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
parent 15e692a6

target/sparc/mmu_helper.c

+8 −0
Original line number Diff line number Diff line
@@ -30,10 +30,18 @@ 
int sparc_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw,

                               int mmu_idx)

{

    SPARCCPU *cpu = SPARC_CPU(cs);

    CPUSPARCState *env = &cpu->env;



    if (rw & 2) {

        cs->exception_index = TT_TFAULT;

    } else {

        cs->exception_index = TT_DFAULT;

#ifdef TARGET_SPARC64

        env->dmmu.mmuregs[4] = address;

#else

        env->mmuregs[4] = address;

#endif

    }

    return 1;

}