diff options
Diffstat (limited to 'target-m68k')
| -rw-r--r-- | target-m68k/cpu.c | 4 | ||||
| -rw-r--r-- | target-m68k/cpu.h | 3 | ||||
| -rw-r--r-- | target-m68k/helper.c | 17 | ||||
| -rw-r--r-- | target-m68k/op_helper.c | 3 |
4 files changed, 16 insertions, 11 deletions
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index 7d66ed0416..46601dcd5d 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -200,7 +200,9 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data) cc->set_pc = m68k_cpu_set_pc; cc->gdb_read_register = m68k_cpu_gdb_read_register; cc->gdb_write_register = m68k_cpu_gdb_write_register; -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = m68k_cpu_handle_mmu_fault; +#else cc->get_phys_page_debug = m68k_cpu_get_phys_page_debug; #endif dc->vmsd = &vmstate_m68k_cpu; diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 5f79d2a7ef..dd1794feac 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -237,9 +237,8 @@ static inline int cpu_mmu_index (CPUM68KState *env) return (env->sr & SR_S) == 0 ? 1 : 0; } -int cpu_m68k_handle_mmu_fault(CPUM68KState *env, target_ulong address, int rw, +int m68k_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, int mmu_idx); -#define cpu_handle_mmu_fault cpu_m68k_handle_mmu_fault #include "exec/cpu-all.h" diff --git a/target-m68k/helper.c b/target-m68k/helper.c index a364eb1e5c..0ffb861d08 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -277,11 +277,13 @@ void m68k_switch_sp(CPUM68KState *env) #if defined(CONFIG_USER_ONLY) -int cpu_m68k_handle_mmu_fault (CPUM68KState *env, target_ulong address, int rw, - int mmu_idx) +int m68k_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, + int mmu_idx) { - env->exception_index = EXCP_ACCESS; - env->mmu.ar = address; + M68kCPU *cpu = M68K_CPU(cs); + + cpu->env.exception_index = EXCP_ACCESS; + cpu->env.mmu.ar = address; return 1; } @@ -295,14 +297,15 @@ hwaddr m68k_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) return addr; } -int cpu_m68k_handle_mmu_fault (CPUM68KState *env, target_ulong address, int rw, - int mmu_idx) +int m68k_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, + int mmu_idx) { + M68kCPU *cpu = M68K_CPU(cs); int prot; address &= TARGET_PAGE_MASK; prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; - tlb_set_page(env, address, address, prot, mmu_idx, TARGET_PAGE_SIZE); + tlb_set_page(&cpu->env, address, address, prot, mmu_idx, TARGET_PAGE_SIZE); return 0; } diff --git a/target-m68k/op_helper.c b/target-m68k/op_helper.c index bbbfd7f130..539d1d6724 100644 --- a/target-m68k/op_helper.c +++ b/target-m68k/op_helper.c @@ -59,9 +59,10 @@ extern int semihosting_enabled; void tlb_fill(CPUM68KState *env, target_ulong addr, int is_write, int mmu_idx, uintptr_t retaddr) { + M68kCPU *cpu = m68k_env_get_cpu(env); int ret; - ret = cpu_m68k_handle_mmu_fault(env, addr, is_write, mmu_idx); + ret = m68k_cpu_handle_mmu_fault(CPU(cpu), addr, is_write, mmu_idx); if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ |