From 4f7c64b3819d559417615ed2b1d028ebc1a49580 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Fri, 22 Mar 2019 15:32:23 -0700 Subject: cpu: Define CPUArchState with typedef For all targets, do this just before including exec/cpu-all.h. Reviewed-by: Peter Maydell Acked-by: Alistair Francis Signed-off-by: Richard Henderson --- target/nios2/cpu.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'target/nios2/cpu.h') diff --git a/target/nios2/cpu.h b/target/nios2/cpu.h index c4ccea9cf0..cc8e0ab771 100644 --- a/target/nios2/cpu.h +++ b/target/nios2/cpu.h @@ -25,9 +25,6 @@ #include "exec/cpu-defs.h" #include "qom/cpu.h" -#define CPUArchState struct CPUNios2State - -struct CPUNios2State; typedef struct CPUNios2State CPUNios2State; #if !defined(CONFIG_USER_ONLY) #include "mmu.h" @@ -249,6 +246,8 @@ static inline int cpu_interrupts_enabled(CPUNios2State *env) return env->regs[CR_STATUS] & CR_STATUS_PIE; } +typedef CPUNios2State CPUArchState; + #include "exec/cpu-all.h" static inline void cpu_get_tb_cpu_state(CPUNios2State *env, target_ulong *pc, -- cgit v1.2.3