ssa: Fix wrong opcode comparison (flyinghead#1769)

* ssa: Fix wrong opcode comparison * ssa: handle 32 bits shift case first (shld, shad) --------- Co-authored-by: flyinghead <[email protected]>
scribam · Dec 7, 2024 · fff03f6 · fff03f6
1 parent a99aa52
commit fff03f6
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/core/hw/sh4/dyna/ssa.h b/core/hw/sh4/dyna/ssa.h
@@ -285,16 +285,9 @@ class SSAOptimizer
 			{
 				// Replace shld/shad with shl/shr/sar
 				u32 r2 = op.rs2.imm_value();
-				if ((r2 & 0x80000000) == 0)
+				if ((r2 & 0x1F) == 0)
 				{
-					// rd = r1 << (r2 & 0x1F)
-					op.op = shop_shl;
-					op.rs2._imm = r2 & 0x1F;
-					stats.constant_ops_replaced++;
-				}
-				else if ((r2 & 0x1F) == 0)
-				{
-					if (op.op == shop_shl)
+					if (op.op == shop_shld)
 						// rd = 0
 						ReplaceByMov32(op, 0);
 					else
@@ -305,6 +298,13 @@ class SSAOptimizer
 						stats.constant_ops_replaced++;
 					}
 				}
+				else if ((r2 & 0x80000000) == 0)
+				{
+					// rd = r1 << (r2 & 0x1F)
+					op.op = shop_shl;
+					op.rs2._imm = r2 & 0x1F;
+					stats.constant_ops_replaced++;
+				}
 				else
 				{
 					// rd = r1 >> ((~r2 & 0x1F) + 1)