diff options
Diffstat (limited to 'target/nios2')
| -rw-r--r-- | target/nios2/cpu.h | 2 | ||||
| -rw-r--r-- | target/nios2/helper.c | 6 | ||||
| -rw-r--r-- | target/nios2/mmu.c | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index 88823a6d4d..204b39add7 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -252,7 +252,7 @@ static inline int cpu_mmu_index(CPUNios2State *env, bool ifetch) MMU_SUPERVISOR_IDX; } -int nios2_cpu_handle_mmu_fault(CPUState *env, vaddr address, +int nios2_cpu_handle_mmu_fault(CPUState *env, vaddr address, int size, int rw, int mmu_idx); static inline int cpu_interrupts_enabled(CPUNios2State *env) diff --git a/target/nios2/helper.c b/target/nios2/helper.c index 9f741a8f19..a169c91eaa 100644 --- a/target/nios2/helper.c +++ b/target/nios2/helper.c @@ -37,7 +37,8 @@ void nios2_cpu_do_interrupt(CPUState *cs) env->regs[R_EA] = env->regs[R_PC] + 4; } -int nios2_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, int mmu_idx) +int nios2_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, + int rw, int mmu_idx) { cs->exception_index = 0xaa; /* Page 0x1000 is kuser helper */ @@ -232,7 +233,8 @@ static int cpu_nios2_handle_virtual_page( return 1; } -int nios2_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, int mmu_idx) +int nios2_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, + int rw, int mmu_idx) { Nios2CPU *cpu = NIOS2_CPU(cs); CPUNios2State *env = &cpu->env; diff --git a/target/nios2/mmu.c b/target/nios2/mmu.c index 0cd8647510..69b71cba4a 100644 --- a/target/nios2/mmu.c +++ b/target/nios2/mmu.c @@ -35,12 +35,12 @@ #define MMU_LOG(x) #endif -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 = nios2_cpu_handle_mmu_fault(cs, addr, access_type, mmu_idx); + ret = nios2_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); |