diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-06 18:33:25 +0000 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2017-11-07 21:59:18 +0200 |
| commit | 8d8cb956e0a679fcf0a8e24f1b2f34e038cdd48e (patch) | |
| tree | d617d85aea69bb808ff2f91c3177c01aa16994ee /target/sparc | |
| parent | 15e692a6fc716f32976eea47946a4892e8ad7a3f (diff) | |
| download | qemu-8d8cb956e0a679fcf0a8e24f1b2f34e038cdd48e.tar.gz | |
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: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Diffstat (limited to 'target/sparc')
| -rw-r--r-- | target/sparc/mmu_helper.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c index 126ea5e3ee..d5b6c1e48c 100644 --- a/target/sparc/mmu_helper.c +++ b/target/sparc/mmu_helper.c @@ -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; } |