Commit 677c4d69 authored by Richard Henderson's avatar Richard Henderson
Browse files

cpu: Move ENV_OFFSET to exec/gen-icount.h 



Now that we have ArchCPU, we can define this generically,
in the one place that needs it.

Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 92fddfbd

include/exec/gen-icount.h

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 


/* Helpers for instruction counting code generation.  */



#define ENV_OFFSET   offsetof(ArchCPU, env)



static TCGOp *icount_start_insn;



static inline void gen_tb_start(TranslationBlock *tb)

target/alpha/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -278,7 +278,6 @@ struct AlphaCPU { 
    QEMUTimer *alarm_timer;

};



#define ENV_OFFSET offsetof(AlphaCPU, env)



#ifndef CONFIG_USER_ONLY

extern const struct VMStateDescription vmstate_alpha_cpu;

target/arm/cpu.h

+0 −2
Original line number Diff line number Diff line
@@ -917,8 +917,6 @@ void arm_cpu_post_init(Object *obj); 


uint64_t arm_cpu_mp_affinity(int idx, uint8_t clustersz);



#define ENV_OFFSET offsetof(ARMCPU, env)



#ifndef CONFIG_USER_ONLY

extern const struct VMStateDescription vmstate_arm_cpu;

#endif

target/cris/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ struct CRISCPU { 
    CPUCRISState env;

};



#define ENV_OFFSET offsetof(CRISCPU, env)



#ifndef CONFIG_USER_ONLY

extern const struct VMStateDescription vmstate_cris_cpu;

target/hppa/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -222,7 +222,6 @@ struct HPPACPU { 
    QEMUTimer *alarm_timer;

};



#define ENV_OFFSET      offsetof(HPPACPU, env)



typedef CPUHPPAState CPUArchState;

typedef HPPACPU ArchCPU;