Fix #889

mupen64plus · Jul 27, 2021 · a605261 · a605261
1 parent a6d0490
commit a605261
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 14 deletions.
diff --git a/src/device/r4300/new_dynarec/x64/assem_x64.c b/src/device/r4300/new_dynarec/x64/assem_x64.c
@@ -3302,15 +3302,26 @@ static void shift_assemble_x64(int i,struct regstat *i_regs)
             emit_cmovne_reg(th==ECX?shift:th,tl==ECX?shift:tl);
             if(real_th>=0) emit_cmovne_reg(temp==ECX?shift:temp,th==ECX?shift:th);
           }
-          if(shift!=ECX) {
-            if(i_regs->regmap[ECX]>=INVCP)
-              emit_xchg64(shift,ECX);
-            else
-              emit_xchg(shift,ECX);
-
-            if(real_tl==shift) {
-              emit_mov(sl,real_tl);
-              emit_popreg(sl);
+          if(real_tl==ECX&&sl!=ECX&&shift==real_tl) {
+            emit_mov(sl,real_tl);
+            emit_popreg(sl);
+          }
+          else if(th==ECX&&sh!=ECX&&shift==real_tl) {
+            emit_mov(sl,real_tl);
+            emit_popreg(sl);
+          }
+          else
+          {
+            if(shift!=ECX) {
+              if(i_regs->regmap[ECX]>=INVCP)
+                emit_xchg64(shift,ECX);
+              else
+                emit_xchg(shift,ECX);
+
+              if(real_tl==shift) {
+                emit_mov(sl,real_tl);
+                emit_popreg(sl);
+              }
             }
           }
         }

diff --git a/src/device/r4300/new_dynarec/x86/assem_x86.c b/src/device/r4300/new_dynarec/x86/assem_x86.c
@@ -2899,11 +2899,22 @@ static void shift_assemble_x86(int i,struct regstat *i_regs)
             emit_cmovne_reg(th==ECX?shift:th,tl==ECX?shift:tl);
             if(real_th>=0) emit_cmovne_reg(temp==ECX?shift:temp,th==ECX?shift:th);
           }
-          if(shift!=ECX) {
-            emit_xchg(shift,ECX);
-            if(real_tl==shift) {
-              emit_mov(sl,real_tl);
-              emit_popreg(sl);
+          if(real_tl==ECX&&sl!=ECX&&shift==real_tl) {
+            emit_mov(sl,real_tl);
+            emit_popreg(sl);
+          }
+          else if(th==ECX&&sh!=ECX&&shift==real_tl) {
+            emit_mov(sl,real_tl);
+            emit_popreg(sl);
+          }
+          else
+          {
+            if(shift!=ECX) {
+              emit_xchg(shift,ECX);
+              if(real_tl==shift) {
+                emit_mov(sl,real_tl);
+                emit_popreg(sl);
+              }
             }
           }
         }