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/hppa | |
| parent | 39e3e113bdb27b4144d697fbd6678a9c24740103 (diff) | |
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/hppa')
| -rw-r--r-- | target/hppa/cpu.h | 3 | ||||
| -rw-r--r-- | target/hppa/helper.c | 2 | ||||
| -rw-r--r-- | target/hppa/op_helper.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 8d14077763..1a35eae1fa 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -132,7 +132,8 @@ void cpu_hppa_loaded_fr0(CPUHPPAState *env); #define cpu_signal_handler cpu_hppa_signal_handler int cpu_hppa_signal_handler(int host_signum, void *pinfo, void *puc); -int hppa_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, int midx); +int hppa_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, + int rw, int midx); int hppa_cpu_gdb_read_register(CPUState *cpu, uint8_t *buf, int reg); int hppa_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); void hppa_cpu_do_interrupt(CPUState *cpu); diff --git a/target/hppa/helper.c b/target/hppa/helper.c index ba04a9a52b..23f7af7018 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -65,7 +65,7 @@ void cpu_hppa_put_psw(CPUHPPAState *env, target_ulong psw) env->psw_cb = cb; } -int hppa_cpu_handle_mmu_fault(CPUState *cs, vaddr address, +int hppa_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int mmu_idx) { HPPACPU *cpu = HPPA_CPU(cs); diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 3104404e8d..fdbf64ae3c 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -139,7 +139,7 @@ static void do_stby_e(CPUHPPAState *env, target_ulong addr, target_ulong val, /* Nothing is stored, but protection is checked and the cacheline is marked dirty. */ #ifndef CONFIG_USER_ONLY - probe_write(env, addr, cpu_mmu_index(env, 0), ra); + probe_write(env, addr, 0, cpu_mmu_index(env, 0), ra); #endif break; } |