From: Richard Henderson <rth@twiddle.net>
Date: Tue, 20 Aug 2013 21:48:46 +0000 (-0700)
Subject: tcg: Define TCG_TYPE_PTR properly
X-Git-Tag: v1.7.0-rc0~141^2~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d289837eef3550ac156082d812231ec5dfe79501;p=users%2Fdwmw2%2Fqemu.git

tcg: Define TCG_TYPE_PTR properly

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/tcg/tcg.h b/tcg/tcg.h
index 8a5e55bcc4..7a6f2e5f11 100644
--- a/tcg/tcg.h
+++ b/tcg/tcg.h
@@ -178,9 +178,12 @@ typedef enum TCGType {
     TCG_TYPE_REG = TCG_TYPE_I64,
 #endif
 
-    /* An alias for the size of the native pointer.  We don't currently
-       support any hosts with 64-bit registers and 32-bit pointers.  */
-    TCG_TYPE_PTR = TCG_TYPE_REG,
+    /* An alias for the size of the native pointer.  */
+#if UINTPTR_MAX == UINT32_MAX
+    TCG_TYPE_PTR = TCG_TYPE_I32,
+#else
+    TCG_TYPE_PTR = TCG_TYPE_I64,
+#endif
 
     /* An alias for the size of the target "long", aka register.  */
 #if TARGET_LONG_BITS == 64