Re: [PATCH v3 055/162] tcg: Merge INDEX_op_shr_{i32,i64}

[Philippe Mathieu-Daudé]

On 17/2/25 00:08, Richard Henderson wrote:

Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---
  include/tcg/tcg-opc.h    |  3 +--
  tcg/optimize.c           | 17 +++++++----------
  tcg/tcg-op.c             |  4 ++--
  tcg/tcg.c                |  6 ++----
  tcg/tci.c                | 11 +++--------
  docs/devel/tcg-ops.rst   |  4 ++--
  tcg/tci/tcg-target.c.inc |  2 +-
  7 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/tcg/optimize.c b/tcg/optimize.c
index bc882dbe31..a10fb67da8 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -440,10 +440,10 @@ static uint64_t do_constant_folding_2(TCGOpcode op, 
TCGType type,
          }
          return (uint64_t)x << (y & 63);

- case INDEX_op_shr_i32:

-        return (uint32_t)x >> (y & 31);
-
-    case INDEX_op_shr_i64:
+    case INDEX_op_shr:
+        if (type == TCG_TYPE_I32) {
+            return (uint32_t)x >> (y & 31);
+        }
          return (uint64_t)x >> (y & 63);

    return (tcg_target_ulong)x >> (y % TCG_TARGET_REG_BITS);