[Qemu-devel] [6802] Fix tcg after commit 6800

[Qemu-devel] [6802] Fix tcg after commit 6800

[Aurelien Jarno]

Revision: 6802
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6802
Author:   aurel32
Date:     2009-03-10 10:29:45 +0000 (Tue, 10 Mar 2009)
Log Message:
-----------
Fix tcg after commit 6800

The introduction of TCGV_EQUAL and not op is slightly broken.
The definition of DEBUG_TCGV shows that.

Signed-off-by: Laurent Desnogues <laurent.desnogues@gmail.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/tcg/tcg-op.h
    trunk/tcg/tcg.h

Modified: trunk/tcg/tcg-op.h
===================================================================
--- trunk/tcg/tcg-op.h	2009-03-10 09:03:18 UTC (rev 6801)
+++ trunk/tcg/tcg-op.h	2009-03-10 10:29:45 UTC (rev 6802)
@@ -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

Modified: trunk/tcg/tcg.h
===================================================================
--- trunk/tcg/tcg.h	2009-03-10 09:03:18 UTC (rev 6801)
+++ trunk/tcg/tcg.h	2009-03-10 10:29:45 UTC (rev 6802)
@@ -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)