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 --- target-sh4/cpu.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'target-sh4/cpu.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 */ -- cgit v1.2.1