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-cris | |
| parent | 1cf5ccbca8915277098727d900d52c495a711f88 (diff) | |
| download | qemu-8c2e1b0093aa4a89548df47d969217d8b0dfd070.tar.gz | |
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-cris')
| -rw-r--r-- | target-cris/cpu.c | 6 | ||||
| -rw-r--r-- | target-cris/cpu.h | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/target-cris/cpu.c b/target-cris/cpu.c index 1ac8124d8c..07da8450ea 100644 --- a/target-cris/cpu.c +++ b/target-cris/cpu.c @@ -33,6 +33,11 @@ static void cris_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.pc = value; } +static bool cris_cpu_has_work(CPUState *cs) +{ + return cs->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI); +} + /* CPUClass::reset() */ static void cris_cpu_reset(CPUState *s) { @@ -283,6 +288,7 @@ static void cris_cpu_class_init(ObjectClass *oc, void *data) cc->reset = cris_cpu_reset; cc->class_by_name = cris_cpu_class_by_name; + cc->has_work = cris_cpu_has_work; cc->do_interrupt = cris_cpu_do_interrupt; cc->dump_state = cris_cpu_dump_state; cc->set_pc = cris_cpu_set_pc; diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 1d7d80d3dc..1287cad4ac 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -276,11 +276,6 @@ static inline void cpu_get_tb_cpu_state(CPUCRISState *env, target_ulong *pc, #define cpu_list cris_cpu_list void cris_cpu_list(FILE *f, fprintf_function cpu_fprintf); -static inline bool cpu_has_work(CPUState *cpu) -{ - return cpu->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI); -} - #include "exec/exec-all.h" #endif |