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-unicore32 | |
| parent | 1cf5ccbca8915277098727d900d52c495a711f88 (diff) | |
| download | qemu-8c2e1b0093aa4a89548df47d969217d8b0dfd070.zip | |
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-unicore32')
| -rw-r--r-- | target-unicore32/cpu.c | 7 | ||||
| -rw-r--r-- | target-unicore32/cpu.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c index 3f78208360..1cfe50a432 100644 --- a/target-unicore32/cpu.c +++ b/target-unicore32/cpu.c @@ -23,6 +23,12 @@ static void uc32_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.regs[31] = value; } +static bool uc32_cpu_has_work(CPUState *cs) +{ + return cs->interrupt_request & + (CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB); +} + static inline void set_feature(CPUUniCore32State *env, int feature) { env->features |= feature; @@ -138,6 +144,7 @@ static void uc32_cpu_class_init(ObjectClass *oc, void *data) dc->realize = uc32_cpu_realizefn; cc->class_by_name = uc32_cpu_class_by_name; + cc->has_work = uc32_cpu_has_work; cc->do_interrupt = uc32_cpu_do_interrupt; cc->dump_state = uc32_cpu_dump_state; cc->set_pc = uc32_cpu_set_pc; diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h index 967511e3f6..1db7419733 100644 --- a/target-unicore32/cpu.h +++ b/target-unicore32/cpu.h @@ -160,10 +160,4 @@ static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong *pc void uc32_translate_init(void); void switch_mode(CPUUniCore32State *, int); -static inline bool cpu_has_work(CPUState *cpu) -{ - return cpu->interrupt_request & - (CPU_INTERRUPT_HARD | CPU_INTERRUPT_EXITTB); -} - #endif /* QEMU_UNICORE32_CPU_H */ |