Message ID | 1368428278-29299-2-git-send-email-john.rigby@linaro.org |
---|---|
State | New |
Headers | show |
On 13 May 2013 07:57, John Rigby <john.rigby@linaro.org> wrote: > 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. > > target-arm/translate.c | 2 +- > target-arm/translate.h | 2 ++ > 2 files changed, 3 insertions(+), 1 deletion(-) This patch doesn't apply, because it's trying to make a change to a file (translate.h) that doesn't exist in master. Can you make sure you've rebased on current master and you're sending all the patches, please? thanks -- PMM
Am 13.05.2013 um 11:28 schrieb Peter Maydell <peter.maydell@linaro.org>: > On 13 May 2013 07:57, John Rigby <john.rigby@linaro.org> wrote: >> 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. >> >> target-arm/translate.c | 2 +- >> target-arm/translate.h | 2 ++ >> 2 files changed, 3 insertions(+), 1 deletion(-) > > This patch doesn't apply, because it's trying to make a change > to a file (translate.h) that doesn't exist in master. Can > you make sure you've rebased on current master and you're > sending all the patches, please? Also please make sure to include a cover letter :) Alex > > thanks > -- PMM
diff --git a/target-arm/translate.c b/target-arm/translate.c index 675773a..36537bd 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -59,7 +59,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 e727bc6..8ba1433 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 */