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/s390x | |
| parent | 39e3e113bdb27b4144d697fbd6678a9c24740103 (diff) | |
| download | qemu-98670d47cd8d63a529ff230fd39ddaa186156f8c.zip | |
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/s390x')
| -rw-r--r-- | target/s390x/excp_helper.c | 4 | ||||
| -rw-r--r-- | target/s390x/internal.h | 2 | ||||
| -rw-r--r-- | target/s390x/mem_helper.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c index f4697a884d..e8f7a40c2b 100644 --- a/target/s390x/excp_helper.c +++ b/target/s390x/excp_helper.c @@ -55,7 +55,7 @@ void s390_cpu_do_interrupt(CPUState *cs) cs->exception_index = -1; } -int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr address, +int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int mmu_idx) { S390CPU *cpu = S390_CPU(cs); @@ -83,7 +83,7 @@ static inline uint64_t cpu_mmu_idx_to_asc(int mmu_idx) } } -int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr orig_vaddr, +int s390_cpu_handle_mmu_fault(CPUState *cs, vaddr orig_vaddr, int size, int rw, int mmu_idx) { S390CPU *cpu = S390_CPU(cs); diff --git a/target/s390x/internal.h b/target/s390x/internal.h index 1a88e4beb4..fea165ffe4 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -323,7 +323,7 @@ ObjectClass *s390_cpu_class_by_name(const char *name); void s390x_cpu_debug_excp_handler(CPUState *cs); void s390_cpu_do_interrupt(CPUState *cpu); bool s390_cpu_exec_interrupt(CPUState *cpu, int int_req); -int s390_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, +int s390_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, int mmu_idx); void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr addr, MMUAccessType access_type, diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index c957febc6d..427b795a78 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -39,10 +39,10 @@ NULL, it means that the function was called in C code (i.e. not from generated code or from helper.c) */ /* XXX: fix it to restore all registers */ -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 = s390_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx); + int ret = s390_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx); if (unlikely(ret != 0)) { cpu_loop_exit_restore(cs, retaddr); } @@ -1440,7 +1440,7 @@ static uint32_t do_csst(CPUS390XState *env, uint32_t r3, uint64_t a1, /* Sanity check writability of the store address. */ #ifndef CONFIG_USER_ONLY - probe_write(env, a2, mem_idx, ra); + probe_write(env, a2, 0, mem_idx, ra); #endif /* Note that the compare-and-swap is atomic, and the store is atomic, but |