From 622ed3605bf4caa5d52b407081ceb6ecce752aec Mon Sep 17 00:00:00 2001 From: aliguori Date: Tue, 18 Nov 2008 19:36:03 +0000 Subject: Convert CPU_PC_FROM_TB to static inline (Jan Kiszka) as macros should be avoided when possible. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5735 c046a42c-6fe2-441c-8c8c-71466251a162 --- cpu-exec.c | 4 ++-- target-alpha/cpu.h | 6 +++++- target-arm/cpu.h | 8 ++++++-- target-cris/cpu.h | 9 +++++++-- target-i386/cpu.h | 8 ++++++-- target-m68k/cpu.h | 8 ++++++-- target-mips/cpu.h | 12 +++++++----- target-ppc/cpu.h | 8 ++++++-- target-sh4/cpu.h | 12 +++++++----- target-sparc/cpu.h | 12 +++++++----- 10 files changed, 59 insertions(+), 28 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 9265fc18ea..322af0d686 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -110,7 +110,7 @@ static void cpu_exec_nocache(int max_cycles, TranslationBlock *orig_tb) if ((next_tb & 3) == 2) { /* Restore PC. This may happen if async event occurs before the TB starts executing. */ - CPU_PC_FROM_TB(env, tb); + cpu_pc_from_tb(env, tb); } tb_phys_invalidate(tb, -1); tb_free(tb); @@ -654,7 +654,7 @@ int cpu_exec(CPUState *env1) int insns_left; tb = (TranslationBlock *)(long)(next_tb & ~3); /* Restore PC. */ - CPU_PC_FROM_TB(env, tb); + cpu_pc_from_tb(env, tb); insns_left = env->icount_decr.u32; if (env->icount_extra && insns_left >= 0) { /* Refill decrementer and continue execution. */ diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index 210cc55f94..f606fac53b 100644 --- a/target-alpha/cpu.h +++ b/target-alpha/cpu.h @@ -318,6 +318,7 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) #endif #include "cpu-all.h" +#include "exec-all.h" enum { FEATURE_ASN = 0x00000001, @@ -416,6 +417,9 @@ void call_pal (CPUState *env); void call_pal (CPUState *env, int palcode); #endif -#define CPU_PC_FROM_TB(env, tb) env->pc = tb->pc +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->pc = tb->pc; +} #endif /* !defined (__CPU_ALPHA_H__) */ diff --git a/target-arm/cpu.h b/target-arm/cpu.h index c18224510b..79e51ac786 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -415,8 +415,12 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) } #endif -#define CPU_PC_FROM_TB(env, tb) env->regs[15] = tb->pc - #include "cpu-all.h" +#include "exec-all.h" + +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->regs[15] = tb->pc; +} #endif diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 1a8c884134..19cb20987a 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -237,7 +237,12 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) #define SFR_RW_MM_TLB_LO env->pregs[PR_SRS]][5 #define SFR_RW_MM_TLB_HI env->pregs[PR_SRS]][6 -#define CPU_PC_FROM_TB(env, tb) env->pc = tb->pc - #include "cpu-all.h" +#include "exec-all.h" + +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->pc = tb->pc; +} + #endif diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 2e21bc3b4a..ead073c7a3 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -789,10 +789,14 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) } #endif -#define CPU_PC_FROM_TB(env, tb) env->eip = tb->pc - tb->cs_base - #include "cpu-all.h" +#include "exec-all.h" #include "svm.h" +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->eip = tb->pc - tb->cs_base; +} + #endif /* CPU_I386_H */ diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index a6687b11a7..48c752c83f 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -231,8 +231,12 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) } #endif -#define CPU_PC_FROM_TB(env, tb) env->pc = tb->pc - #include "cpu-all.h" +#include "exec-all.h" + +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->pc = tb->pc; +} #endif diff --git a/target-mips/cpu.h b/target-mips/cpu.h index d686f8e255..a2544b180f 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -502,6 +502,7 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) } #include "cpu-all.h" +#include "exec-all.h" /* Memory access type : * may be needed for precise access rights control and precise exceptions. @@ -563,10 +564,11 @@ CPUMIPSState *cpu_mips_init(const char *cpu_model); uint32_t cpu_mips_get_clock (void); int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc); -#define CPU_PC_FROM_TB(env, tb) do { \ - env->active_tc.PC = tb->pc; \ - env->hflags &= ~MIPS_HFLAG_BMASK; \ - env->hflags |= tb->flags & MIPS_HFLAG_BMASK; \ - } while (0) +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->active_tc.PC = tb->pc; + env->hflags &= ~MIPS_HFLAG_BMASK; + env->hflags |= tb->flags & MIPS_HFLAG_BMASK; +} #endif /* !defined (__MIPS_CPU_H__) */ diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 00eac0722f..1ffbc30a37 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -826,9 +826,8 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) } #endif -#define CPU_PC_FROM_TB(env, tb) env->nip = tb->pc - #include "cpu-all.h" +#include "exec-all.h" /*****************************************************************************/ /* CRF definitions */ @@ -1432,4 +1431,9 @@ enum { /*****************************************************************************/ +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->nip = tb->pc; +} + #endif /* !defined (__CPU_PPC_H__) */ diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 2f42e6015d..ed7c1054cd 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -173,12 +173,8 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) } #endif -#define CPU_PC_FROM_TB(env, tb) do { \ - env->pc = tb->pc; \ - env->flags = tb->flags; \ - } while (0) - #include "cpu-all.h" +#include "exec-all.h" /* Memory access type */ enum { @@ -269,4 +265,10 @@ static inline int cpu_ptel_pr (uint32_t ptel) #define PTEA_TC (1 << 3) #define cpu_ptea_tc(ptea) (((ptea) & PTEA_TC) >> 3) +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->pc = tb->pc; + env->flags = tb->flags; +} + #endif /* _CPU_SH4_H */ diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index c13926d16a..4779e3474e 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -491,12 +491,8 @@ static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) } #endif -#define CPU_PC_FROM_TB(env, tb) do { \ - env->pc = tb->pc; \ - env->npc = tb->cs_base; \ - } while(0) - #include "cpu-all.h" +#include "exec-all.h" /* sum4m.c, sun4u.c */ void cpu_check_irqs(CPUSPARCState *env); @@ -508,4 +504,10 @@ uint64_t cpu_tick_get_count(void *opaque); void cpu_tick_set_limit(void *opaque, uint64_t limit); #endif +static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb) +{ + env->pc = tb->pc; + env->npc = tb->cs_base; +} + #endif -- cgit v1.2.3