From 7510454e3e74aafa2e6c50388bf24904644b6a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 26 Aug 2013 03:01:33 +0200 Subject: cpu: Turn cpu_handle_mmu_fault() into a CPUClass hook MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note that while such functions may exist both for *-user and softmmu, only *-user uses the CPUState hook, while softmmu reuses the prototype for calling it directly. Signed-off-by: Andreas Färber --- target-microblaze/cpu.c | 4 +++- target-microblaze/cpu.h | 3 +-- target-microblaze/helper.c | 14 ++++++++------ target-microblaze/op_helper.c | 3 ++- 4 files changed, 14 insertions(+), 10 deletions(-) (limited to 'target-microblaze') diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c index bbda0fd820..86ec25811e 100644 --- a/target-microblaze/cpu.c +++ b/target-microblaze/cpu.c @@ -171,7 +171,9 @@ static void mb_cpu_class_init(ObjectClass *oc, void *data) cc->set_pc = mb_cpu_set_pc; cc->gdb_read_register = mb_cpu_gdb_read_register; cc->gdb_write_register = mb_cpu_gdb_write_register; -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = mb_cpu_handle_mmu_fault; +#else cc->do_unassigned_access = mb_cpu_unassigned_access; cc->get_phys_page_debug = mb_cpu_get_phys_page_debug; #endif diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h index 78a7661778..6ccd06068c 100644 --- a/target-microblaze/cpu.h +++ b/target-microblaze/cpu.h @@ -332,9 +332,8 @@ static inline int cpu_mmu_index (CPUMBState *env) return MMU_KERNEL_IDX; } -int cpu_mb_handle_mmu_fault(CPUMBState *env, target_ulong address, int rw, +int mb_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, int mmu_idx); -#define cpu_handle_mmu_fault cpu_mb_handle_mmu_fault static inline int cpu_interrupts_enabled(CPUMBState *env) { diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c index 4fa9ce9cb5..d03f3690bb 100644 --- a/target-microblaze/helper.c +++ b/target-microblaze/helper.c @@ -36,21 +36,23 @@ void mb_cpu_do_interrupt(CPUState *cs) env->regs[14] = env->sregs[SR_PC]; } -int cpu_mb_handle_mmu_fault(CPUMBState * env, target_ulong address, int rw, +int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, int mmu_idx) { - MicroBlazeCPU *cpu = mb_env_get_cpu(env); + MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); - env->exception_index = 0xaa; - cpu_dump_state(CPU(cpu), stderr, fprintf, 0); + cpu->env.exception_index = 0xaa; + cpu_dump_state(cs, stderr, fprintf, 0); return 1; } #else /* !CONFIG_USER_ONLY */ -int cpu_mb_handle_mmu_fault (CPUMBState *env, target_ulong address, int rw, - int mmu_idx) +int mb_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, + int mmu_idx) { + MicroBlazeCPU *cpu = MICROBLAZE_CPU(cs); + CPUMBState *env = &cpu->env; unsigned int hit; unsigned int mmu_available; int r = 1; diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c index 14baa84c74..b70b2ea99c 100644 --- a/target-microblaze/op_helper.c +++ b/target-microblaze/op_helper.c @@ -44,9 +44,10 @@ void tlb_fill(CPUMBState *env, target_ulong addr, int is_write, int mmu_idx, uintptr_t retaddr) { + MicroBlazeCPU *cpu = mb_env_get_cpu(env); int ret; - ret = cpu_mb_handle_mmu_fault(env, addr, is_write, mmu_idx); + ret = mb_cpu_handle_mmu_fault(CPU(cpu), addr, is_write, mmu_idx); if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ -- cgit v1.2.1