diff options
Diffstat (limited to 'target-m68k/cpu.h')
| -rw-r--r-- | target-m68k/cpu.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 4cc3a35f2e..2c83b89cd5 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -120,8 +120,8 @@ void m68k_tcg_init(void); CPUM68KState *cpu_m68k_init(const char *cpu_model); int cpu_m68k_exec(CPUM68KState *s); void cpu_m68k_close(CPUM68KState *s); -void do_interrupt(CPUState *env1); -void do_interrupt_m68k_hardirq(CPUState *env1); +void do_interrupt(CPUM68KState *env1); +void do_interrupt_m68k_hardirq(CPUM68KState *env1); /* you can call this signal handler from your SIGBUS and SIGSEGV signal handlers to inform the virtual CPU of exceptions. non zero is returned if the signal was handled by the virtual CPU. */ @@ -226,17 +226,17 @@ void register_m68k_insns (CPUM68KState *env); #define MMU_MODE0_SUFFIX _kernel #define MMU_MODE1_SUFFIX _user #define MMU_USER_IDX 1 -static inline int cpu_mmu_index (CPUState *env) +static inline int cpu_mmu_index (CPUM68KState *env) { return (env->sr & SR_S) == 0 ? 1 : 0; } -int cpu_m68k_handle_mmu_fault(CPUState *env, target_ulong address, int rw, +int cpu_m68k_handle_mmu_fault(CPUM68KState *env, target_ulong address, int rw, int mmu_idx); #define cpu_handle_mmu_fault cpu_m68k_handle_mmu_fault #if defined(CONFIG_USER_ONLY) -static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) +static inline void cpu_clone_regs(CPUM68KState *env, target_ulong newsp) { if (newsp) env->aregs[7] = newsp; @@ -246,7 +246,7 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) #include "cpu-all.h" -static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, +static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc, target_ulong *cs_base, int *flags) { *pc = env->pc; @@ -256,14 +256,14 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, | ((env->macsr >> 4) & 0xf); /* Bits 0-3 */ } -static inline bool cpu_has_work(CPUState *env) +static inline bool cpu_has_work(CPUM68KState *env) { return env->interrupt_request & CPU_INTERRUPT_HARD; } #include "exec-all.h" -static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +static inline void cpu_pc_from_tb(CPUM68KState *env, TranslationBlock *tb) { env->pc = tb->pc; } |