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

Gekko: Make UReg_MSR's single-argument constructor explicit 

Prevents implicit construction of MSR instances from integral values.
This is beneficial, considering MSR values have an intended
representation while a regular magic value doesn't. So make these
conversions required to be explicit.
This commit is contained in:
Lioncash 2018-05-05 17:51:34 -04:00
parent ffcf107dd2
commit 0043b77ccd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/FifoPlayer/FifoPlayer.cpp
View File

@ -428,7 +428,7 @@ void FifoPlayer::LoadMemory()
UReg_MSR newMSR; UReg_MSR newMSR;
newMSR.DR = 1; newMSR.DR = 1;
newMSR.IR = 1; newMSR.IR = 1;
MSR = newMSR.Hex; MSR.Hex = newMSR.Hex;
PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff; PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002; PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff; PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;

2
Source/Core/Core/PowerPC/Gekko.h
View File

@ -378,7 +378,7 @@ union UReg_MSR
u32 Hex = 0; u32 Hex = 0;
UReg_MSR() = default; UReg_MSR() = default;
UReg_MSR(u32 hex_) : Hex{hex_} {} explicit UReg_MSR(u32 hex_) : Hex{hex_} {}
}; };
#define FPRF_SHIFT 12 #define FPRF_SHIFT 12

2
Source/Core/Core/PowerPC/PowerPC.cpp
View File

@ -144,7 +144,7 @@ static void ResetRegisters()
SystemTimers::TimeBaseSet(); SystemTimers::TimeBaseSet();
// MSR should be 0x40, but we don't emulate BS1, so it would never be turned off :} // MSR should be 0x40, but we don't emulate BS1, so it would never be turned off :}
ppcState.msr = 0; ppcState.msr.Hex = 0;
rDEC = 0xFFFFFFFF; rDEC = 0xFFFFFFFF;
SystemTimers::DecrementerSet(); SystemTimers::DecrementerSet();
} }