From: Richard Henderson <richard.henderson@linaro.org>
Date: Sun, 6 Sep 2020 18:31:44 +0000 (-0700)
Subject: tcg: Expand TCGTemp.val to 64-bits
X-Git-Tag: v6.0.0-rc0~148^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdb38b95f72ebbef2d24e057828dd18ba9c81f63;p=thirdparty%2Fqemu.git

tcg: Expand TCGTemp.val to 64-bits

This will reduce the differences between 32-bit and 64-bit hosts,
allowing full 64-bit constants to be created with the same interface.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
index 2bdaeaa69cf..e7adc7e2658 100644
--- a/include/tcg/tcg.h
+++ b/include/tcg/tcg.h
@@ -506,7 +506,7 @@ typedef struct TCGTemp {
     unsigned int mem_allocated:1;
     unsigned int temp_allocated:1;
 
-    tcg_target_long val;
+    int64_t val;
     struct TCGTemp *mem_base;
     intptr_t mem_offset;
     const char *name;
diff --git a/tcg/tcg.c b/tcg/tcg.c
index e02bb719533..545dd2b0b23 100644
--- a/tcg/tcg.c
+++ b/tcg/tcg.c
@@ -3176,7 +3176,7 @@ static void dump_regs(TCGContext *s)
                    tcg_target_reg_names[ts->mem_base->reg]);
             break;
         case TEMP_VAL_CONST:
-            printf("$0x%" TCG_PRIlx, ts->val);
+            printf("$0x%" PRIx64, ts->val);
             break;
         case TEMP_VAL_DEAD:
             printf("D");