From: Alexander Graf Date: Tue, 3 Sep 2013 19:12:04 +0000 (+0100) Subject: target-arm: Export cpu_env X-Git-Tag: v1.7.0-rc0~125^2~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3407ad0e7a6f04905fc6a8ea72be03553e777988;p=thirdparty%2Fqemu.git target-arm: Export cpu_env The cpu_env tcg variable will be used by both the AArch32 and AArch64 handling code. Unstaticify it, so that both sides can make use of it. Signed-off-by: Alexander Graf Signed-off-by: John Rigby Signed-off-by: Peter Maydell Message-id: 1378235544-22290-5-git-send-email-peter.maydell@linaro.org Message-id: 1368505980-17151-3-git-send-email-john.rigby@linaro.org Signed-off-by: Peter Maydell --- diff --git a/target-arm/translate.c b/target-arm/translate.c index 450a0b6d288..26058336856 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -61,7 +61,7 @@ static uint32_t gen_opc_condexec_bits[OPC_BUF_SIZE]; #define DISAS_WFI 4 #define DISAS_SWI 5 -static TCGv_ptr cpu_env; +TCGv_ptr cpu_env; /* We reuse the same 64-bit temporaries for efficiency. */ static TCGv_i64 cpu_V0, cpu_V1, cpu_M0; static TCGv_i32 cpu_R[16]; diff --git a/target-arm/translate.h b/target-arm/translate.h index e727bc66fec..8ba14339a93 100644 --- a/target-arm/translate.h +++ b/target-arm/translate.h @@ -24,4 +24,6 @@ typedef struct DisasContext { int vec_stride; } DisasContext; +extern TCGv_ptr cpu_env; + #endif /* TARGET_ARM_TRANSLATE_H */