Patchwork [v4,09/15] tcg-arm: Rename use_armv5_instructions to use_armvt5_instructions

login
register
mail settings
Submitter Richard Henderson
Date July 4, 2013, 8:40 p.m.
Message ID <1372970462-10338-10-git-send-email-rth@twiddle.net>
Download mbox | patch
Permalink /patch/257009/
State New
Headers show

Comments

Richard Henderson - July 4, 2013, 8:40 p.m.
As it really controls the availability of a thumb interworking
instruction on armv5t.

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/arm/tcg-target.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
Peter Maydell - July 5, 2013, 9:28 a.m.
On 4 July 2013 21:40, Richard Henderson <rth@twiddle.net> wrote:
> As it really controls the availability of a thumb interworking
> instruction on armv5t.
>
> Signed-off-by: Richard Henderson <rth@twiddle.net>

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM

Patch

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,