libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-25 17:19:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

jit: Update rounding mode immediately on ctc1.

Browse Source
This commit is contained in:
Unknown W. Brackets 2014-08-30 23:48:27 -07:00
parent e8cdbcc33f
commit 5f6f6827b5
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Core/MIPS/ARM/ArmCompFPU.cpp
View File

@ -406,23 +406,7 @@ void Jit::Comp_mxc1(MIPSOpcode op)
} else { } else {
gpr.MapDirtyIn(MIPS_REG_FPCOND, rt); gpr.MapDirtyIn(MIPS_REG_FPCOND, rt);
} }
// Hardware rounding method.
// Left here in case it is faster than conditional method.
/*
AND(SCRATCHREG1, gpr.R(rt), Operand2(3));
// MIPS Rounding Mode <-> ARM Rounding Mode
// 0, 1, 2, 3 <-> 0, 3, 1, 2
CMP(SCRATCHREG1, Operand2(1));
SetCC(CC_EQ); ADD(SCRATCHREG1, SCRATCHREG1, Operand2(2));
SetCC(CC_GT); SUB(SCRATCHREG1, SCRATCHREG1, Operand2(1));
SetCC(CC_AL);
// Load and Store RM to FPSCR
VMRS(SCRATCHREG2);
BIC(SCRATCHREG2, SCRATCHREG2, Operand2(0x3 << 22));
ORR(SCRATCHREG2, SCRATCHREG2, Operand2(SCRATCHREG1, ST_LSL, 22));
VMSR(SCRATCHREG2);
*/
// Update MIPS state // Update MIPS state
// TODO: Technically, should mask by 0x0181FFFF. Maybe just put all of FCR31 in the reg? // TODO: Technically, should mask by 0x0181FFFF. Maybe just put all of FCR31 in the reg?
STR(gpr.R(rt), CTXREG, offsetof(MIPSState, fcr31)); STR(gpr.R(rt), CTXREG, offsetof(MIPSState, fcr31));
@ -433,6 +417,14 @@ void Jit::Comp_mxc1(MIPSOpcode op)
MOV(SCRATCHREG1, Operand2(gpr.R(rt), ST_LSR, 23)); MOV(SCRATCHREG1, Operand2(gpr.R(rt), ST_LSR, 23));
AND(gpr.R(MIPS_REG_FPCOND), SCRATCHREG1, Operand2(1)); AND(gpr.R(MIPS_REG_FPCOND), SCRATCHREG1, Operand2(1));
#endif #endif
SetRoundingMode();
} else {
if ((gpr.GetImm(rt) & 3) == 0) {
// Default nearest mode, let's do this the fast way.
ClearRoundingMode();
} else {
SetRoundingMode();
}
} }
} else { } else {
Comp_Generic(op); Comp_Generic(op);

7
Core/MIPS/x86/CompFPU.cpp
View File

@ -383,6 +383,12 @@ void Jit::Comp_mxc1(MIPSOpcode op)
if (gpr.IsImm(rt)) { if (gpr.IsImm(rt)) {
gpr.SetImm(MIPS_REG_FPCOND, (gpr.GetImm(rt) >> 23) & 1); gpr.SetImm(MIPS_REG_FPCOND, (gpr.GetImm(rt) >> 23) & 1);
MOV(32, M(&mips_->fcr31), Imm32(gpr.GetImm(rt) & 0x0181FFFF)); MOV(32, M(&mips_->fcr31), Imm32(gpr.GetImm(rt) & 0x0181FFFF));
if ((gpr.GetImm(rt) & 3) == 0) {
// Default nearest mode, let's do this the fast way.
ClearRoundingMode();
} else {
SetRoundingMode();
}
} else { } else {
gpr.Lock(rt, MIPS_REG_FPCOND); gpr.Lock(rt, MIPS_REG_FPCOND);
gpr.MapReg(rt, true, false); gpr.MapReg(rt, true, false);
@ -393,6 +399,7 @@ void Jit::Comp_mxc1(MIPSOpcode op)
MOV(32, M(&mips_->fcr31), gpr.R(rt)); MOV(32, M(&mips_->fcr31), gpr.R(rt));
AND(32, M(&mips_->fcr31), Imm32(0x0181FFFF)); AND(32, M(&mips_->fcr31), Imm32(0x0181FFFF));
gpr.UnlockAll(); gpr.UnlockAll();
SetRoundingMode();
} }
} else { } else {
Comp_Generic(op); Comp_Generic(op);