diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-07-30 18:53:27 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-07-30 18:54:23 +0000 |
| commit | 2ec00650f66ea624e06d76fadd0918317de1119f (patch) | |
| tree | 0550c9909ba3044f056d2c692cf1732fd662cbf6 /tcg/optimize.c | |
| parent | 1bfd07bdfe56cea43dbe258dcb161e46b0ee29b7 (diff) | |
| download | qemu-2ec00650f66ea624e06d76fadd0918317de1119f.tar.gz qemu-2ec00650f66ea624e06d76fadd0918317de1119f.tar.bz2 qemu-2ec00650f66ea624e06d76fadd0918317de1119f.zip | |
TCG: fix breakage by previous patch
Fix incorrect logic and typos in previous commit
1bfd07bdfe56cea43dbe258dcb161e46b0ee29b7.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'tcg/optimize.c')
| -rw-r--r-- | tcg/optimize.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/tcg/optimize.c b/tcg/optimize.c index 6a0a4ddb33..a3bfa5e71d 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -318,7 +318,8 @@ static TCGArg do_constant_folding_2(int op, TCGArg x, TCGArg y) #if defined(TCG_TARGET_HAS_not_i32) || defined(TCG_TARGET_HAS_not_i64) #ifdef TCG_TARGET_HAS_not_i32 case INDEX_op_not_i32: -#else +#endif +#ifdef TCG_TARGET_HAS_not_i64 case INDEX_op_not_i64: #endif return ~x; @@ -327,7 +328,8 @@ static TCGArg do_constant_folding_2(int op, TCGArg x, TCGArg y) #if defined(TCG_TARGET_HAS_ext8s_i32) || defined(TCG_TARGET_HAS_ext8s_i64) #ifdef TCG_TARGET_HAS_ext8s_i32 case INDEX_op_ext8s_i32: -#else +#endif +#ifdef TCG_TARGET_HAS_ext8s_i64 case INDEX_op_ext8s_i64: #endif return (int8_t)x; @@ -336,7 +338,8 @@ static TCGArg do_constant_folding_2(int op, TCGArg x, TCGArg y) #if defined(TCG_TARGET_HAS_ext16s_i32) || defined(TCG_TARGET_HAS_ext16s_i64) #ifdef TCG_TARGET_HAS_ext16s_i32 case INDEX_op_ext16s_i32: -#else +#endif +#ifdef TCG_TARGET_HAS_ext16s_i64 case INDEX_op_ext16s_i64: #endif return (int16_t)x; @@ -345,7 +348,8 @@ static TCGArg do_constant_folding_2(int op, TCGArg x, TCGArg y) #if defined(TCG_TARGET_HAS_ext8u_i32) || defined(TCG_TARGET_HAS_ext8u_i64) #ifdef TCG_TARGET_HAS_ext8u_i32 case INDEX_op_ext8u_i32: -#else +#endif +#ifdef TCG_TARGET_HAS_ext8u_i64 case INDEX_op_ext8u_i64: #endif return (uint8_t)x; @@ -354,19 +358,20 @@ static TCGArg do_constant_folding_2(int op, TCGArg x, TCGArg y) #if defined(TCG_TARGET_HAS_ext16u_i32) || defined(TCG_TARGET_HAS_ext16u_i64) #ifdef TCG_TARGET_HAS_ext16u_i32 case INDEX_op_ext16u_i32: -#else +#endif +#ifdef TCG_TARGET_HAS_ext16u_i64 case INDEX_op_ext16u_i64: #endif return (uint16_t)x; #endif #if TCG_TARGET_REG_BITS == 64 -#ifdef TCG_TARGET_HAS_ext32s_i32 +#ifdef TCG_TARGET_HAS_ext32s_i64 case INDEX_op_ext32s_i64: return (int32_t)x; #endif -#ifdef TCG_TARGET_HAS_ext32u_i32 +#ifdef TCG_TARGET_HAS_ext32u_i64 case INDEX_op_ext32u_i64: return (uint32_t)x; #endif |