[Qemu-devel] [PULL 09/10] tcg: Optimize muls2_i32

[Richard Henderson <rth@twiddle.net>]

Signed-off-by: Richard Henderson <rth@twiddle.net>
---
 tcg/optimize.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tcg/optimize.c b/tcg/optimize.c
index 067917c..c674fe2 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -1160,15 +1160,22 @@ static void tcg_constant_folding(TCGContext *s)
             goto do_default;
 
         case INDEX_op_mulu2_i32:
+        case INDEX_op_muls2_i32:
             if (temps[args[2]].state == TCG_TEMP_CONST
                 && temps[args[3]].state == TCG_TEMP_CONST) {
                 uint32_t a = temps[args[2]].val;
                 uint32_t b = temps[args[3]].val;
-                uint64_t r = (uint64_t)a * b;
+                uint64_t r;
                 TCGArg rl, rh;
                 TCGOp *op2 = insert_op_before(s, op, INDEX_op_movi_i32, 2);
                 TCGArg *args2 = &s->gen_opparam_buf[op2->args];
 
+                if (opc == INDEX_op_mulu2_i32) {
+                    r = (uint64_t)a * b;
+                } else {
+                    r = (uint64_t)(int32_t)a * (int32_t)b;
+                }
+
                 rl = args[0];
                 rh = args[1];
                 tcg_opt_gen_movi(s, op, args, opc, rl, (uint32_t)r);
-- 
2.1.0