Index: tcg/tcg-op.h
===================================================================
--- tcg/tcg-op.h	(revision 6801)
+++ tcg/tcg-op.h	(working copy)
@@ -1435,7 +1435,7 @@
 static inline void tcg_gen_not_i64(TCGv_i64 ret, TCGv_i64 arg)
 {
 #ifdef TCG_TARGET_HAS_not_i64
-    tcg_gen_op2_i32(INDEX_op_not_i64, ret, arg);
+    tcg_gen_op2_i64(INDEX_op_not_i64, ret, arg);
 #else
     tcg_gen_xori_i64(ret, arg, -1);
 #endif
Index: tcg/tcg.h
===================================================================
--- tcg/tcg.h	(revision 6801)
+++ tcg/tcg.h	(working copy)
@@ -153,8 +153,6 @@
 #define MAKE_TCGV_I64(x) (x)
 #define GET_TCGV_I32(t) (t)
 #define GET_TCGV_I64(t) (t)
-#define TCGV_EQUAL_I32(a, b) (GET_TCGV_I32(a) == GET_TCGV_I32(b))
-#define TCGV_EQUAL_I64(a, b) (GET_TCGV_I64(a) == GET_TCGV_I64(b))
 
 #if TCG_TARGET_REG_BITS == 32
 #define TCGV_LOW(t) (t)
@@ -163,6 +161,9 @@
 
 #endif /* DEBUG_TCGV */
 
+#define TCGV_EQUAL_I32(a, b) (GET_TCGV_I32(a) == GET_TCGV_I32(b))
+#define TCGV_EQUAL_I64(a, b) (GET_TCGV_I64(a) == GET_TCGV_I64(b))
+
 /* Dummy definition to avoid compiler warnings.  */
 #define TCGV_UNUSED_I32(x) x = MAKE_TCGV_I32(-1)
 #define TCGV_UNUSED_I64(x) x = MAKE_TCGV_I64(-1)