diff options
Diffstat (limited to 'target-sh4')
| -rw-r--r-- | target-sh4/cpu.c | 4 | ||||
| -rw-r--r-- | target-sh4/cpu.h | 5 | ||||
| -rw-r--r-- | target-sh4/helper.c | 13 | ||||
| -rw-r--r-- | target-sh4/op_helper.c | 3 |
4 files changed, 16 insertions, 9 deletions
diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c index 8e7bcd248d..88960c8512 100644 --- a/target-sh4/cpu.c +++ b/target-sh4/cpu.c @@ -281,7 +281,9 @@ static void superh_cpu_class_init(ObjectClass *oc, void *data) cc->synchronize_from_tb = superh_cpu_synchronize_from_tb; cc->gdb_read_register = superh_cpu_gdb_read_register; cc->gdb_write_register = superh_cpu_gdb_write_register; -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = superh_cpu_handle_mmu_fault; +#else cc->get_phys_page_debug = superh_cpu_get_phys_page_debug; #endif dc->vmsd = &vmstate_sh_cpu; diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 808f90f1cf..a85571087d 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -193,9 +193,8 @@ SuperHCPU *cpu_sh4_init(const char *cpu_model); int cpu_sh4_exec(CPUSH4State * s); int cpu_sh4_signal_handler(int host_signum, void *pinfo, void *puc); -int cpu_sh4_handle_mmu_fault(CPUSH4State * env, target_ulong address, int rw, - int mmu_idx); -#define cpu_handle_mmu_fault cpu_sh4_handle_mmu_fault +int superh_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, + int mmu_idx); void sh4_cpu_list(FILE *f, fprintf_function cpu_fprintf); #if !defined(CONFIG_USER_ONLY) diff --git a/target-sh4/helper.c b/target-sh4/helper.c index 9ac28250e0..3f8f1fa296 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -39,9 +39,12 @@ void superh_cpu_do_interrupt(CPUState *cs) env->exception_index = -1; } -int cpu_sh4_handle_mmu_fault(CPUSH4State * env, target_ulong address, int rw, - int mmu_idx) +int superh_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, + int mmu_idx) { + SuperHCPU *cpu = SUPERH_CPU(cs); + CPUSH4State *env = &cpu->env; + env->tea = address; env->exception_index = -1; switch (rw) { @@ -447,9 +450,11 @@ static int get_physical_address(CPUSH4State * env, target_ulong * physical, return get_mmu_address(env, physical, prot, address, rw, access_type); } -int cpu_sh4_handle_mmu_fault(CPUSH4State * env, target_ulong address, int rw, - int mmu_idx) +int superh_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, + int mmu_idx) { + SuperHCPU *cpu = SUPERH_CPU(cs); + CPUSH4State *env = &cpu->env; target_ulong physical; int prot, ret, access_type; diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index e955e810b5..35f906788a 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -41,9 +41,10 @@ void tlb_fill(CPUSH4State *env, target_ulong addr, int is_write, int mmu_idx, uintptr_t retaddr) { + SuperHCPU *cpu = sh_env_get_cpu(env); int ret; - ret = cpu_sh4_handle_mmu_fault(env, addr, is_write, mmu_idx); + ret = superh_cpu_handle_mmu_fault(CPU(cpu), addr, is_write, mmu_idx); if (ret) { /* now we have a real cpu fault */ if (retaddr) { |