From f081c76ccfdbc1fdaa90fa5eb6abad46c1b5bfa8 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 21 May 2011 07:10:23 +0000 Subject: 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 --- target-ppc/cpu.h | 12 ++++++++++++ target-ppc/exec.h | 11 ----------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'target-ppc') diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 8e4582f6ab..6d60d14769 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1999,4 +1999,16 @@ static inline ppcemb_tlb_t *booke206_get_tlbe(CPUState *env, const int tlbn, extern void (*cpu_ppc_hypercall)(CPUState *); +static inline bool cpu_has_work(CPUState *env) +{ + return msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD); +} + +#include "exec-all.h" + +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->nip = tb->pc; +} + #endif /* !defined (__CPU_PPC_H__) */ diff --git a/target-ppc/exec.h b/target-ppc/exec.h index 81c3c547f8..1e144bee3b 100644 --- a/target-ppc/exec.h +++ b/target-ppc/exec.h @@ -32,15 +32,4 @@ register struct CPUPPCState *env asm(AREG0); #include "softmmu_exec.h" #endif /* !defined(CONFIG_USER_ONLY) */ -static inline bool cpu_has_work(CPUState *env) -{ - return msr_ee && (env->interrupt_request & CPU_INTERRUPT_HARD); -} - - -static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) -{ - env->nip = tb->pc; -} - #endif /* !defined (__PPC_H__) */ -- cgit v1.2.1