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/cris | |
| 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/cris')
| -rw-r--r-- | target/cris/cpu.h | 2 | ||||
| -rw-r--r-- | target/cris/helper.c | 4 | ||||
| -rw-r--r-- | target/cris/op_helper.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/target/cris/cpu.h b/target/cris/cpu.h index b64fa3542c..764b35cbae 100644 --- a/target/cris/cpu.h +++ b/target/cris/cpu.h @@ -283,7 +283,7 @@ static inline int cpu_mmu_index (CPUCRISState *env, bool ifetch) return !!(env->pregs[PR_CCS] & U_FLAG); } -int cris_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, +int cris_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int size, int rw, int mmu_idx); /* Support function regs. */ diff --git a/target/cris/helper.c b/target/cris/helper.c index af78cca8b9..d2ec349191 100644 --- a/target/cris/helper.c +++ b/target/cris/helper.c @@ -53,7 +53,7 @@ void crisv10_cpu_do_interrupt(CPUState *cs) cris_cpu_do_interrupt(cs); } -int cris_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, +int cris_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int mmu_idx) { CRISCPU *cpu = CRIS_CPU(cs); @@ -76,7 +76,7 @@ static void cris_shift_ccs(CPUCRISState *env) env->pregs[PR_CCS] = ccs; } -int cris_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, +int cris_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, int mmu_idx) { CRISCPU *cpu = CRIS_CPU(cs); diff --git a/target/cris/op_helper.c b/target/cris/op_helper.c index e92505c907..becd831b6b 100644 --- a/target/cris/op_helper.c +++ b/target/cris/op_helper.c @@ -41,8 +41,8 @@ /* Try to fill the TLB and return an exception if error. If retaddr is 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) { CRISCPU *cpu = CRIS_CPU(cs); CPUCRISState *env = &cpu->env; @@ -50,7 +50,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type, D_LOG("%s pc=%x tpc=%x ra=%p\n", __func__, env->pc, env->pregs[PR_EDA], (void *)retaddr); - ret = cris_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx); + ret = cris_cpu_handle_mmu_fault(cs, addr, size, access_type, mmu_idx); if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ |