diff options
| author | Laurent Vivier <laurent@vivier.eu> | 2018-01-18 20:38:40 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2018-01-25 16:02:24 +0100 |
| commit | 98670d47cd8d63a529ff230fd39ddaa186156f8c (patch) | |
| tree | ce2092bb342d6350919eb1fbad02dfdd446a4123 /target/lm32 | |
| parent | 39e3e113bdb27b4144d697fbd6678a9c24740103 (diff) | |
| download | qemu-98670d47cd8d63a529ff230fd39ddaa186156f8c.tar.gz | |
accel/tcg: add size paremeter in tlb_fill()
The MC68040 MMU provides the size of the access that
triggers the page fault.
This size is set in the Special Status Word which
is written in the stack frame of the access fault
exception.
So we need the size in m68k_cpu_unassigned_access() and
m68k_cpu_handle_mmu_fault().
To be able to do that, this patch modifies the prototype of
handle_mmu_fault handler, tlb_fill() and probe_write().
do_unassigned_access() already includes a size parameter.
This patch also updates handle_mmu_fault handlers and
tlb_fill() of all targets (only parameter, no code change).
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20180118193846.24953-2-laurent@vivier.eu>
Diffstat (limited to 'target/lm32')
| -rw-r--r-- | target/lm32/cpu.h | 2 | ||||
| -rw-r--r-- | target/lm32/helper.c | 2 | ||||
| -rw-r--r-- | target/lm32/op_helper.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/target/lm32/cpu.h b/target/lm32/cpu.h index 2279594f40..ce0a2f24c4 100644 --- a/target/lm32/cpu.h +++ b/target/lm32/cpu.h @@ -263,7 +263,7 @@ bool lm32_cpu_do_semihosting(CPUState *cs); #define cpu_list lm32_cpu_list #define cpu_signal_handler cpu_lm32_signal_handler -int lm32_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, +int lm32_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, int mmu_idx); #include "exec/cpu-all.h" diff --git a/target/lm32/helper.c b/target/lm32/helper.c index 929cc36c14..a039a993ff 100644 --- a/target/lm32/helper.c +++ b/target/lm32/helper.c @@ -25,7 +25,7 @@ #include "exec/semihost.h" #include "exec/log.h" -int lm32_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, +int lm32_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int mmu_idx) { LM32CPU *cpu = LM32_CPU(cs); diff --git a/target/lm32/op_helper.c b/target/lm32/op_helper.c index 30f670eee8..577f8306e3 100644 --- a/target/lm32/op_helper.c +++ b/target/lm32/op_helper.c @@ -144,12 +144,12 @@ uint32_t HELPER(rcsr_jrx)(CPULM32State *env) * NULL, it means that the function was called in C code (i.e. not * from generated code or from helper.c) */ -void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type, - int mmu_idx, uintptr_t retaddr) +void tlb_fill(CPUState *cs, target_ulong addr, int size, + MMUAccessType access_type, int mmu_idx, uintptr_t retaddr) { int ret; - ret = lm32_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx); + ret = lm32_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx); if (unlikely(ret)) { /* now we have a real cpu fault */ cpu_loop_exit_restore(cs, retaddr); |