ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5116 from degasus/ArmRegCache 

JitArm64: Fix usages in conditional code.
This commit is contained in:
Markus Wick 2017-03-21 18:14:16 +01:00 committed by GitHub
parent fc2c9d853f c5b9c740c9
commit f03fa54bcb
3 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp
View File

@ -231,6 +231,8 @@ void JitArm64::bclrx(UGeckoInstruction inst)
(inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || (inst.BO & BO_DONT_CHECK_CONDITION) == 0; (inst.BO & BO_DONT_DECREMENT_FLAG) == 0 || (inst.BO & BO_DONT_CHECK_CONDITION) == 0;
ARM64Reg WA = gpr.GetReg(); ARM64Reg WA = gpr.GetReg();
ARM64Reg WB = inst.LK ? gpr.GetReg() : INVALID_REG;
FixupBranch pCTRDontBranch; FixupBranch pCTRDontBranch;
if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) // Decrement and test CTR if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0) // Decrement and test CTR
{ {
@ -263,7 +265,6 @@ void JitArm64::bclrx(UGeckoInstruction inst)
if (inst.LK) if (inst.LK)
{ {
ARM64Reg WB = gpr.GetReg();
MOVI2R(WB, js.compilerPC + 4); MOVI2R(WB, js.compilerPC + 4);
STR(INDEX_UNSIGNED, WB, PPC_REG, PPCSTATE_OFF(spr[SPR_LR])); STR(INDEX_UNSIGNED, WB, PPC_REG, PPCSTATE_OFF(spr[SPR_LR]));
gpr.Unlock(WB); gpr.Unlock(WB);

37
Source/Core/Core/PowerPC/JitArm64/JitArm64_Integer.cpp
View File

@ -1157,28 +1157,31 @@ void JitArm64::divwx(UGeckoInstruction inst)
gpr.BindToRegister(d, d == a || d == b); gpr.BindToRegister(d, d == a || d == b);
ARM64Reg WA = gpr.GetReg(); ARM64Reg WA = gpr.GetReg();
ARM64Reg RA = gpr.R(a);
ARM64Reg RB = gpr.R(b);
ARM64Reg RD = gpr.R(d);
FixupBranch slow1 = CBZ(gpr.R(b)); FixupBranch slow1 = CBZ(RB);
MOVI2R(WA, -0x80000000LL); MOVI2R(WA, -0x80000000LL);
CMP(gpr.R(a), WA); CMP(RA, WA);
CCMN(gpr.R(b), 1, 0, CC_EQ); CCMN(RB, 1, 0, CC_EQ);
FixupBranch slow2 = B(CC_EQ); FixupBranch slow2 = B(CC_EQ);
SDIV(gpr.R(d), gpr.R(a), gpr.R(b)); SDIV(RD, RA, RB);
FixupBranch done = B(); FixupBranch done = B();
SetJumpTarget(slow1); SetJumpTarget(slow1);
SetJumpTarget(slow2); SetJumpTarget(slow2);
CMP(gpr.R(b), 0); CMP(RB, 0);
CCMP(gpr.R(a), 0, 0, CC_EQ); CCMP(RA, 0, 0, CC_EQ);
CSETM(gpr.R(d), CC_LT); CSETM(RD, CC_LT);
SetJumpTarget(done); SetJumpTarget(done);
gpr.Unlock(WA); gpr.Unlock(WA);
if (inst.Rc) if (inst.Rc)
ComputeRC(gpr.R(d)); ComputeRC(RD);
} }
} }
@ -1333,26 +1336,28 @@ void JitArm64::srawx(UGeckoInstruction inst)
ARM64Reg WA = gpr.GetReg(); ARM64Reg WA = gpr.GetReg();
ARM64Reg WB = gpr.GetReg(); ARM64Reg WB = gpr.GetReg();
ARM64Reg WC = gpr.GetReg(); ARM64Reg WC = gpr.GetReg();
ARM64Reg RB = gpr.R(b);
ARM64Reg RS = gpr.R(s);
ANDI2R(WA, gpr.R(b), 32); ANDI2R(WA, RB, 32);
FixupBranch bit_is_not_zero = TBNZ(gpr.R(b), 5); FixupBranch bit_is_not_zero = TBNZ(RB, 5);
ANDSI2R(WC, gpr.R(b), 31); ANDSI2R(WC, RB, 31);
MOV(WB, gpr.R(s)); MOV(WB, RS);
FixupBranch is_zero = B(CC_EQ); FixupBranch is_zero = B(CC_EQ);
ASRV(WB, gpr.R(s), WC); ASRV(WB, RS, WC);
FixupBranch bit_is_zero = TBZ(gpr.R(s), 31); FixupBranch bit_is_zero = TBZ(RS, 31);
MOVI2R(WA, 32); MOVI2R(WA, 32);
SUB(WC, WA, WC); SUB(WC, WA, WC);
LSL(WC, gpr.R(s), WC); LSL(WC, RS, WC);
CMP(WC, 0); CMP(WC, 0);
CSET(WA, CC_NEQ); CSET(WA, CC_NEQ);
FixupBranch end = B(); FixupBranch end = B();
SetJumpTarget(bit_is_not_zero); SetJumpTarget(bit_is_not_zero);
CMP(gpr.R(s), 0); CMP(RS, 0);
CSET(WA, CC_LT); CSET(WA, CC_LT);
CSINV(WB, WZR, WZR, CC_GE); CSINV(WB, WZR, WZR, CC_GE);

5
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
View File

@ -380,6 +380,9 @@ void JitArm64::lXX(UGeckoInstruction inst)
(SConfig::GetInstance().bWii && js.op[1].inst.hex == 0x2C000000)) && // cmpXwi r0,0 (SConfig::GetInstance().bWii && js.op[1].inst.hex == 0x2C000000)) && // cmpXwi r0,0
js.op[2].inst.hex == 0x4182fff8) // beq -8 js.op[2].inst.hex == 0x4182fff8) // beq -8
{ {
ARM64Reg WA = gpr.GetReg();
ARM64Reg XA = EncodeRegTo64(WA);
// if it's still 0, we can wait until the next event // if it's still 0, we can wait until the next event
FixupBranch noIdle = CBNZ(gpr.R(d)); FixupBranch noIdle = CBNZ(gpr.R(d));
@ -390,8 +393,6 @@ void JitArm64::lXX(UGeckoInstruction inst)
gpr.Flush(FLUSH_MAINTAIN_STATE); gpr.Flush(FLUSH_MAINTAIN_STATE);
fpr.Flush(FLUSH_MAINTAIN_STATE); fpr.Flush(FLUSH_MAINTAIN_STATE);
ARM64Reg WA = gpr.GetReg();
ARM64Reg XA = EncodeRegTo64(WA);
MOVP2R(XA, &CoreTiming::Idle); MOVP2R(XA, &CoreTiming::Idle);
BLR(XA); BLR(XA);
gpr.Unlock(WA); gpr.Unlock(WA);