diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2011-05-21 07:10:23 +0000 |
---|---|---|
committer | Blue Swirl <blauwirbel@gmail.com> | 2011-06-26 18:25:31 +0000 |
commit | f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8 (patch) | |
tree | 189b8a7a36be8eb52b8704c940b6ef328c18005b /target-sparc | |
parent | f3e270377acd074f62e08960ef9444adf67d3590 (diff) | |
download | qemu-f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8.zip qemu-f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8.tar.gz qemu-f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8.tar.bz2 |
Move cpu_has_work and cpu_pc_from_tb to cpu.h
Move functions cpu_has_work() and cpu_pc_from_tb() from exec.h to cpu.h. This is
needed by later patches.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-sparc')
-rw-r--r-- | target-sparc/cpu.h | 14 | ||||
-rw-r--r-- | target-sparc/exec.h | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 94321f8..4edae78 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -662,4 +662,18 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, /* helper.c */ void do_interrupt(CPUState *env); +static inline bool cpu_has_work(CPUState *env1) +{ + return (env1->interrupt_request & CPU_INTERRUPT_HARD) && + cpu_interrupts_enabled(env1); +} + +#include "exec-all.h" + +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->pc = tb->pc; + env->npc = tb->cs_base; +} + #endif diff --git a/target-sparc/exec.h b/target-sparc/exec.h index c1ac2fd..2395b00 100644 --- a/target-sparc/exec.h +++ b/target-sparc/exec.h @@ -12,18 +12,4 @@ register struct CPUSPARCState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -/* op_helper.c */ -static inline bool cpu_has_work(CPUState *env1) -{ - return (env1->interrupt_request & CPU_INTERRUPT_HARD) && - cpu_interrupts_enabled(env1); -} - - -static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) -{ - env->pc = tb->pc; - env->npc = tb->cs_base; -} - #endif |