Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 10d1879

Browse files
committed
[Arm64] Use REG_IP1 for genEpilogRestoreReg*
Avoid conflict with FASTTAILCALL_TARGET reg
1 parent 18b9048 commit 10d1879

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/jit/codegenarm64.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -653,11 +653,11 @@ void CodeGen::genRestoreCalleeSavedRegistersHelp(regMaskTP regsToRestoreMask, in
653653
maskRestoreRegsFloat &= ~reg1Mask;
654654
floatRegsToRestoreCount -= 1;
655655

656-
genEpilogRestoreRegPair(reg1, reg2, spOffset, stackDelta, REG_IP0, nullptr);
656+
genEpilogRestoreRegPair(reg1, reg2, spOffset, stackDelta, REG_IP1, nullptr);
657657
}
658658
else
659659
{
660-
genEpilogRestoreReg(reg2, spOffset, stackDelta, REG_IP0, nullptr);
660+
genEpilogRestoreReg(reg2, spOffset, stackDelta, REG_IP1, nullptr);
661661
}
662662
}
663663

@@ -702,11 +702,11 @@ void CodeGen::genRestoreCalleeSavedRegistersHelp(regMaskTP regsToRestoreMask, in
702702
maskRestoreRegsInt &= ~reg1Mask;
703703
intRegsToRestoreCount -= 1;
704704

705-
genEpilogRestoreRegPair(reg1, reg2, spOffset, stackDelta, REG_IP0, nullptr);
705+
genEpilogRestoreRegPair(reg1, reg2, spOffset, stackDelta, REG_IP1, nullptr);
706706
}
707707
else
708708
{
709-
genEpilogRestoreReg(reg2, spOffset, stackDelta, REG_IP0, nullptr);
709+
genEpilogRestoreReg(reg2, spOffset, stackDelta, REG_IP1, nullptr);
710710
}
711711
}
712712

src/jit/codegencommon.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6824,7 +6824,7 @@ void CodeGen::genPopCalleeSavedRegistersAndFreeLclFrame(bool jmpEpilog)
68246824
// Generate:
68256825
// ldp fp,lr,[sp]
68266826
// add sp,sp,#remainingFrameSz
6827-
genEpilogRestoreRegPair(REG_FP, REG_LR, alignmentAdjustment2, spAdjustment2, REG_IP0, nullptr);
6827+
genEpilogRestoreRegPair(REG_FP, REG_LR, alignmentAdjustment2, spAdjustment2, REG_IP1, nullptr);
68286828
}
68296829
else
68306830
{
@@ -6842,7 +6842,7 @@ void CodeGen::genPopCalleeSavedRegistersAndFreeLclFrame(bool jmpEpilog)
68426842
// add sp,sp,#remainingFrameSz ; might need to load this constant in a scratch register if
68436843
// ; it's large
68446844

6845-
genEpilogRestoreRegPair(REG_FP, REG_LR, compiler->lvaOutgoingArgSpaceSize, remainingFrameSz, REG_IP0,
6845+
genEpilogRestoreRegPair(REG_FP, REG_LR, compiler->lvaOutgoingArgSpaceSize, remainingFrameSz, REG_IP1,
68466846
nullptr);
68476847
}
68486848

0 commit comments

Comments
 (0)