gwj / at91sam9263 · Commits

Commit 43e860ef0989ac152854ad5775295e86656bdf4e

Authored by aurel32
1 parent a3fe9013

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>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6802 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
tcg/tcg-op.h
  View file @43e860e
... ... @@ -1435,7 +1435,7 @@ static inline void tcg_gen_not_i32(TCGv_i32 ret, TCGv_i32 arg)
1435 1435 static inline void tcg_gen_not_i64(TCGv_i64 ret, TCGv_i64 arg)
1436 1436 {
1437 1437 #ifdef TCG_TARGET_HAS_not_i64
1438   - tcg_gen_op2_i32(INDEX_op_not_i64, ret, arg);
  1438 + tcg_gen_op2_i64(INDEX_op_not_i64, ret, arg);
1439 1439 #else
1440 1440 tcg_gen_xori_i64(ret, arg, -1);
1441 1441 #endif
... ...
tcg/tcg.h
  View file @43e860e
... ... @@ -153,8 +153,6 @@ typedef int TCGv_i64;
153 153 #define MAKE_TCGV_I64(x) (x)
154 154 #define GET_TCGV_I32(t) (t)
155 155 #define GET_TCGV_I64(t) (t)
156   -#define TCGV_EQUAL_I32(a, b) (GET_TCGV_I32(a) == GET_TCGV_I32(b))
157   -#define TCGV_EQUAL_I64(a, b) (GET_TCGV_I64(a) == GET_TCGV_I64(b))
158 156  
159 157 #if TCG_TARGET_REG_BITS == 32
160 158 #define TCGV_LOW(t) (t)
... ... @@ -163,6 +161,9 @@ typedef int TCGv_i64;
163 161  
164 162 #endif /* DEBUG_TCGV */
165 163  
  164 +#define TCGV_EQUAL_I32(a, b) (GET_TCGV_I32(a) == GET_TCGV_I32(b))
  165 +#define TCGV_EQUAL_I64(a, b) (GET_TCGV_I64(a) == GET_TCGV_I64(b))
  166 +
166 167 /* Dummy definition to avoid compiler warnings. */
167 168 #define TCGV_UNUSED_I32(x) x = MAKE_TCGV_I32(-1)
168 169 #define TCGV_UNUSED_I64(x) x = MAKE_TCGV_I64(-1)
... ...