From patchwork Thu May 26 11:03:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 1642 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:53:45 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.230 with SMTP id dz6cs16033vdc; Thu, 26 May 2011 04:03:43 -0700 (PDT) Received: by 10.227.11.148 with SMTP id t20mr670745wbt.98.1306407822851; Thu, 26 May 2011 04:03:42 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id m12si1189356wbh.13.2011.05.26.04.03.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 May 2011 04:03:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1QPYLo-0000rZ-CF; Thu, 26 May 2011 12:03:36 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Stefan Weil , Anthony Liguori Subject: [PATCH] target-arm: Fix compilation failure for 64 bit hosts Date: Thu, 26 May 2011 12:03:36 +0100 Message-Id: <1306407816-3294-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 Use the correct _ptr aliases for manipulating the pointer to the fp_status; this fixes a compilation failure on 64 bit hosts. Signed-off-by: Peter Maydell Acked-by: Stefan Weil --- Apologies for the build breakage. target-arm/translate.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 1501db1..f5507ec 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -980,20 +980,20 @@ static inline void gen_vfp_F1_ld0(int dp) #define VFP_GEN_ITOF(name) \ static inline void gen_vfp_##name(int dp, int neon) \ { \ - TCGv statusptr = tcg_temp_new_i32(); \ + TCGv_ptr statusptr = tcg_temp_new_ptr(); \ int offset; \ if (neon) { \ offset = offsetof(CPUState, vfp.standard_fp_status); \ } else { \ offset = offsetof(CPUState, vfp.fp_status); \ } \ - tcg_gen_addi_i32(statusptr, cpu_env, offset); \ + tcg_gen_addi_ptr(statusptr, cpu_env, offset); \ if (dp) { \ gen_helper_vfp_##name##d(cpu_F0d, cpu_F0s, statusptr); \ } else { \ gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, statusptr); \ } \ - tcg_temp_free_i32(statusptr); \ + tcg_temp_free_ptr(statusptr); \ } VFP_GEN_ITOF(uito) @@ -1003,20 +1003,20 @@ VFP_GEN_ITOF(sito) #define VFP_GEN_FTOI(name) \ static inline void gen_vfp_##name(int dp, int neon) \ { \ - TCGv statusptr = tcg_temp_new_i32(); \ + TCGv_ptr statusptr = tcg_temp_new_ptr(); \ int offset; \ if (neon) { \ offset = offsetof(CPUState, vfp.standard_fp_status); \ } else { \ offset = offsetof(CPUState, vfp.fp_status); \ } \ - tcg_gen_addi_i32(statusptr, cpu_env, offset); \ + tcg_gen_addi_ptr(statusptr, cpu_env, offset); \ if (dp) { \ gen_helper_vfp_##name##d(cpu_F0s, cpu_F0d, statusptr); \ } else { \ gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, statusptr); \ } \ - tcg_temp_free_i32(statusptr); \ + tcg_temp_free_ptr(statusptr); \ } VFP_GEN_FTOI(toui) @@ -1029,21 +1029,21 @@ VFP_GEN_FTOI(tosiz) static inline void gen_vfp_##name(int dp, int shift, int neon) \ { \ TCGv tmp_shift = tcg_const_i32(shift); \ - TCGv statusptr = tcg_temp_new_i32(); \ + TCGv_ptr statusptr = tcg_temp_new_ptr(); \ int offset; \ if (neon) { \ offset = offsetof(CPUState, vfp.standard_fp_status); \ } else { \ offset = offsetof(CPUState, vfp.fp_status); \ } \ - tcg_gen_addi_i32(statusptr, cpu_env, offset); \ + tcg_gen_addi_ptr(statusptr, cpu_env, offset); \ if (dp) { \ gen_helper_vfp_##name##d(cpu_F0d, cpu_F0d, tmp_shift, statusptr); \ } else { \ gen_helper_vfp_##name##s(cpu_F0s, cpu_F0s, tmp_shift, statusptr); \ } \ tcg_temp_free_i32(tmp_shift); \ - tcg_temp_free_i32(statusptr); \ + tcg_temp_free_ptr(statusptr); \ } VFP_GEN_FIX(tosh) VFP_GEN_FIX(tosl)