diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-08-25 18:53:55 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2014-03-13 19:01:49 +0100 |
| commit | 8c2e1b0093aa4a89548df47d969217d8b0dfd070 (patch) | |
| tree | 16656127c1a0c6194b25f29bd54f612b9c1f8679 /target-m68k | |
| parent | 1cf5ccbca8915277098727d900d52c495a711f88 (diff) | |
cpu: Turn cpu_has_work() into a CPUClass hook
Default to false.
Tidy variable naming and inline cast uses while at it.
Tested-by: Jia Liu <proljc@gmail.com> (or32)
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-m68k')
| -rw-r--r-- | target-m68k/cpu.c | 6 | ||||
| -rw-r--r-- | target-m68k/cpu.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c index 008d8db2da..7d66ed0416 100644 --- a/target-m68k/cpu.c +++ b/target-m68k/cpu.c @@ -30,6 +30,11 @@ static void m68k_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +static bool m68k_cpu_has_work(CPUState *cs) +{ + return cs->interrupt_request & CPU_INTERRUPT_HARD; +} + static void m68k_set_feature(CPUM68KState *env, int feature) { env->features |= (1u << feature); @@ -189,6 +194,7 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data) cc->reset = m68k_cpu_reset; cc->class_by_name = m68k_cpu_class_by_name; + cc->has_work = m68k_cpu_has_work; cc->do_interrupt = m68k_cpu_do_interrupt; cc->dump_state = m68k_cpu_dump_state; cc->set_pc = m68k_cpu_set_pc; diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index cfd6846347..5f79d2a7ef 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -253,11 +253,6 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc, | ((env->macsr >> 4) & 0xf); /* Bits 0-3 */ } -static inline bool cpu_has_work(CPUState *cpu) -{ - return cpu->interrupt_request & CPU_INTERRUPT_HARD; -} - #include "exec/exec-all.h" #endif |