Got a sudden attach of the implicit-type-casting paranoias whilst

looking for (non-) bug in running Python.

git-svn-id: svn://svn.valgrind.org/vex/trunk@1621

diff --git a/VEX/priv/guest-amd64/gdefs.h b/VEX/priv/guest-amd64/gdefs.h
index 0a0d0a957427a4d11ce1b0f17c500789aee4a52e..259a20b1fa8882eff8be75c3ebf8b9c7af6f78fd 100644 (file)
--- a/VEX/priv/guest-amd64/gdefs.h
+++ b/VEX/priv/guest-amd64/gdefs.h
@@ -180,12 +180,12 @@ extern ULong amd64g_dirtyhelper_RDTSC ( void );
 #define AMD64G_CC_SHIFT_C   0
 #define AMD64G_CC_SHIFT_P   2
 
-#define AMD64G_CC_MASK_O    (1 << AMD64G_CC_SHIFT_O)
-#define AMD64G_CC_MASK_S    (1 << AMD64G_CC_SHIFT_S)
-#define AMD64G_CC_MASK_Z    (1 << AMD64G_CC_SHIFT_Z)
-#define AMD64G_CC_MASK_A    (1 << AMD64G_CC_SHIFT_A)
-#define AMD64G_CC_MASK_C    (1 << AMD64G_CC_SHIFT_C)
-#define AMD64G_CC_MASK_P    (1 << AMD64G_CC_SHIFT_P)
+#define AMD64G_CC_MASK_O    (1ULL << AMD64G_CC_SHIFT_O)
+#define AMD64G_CC_MASK_S    (1ULL << AMD64G_CC_SHIFT_S)
+#define AMD64G_CC_MASK_Z    (1ULL << AMD64G_CC_SHIFT_Z)
+#define AMD64G_CC_MASK_A    (1ULL << AMD64G_CC_SHIFT_A)
+#define AMD64G_CC_MASK_C    (1ULL << AMD64G_CC_SHIFT_C)
+#define AMD64G_CC_MASK_P    (1ULL << AMD64G_CC_SHIFT_P)
 
 /* FPU flag masks */
 #define AMD64G_FC_SHIFT_C3   14
@@ -193,10 +193,10 @@ extern ULong amd64g_dirtyhelper_RDTSC ( void );
 #define AMD64G_FC_SHIFT_C1   9
 #define AMD64G_FC_SHIFT_C0   8
 
-#define AMD64G_FC_MASK_C3    (1 << AMD64G_FC_SHIFT_C3)
-#define AMD64G_FC_MASK_C2    (1 << AMD64G_FC_SHIFT_C2)
-#define AMD64G_FC_MASK_C1    (1 << AMD64G_FC_SHIFT_C1)
-#define AMD64G_FC_MASK_C0    (1 << AMD64G_FC_SHIFT_C0)
+#define AMD64G_FC_MASK_C3    (1ULL << AMD64G_FC_SHIFT_C3)
+#define AMD64G_FC_MASK_C2    (1ULL << AMD64G_FC_SHIFT_C2)
+#define AMD64G_FC_MASK_C1    (1ULL << AMD64G_FC_SHIFT_C1)
+#define AMD64G_FC_MASK_C0    (1ULL << AMD64G_FC_SHIFT_C0)
 
 
 /* %RFLAGS thunk descriptors.  A four-word thunk is used to record