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-arm/cpu.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'target-arm/cpu.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 -- cgit v1.2.3