From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwYl6-0004Z4-6f for qemu-devel@nongnu.org; Tue, 09 Jul 2013 10:19:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwYl2-0002AR-Hh for qemu-devel@nongnu.org; Tue, 09 Jul 2013 10:19:12 -0400 Received: from mail-pd0-x234.google.com ([2607:f8b0:400e:c02::234]:50523) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwYl2-00029t-BD for qemu-devel@nongnu.org; Tue, 09 Jul 2013 10:19:08 -0400 Received: by mail-pd0-f180.google.com with SMTP id 10so5230525pdi.39 for ; Tue, 09 Jul 2013 07:19:07 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Tue, 9 Jul 2013 07:18:29 -0700 Message-Id: <1373379515-28596-10-git-send-email-rth@twiddle.net> In-Reply-To: <1373379515-28596-1-git-send-email-rth@twiddle.net> References: <1373379515-28596-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PULL 09/15] tcg-arm: Rename use_armv5_instructions to use_armvt5_instructions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com As it really controls the availability of a thumb interworking instruction on armv5t. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tcg/arm/tcg-target.c b/tcg/arm/tcg-target.c index 648137f..cfb9afb 100644 --- a/tcg/arm/tcg-target.c +++ b/tcg/arm/tcg-target.c @@ -43,13 +43,13 @@ defined(__ARM_ARCH_5T__) || \ defined(__ARM_ARCH_5TE__) || \ defined(__ARM_ARCH_5TEJ__) -#define USE_ARMV5_INSTRUCTIONS +#define USE_ARMV5T_INSTRUCTIONS #endif -#ifdef USE_ARMV5_INSTRUCTIONS -static const int use_armv5_instructions = 1; +#ifdef USE_ARMV5T_INSTRUCTIONS +static const int use_armv5t_instructions = 1; #else -static const int use_armv5_instructions = 0; +static const int use_armv5t_instructions = 0; #endif #undef USE_ARMV5_INSTRUCTIONS @@ -1030,7 +1030,7 @@ static inline void tcg_out_call(TCGContext *s, uint32_t addr) if (val - 8 < 0x02000000 && val - 8 >= -0x02000000) { if (addr & 1) { /* Use BLX if the target is in Thumb mode */ - if (!use_armv5_instructions) { + if (!use_armv5t_instructions) { tcg_abort(); } tcg_out_blx_imm(s, val); @@ -1049,7 +1049,7 @@ static inline void tcg_out_call(TCGContext *s, uint32_t addr) static inline void tcg_out_callr(TCGContext *s, int cond, int arg) { - if (use_armv5_instructions) { + if (use_armv5t_instructions) { tcg_out_blx(s, cond, arg); } else { tcg_out_dat_reg(s, cond, ARITH_MOV, TCG_REG_R14, 0, -- 1.8.1.4