piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 13:57:57 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7084 from lioncash/mask

Browse Source 
Interpreter_SystemRegisters: Ensure FPSCR modifying instructions don't set bit 20
This commit is contained in:
Léo Lam 2018-06-07 16:51:36 +02:00 committed by GitHub
commit b51fbaa5b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/Core/Core/PowerPC/Interpreter/Interpreter_SystemRegisters.cpp
View File

@ -58,15 +58,24 @@ void Interpreter::mtfsb0x(UGeckoInstruction inst)
Helper_UpdateCR1(); Helper_UpdateCR1();
} }
// This instruction can affect FX
void Interpreter::mtfsb1x(UGeckoInstruction inst) void Interpreter::mtfsb1x(UGeckoInstruction inst)
{ {
// this instruction can affect FX const u32 bit = inst.CRBD;
u32 b = 0x80000000 >> inst.CRBD;
// Bit 20 in the FPSCR is reserved and defined as zero,
// so we ensure that we don't set it.
if (bit != 20)
{
const u32 b = 0x80000000 >> bit;
if (b & FPSCR_ANY_X) if (b & FPSCR_ANY_X)
SetFPException(b); SetFPException(b);
else else
FPSCR.Hex |= b; FPSCR.Hex |= b;
FPSCRtoFPUSettings(FPSCR); FPSCRtoFPUSettings(FPSCR);
}
if (inst.Rc) if (inst.Rc)
Helper_UpdateCR1(); Helper_UpdateCR1();
@ -74,10 +83,14 @@ void Interpreter::mtfsb1x(UGeckoInstruction inst)
void Interpreter::mtfsfix(UGeckoInstruction inst) void Interpreter::mtfsfix(UGeckoInstruction inst)
{ {
u32 mask = (0xF0000000 >> (4 * inst.CRFD)); // Bit 20 of the FPSCR is reserved and defined as zero on hardware,
u32 imm = (inst.hex << 16) & 0xF0000000; // so ensure that we don't set it.
const u32 field = inst.CRFD;
const u32 pre_shifted_mask = field == 4 ? 0x70000000 : 0xF0000000;
const u32 mask = (pre_shifted_mask >> (4 * field));
const u32 imm = (inst.hex << 16) & pre_shifted_mask;
FPSCR.Hex = (FPSCR.Hex & ~mask) | (imm >> (4 * inst.CRFD)); FPSCR.Hex = (FPSCR.Hex & ~mask) | (imm >> (4 * field));
FPSCRtoFPUSettings(FPSCR); FPSCRtoFPUSettings(FPSCR);
@ -95,6 +108,12 @@ void Interpreter::mtfsfx(UGeckoInstruction inst)
m |= (0xFU << (i * 4)); m |= (0xFU << (i * 4));
} }
// Bit 20 of the FPSCR is defined as always being zero
// (bit 11 in a little endian context), so ensure that
// we don't actually set that bit.
if ((fm & 0b100) != 0)
m &= 0xFFFFF7FF;
FPSCR.Hex = (FPSCR.Hex & ~m) | (static_cast<u32>(riPS0(inst.FB)) & m); FPSCR.Hex = (FPSCR.Hex & ~m) | (static_cast<u32>(riPS0(inst.FB)) & m);
FPSCRtoFPUSettings(FPSCR); FPSCRtoFPUSettings(FPSCR);