piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 15:19:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

JitArm64: Fix gpr.R() usages in conditional code.

Browse Source
This commit is contained in:
degasus
2017-03-20 09:37:03 +01:00
parent f7a52c0c35
commit c5b9c740c9
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);