diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-08-26 03:01:33 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 19:20:46 +0100 |
| commit | 7510454e3e74aafa2e6c50388bf24904644b6a96 (patch) | |
| tree | d529c51ffa5633e8e067ae092bbc33bcf9a7bd8f /target-lm32 | |
| parent | 7372c2b926200db295412efbb53f93773b7f1754 (diff) | |
cpu: Turn cpu_handle_mmu_fault() into a CPUClass hook
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 <afaerber@suse.de>
Diffstat (limited to 'target-lm32')
| -rw-r--r-- | target-lm32/cpu.c | 4 | ||||
| -rw-r--r-- | target-lm32/cpu.h | 3 | ||||
| -rw-r--r-- | target-lm32/helper.c | 4 | ||||
| -rw-r--r-- | target-lm32/op_helper.c | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c index c157f52985..daec499502 100644 --- a/target-lm32/cpu.c +++ b/target-lm32/cpu.c @@ -266,7 +266,9 @@ static void lm32_cpu_class_init(ObjectClass *oc, void *data) cc->set_pc = lm32_cpu_set_pc; cc->gdb_read_register = lm32_cpu_gdb_read_register; cc->gdb_write_register = lm32_cpu_gdb_write_register; -#ifndef CONFIG_USER_ONLY +#ifdef CONFIG_USER_ONLY + cc->handle_mmu_fault = lm32_cpu_handle_mmu_fault; +#else cc->get_phys_page_debug = lm32_cpu_get_phys_page_debug; cc->vmsd = &vmstate_lm32_cpu; #endif diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h index e6314c0064..b94d9b007e 100644 --- a/target-lm32/cpu.h +++ b/target-lm32/cpu.h @@ -231,9 +231,8 @@ static inline CPULM32State *cpu_init(const char *cpu_model) #define cpu_gen_code cpu_lm32_gen_code #define cpu_signal_handler cpu_lm32_signal_handler -int cpu_lm32_handle_mmu_fault(CPULM32State *env, target_ulong address, int rw, +int lm32_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw, int mmu_idx); -#define cpu_handle_mmu_fault cpu_lm32_handle_mmu_fault #include "exec/cpu-all.h" diff --git a/target-lm32/helper.c b/target-lm32/helper.c index e813e7dce2..ce6dd45552 100644 --- a/target-lm32/helper.c +++ b/target-lm32/helper.c @@ -20,9 +20,11 @@ #include "cpu.h" #include "qemu/host-utils.h" -int cpu_lm32_handle_mmu_fault(CPULM32State *env, target_ulong address, int rw, +int lm32_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int rw, int mmu_idx) { + LM32CPU *cpu = LM32_CPU(cs); + CPULM32State *env = &cpu->env; int prot; address &= TARGET_PAGE_MASK; diff --git a/target-lm32/op_helper.c b/target-lm32/op_helper.c index 7189cb5cc4..774dc65cf2 100644 --- a/target-lm32/op_helper.c +++ b/target-lm32/op_helper.c @@ -153,9 +153,10 @@ uint32_t HELPER(rcsr_jrx)(CPULM32State *env) void tlb_fill(CPULM32State *env, target_ulong addr, int is_write, int mmu_idx, uintptr_t retaddr) { + LM32CPU *cpu = lm32_env_get_cpu(env); int ret; - ret = cpu_lm32_handle_mmu_fault(env, addr, is_write, mmu_idx); + ret = lm32_cpu_handle_mmu_fault(CPU(cpu), addr, is_write, mmu_idx); if (unlikely(ret)) { if (retaddr) { /* now we have a real cpu fault */ |