riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

TCG: fix breakage by previous patch 

Fix incorrect logic and typos in previous commit
1bfd07bdfe.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
stable-1.0
Blue Swirl 15 years ago
parent
1bfd07bdfe
commit
2ec00650f6
1 changed files with 12 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      tcg/optimize.c

19
tcg/optimize.c
View File

@ -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) #if defined(TCG_TARGET_HAS_not_i32) || defined(TCG_TARGET_HAS_not_i64)
#ifdef TCG_TARGET_HAS_not_i32 #ifdef TCG_TARGET_HAS_not_i32
case INDEX_op_not_i32: case INDEX_op_not_i32:
#else #endif
#ifdef TCG_TARGET_HAS_not_i64
case INDEX_op_not_i64: case INDEX_op_not_i64:
#endif #endif
return ~x; 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) #if defined(TCG_TARGET_HAS_ext8s_i32) || defined(TCG_TARGET_HAS_ext8s_i64)
#ifdef TCG_TARGET_HAS_ext8s_i32 #ifdef TCG_TARGET_HAS_ext8s_i32
case INDEX_op_ext8s_i32: case INDEX_op_ext8s_i32:
#else #endif
#ifdef TCG_TARGET_HAS_ext8s_i64
case INDEX_op_ext8s_i64: case INDEX_op_ext8s_i64:
#endif #endif
return (int8_t)x; 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) #if defined(TCG_TARGET_HAS_ext16s_i32) || defined(TCG_TARGET_HAS_ext16s_i64)
#ifdef TCG_TARGET_HAS_ext16s_i32 #ifdef TCG_TARGET_HAS_ext16s_i32
case INDEX_op_ext16s_i32: case INDEX_op_ext16s_i32:
#else #endif
#ifdef TCG_TARGET_HAS_ext16s_i64
case INDEX_op_ext16s_i64: case INDEX_op_ext16s_i64:
#endif #endif
return (int16_t)x; 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) #if defined(TCG_TARGET_HAS_ext8u_i32) || defined(TCG_TARGET_HAS_ext8u_i64)
#ifdef TCG_TARGET_HAS_ext8u_i32 #ifdef TCG_TARGET_HAS_ext8u_i32
case INDEX_op_ext8u_i32: case INDEX_op_ext8u_i32:
#else #endif
#ifdef TCG_TARGET_HAS_ext8u_i64
case INDEX_op_ext8u_i64: case INDEX_op_ext8u_i64:
#endif #endif
return (uint8_t)x; 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) #if defined(TCG_TARGET_HAS_ext16u_i32) || defined(TCG_TARGET_HAS_ext16u_i64)
#ifdef TCG_TARGET_HAS_ext16u_i32 #ifdef TCG_TARGET_HAS_ext16u_i32
case INDEX_op_ext16u_i32: case INDEX_op_ext16u_i32:
#else #endif
#ifdef TCG_TARGET_HAS_ext16u_i64
case INDEX_op_ext16u_i64: case INDEX_op_ext16u_i64:
#endif #endif
return (uint16_t)x; return (uint16_t)x;
#endif #endif
#if TCG_TARGET_REG_BITS == 64 #if TCG_TARGET_REG_BITS == 64
#ifdef TCG_TARGET_HAS_ext32s_i32 #ifdef TCG_TARGET_HAS_ext32s_i64
case INDEX_op_ext32s_i64: case INDEX_op_ext32s_i64:
return (int32_t)x; return (int32_t)x;
#endif #endif
#ifdef TCG_TARGET_HAS_ext32u_i32 #ifdef TCG_TARGET_HAS_ext32u_i64
case INDEX_op_ext32u_i64: case INDEX_op_ext32u_i64:
return (uint32_t)x; return (uint32_t)x;
#endif #endif

Write Preview
Loading…
Cancel
Save