Merge pull request #12566 from JosJuice/arm64-add-imm-sp

Arm64Emitter: Don't optimize ADD to MOV for SP
2024-02-06 17:53:17 -05:00 · 2024-02-06 17:53:17 -05:00 · a50ab40a5f
parent 9240f579ea b5c5371848
commit a50ab40a5f
1 changed files with 8 additions and 2 deletions
--- a/Source/Core/Common/Arm64Emitter.cpp
+++ b/Source/Core/Common/Arm64Emitter.cpp
@ -4222,9 +4222,15 @@ void ARM64XEmitter::ADDI2R_internal(ARM64Reg Rd, ARM64Reg Rn, u64 imm, bool nega
  // Special path for zeroes
  if (imm == 0 && !flags)
  {
-    if (Rd != Rn)
+    if (Rd == Rn)
+    {
+      return;
+    }
+    else if (DecodeReg(Rd) != DecodeReg(ARM64Reg::SP) && DecodeReg(Rn) != DecodeReg(ARM64Reg::SP))
+    {
      MOV(Rd, Rn);
-    return;
+      return;
+    }
  }

  // Regular fast paths, aarch64 immediate instructions