From 43e860ef0989ac152854ad5775295e86656bdf4e Mon Sep 17 00:00:00 2001 From: aurel32 Date: Tue, 10 Mar 2009 10:29:45 +0000 Subject: [PATCH] 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 Signed-off-by: Aurelien Jarno git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6802 c046a42c-6fe2-441c-8c8c-71466251a162 --- tcg/tcg-op.h | 2 +- tcg/tcg.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tcg/tcg-op.h b/tcg/tcg-op.h index c5a4b34dcc..b5d0847d97 100644 --- a/tcg/tcg-op.h +++ b/tcg/tcg-op.h @@ -1435,7 +1435,7 @@ static inline void tcg_gen_not_i32(TCGv_i32 ret, TCGv_i32 arg) 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 diff --git a/tcg/tcg.h b/tcg/tcg.h index eb958f4fca..1ffeca6e6f 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -153,8 +153,6 @@ typedef int TCGv_i64; #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 @@ typedef int TCGv_i64; #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) -- 2.11.4.GIT