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

Split SetupBAT into SetupMSR and SetupBAT

Browse Source
This commit is contained in:
JosJuice 2017-05-14 15:38:17 +02:00
parent 651340826d
commit 4726c9075f
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Boot/Boot.cpp
View File

@ -358,6 +358,7 @@ bool CBoot::BootUp()
if (dolWii)
{
HID4.SBE = 1;
SetupMSR();
SetupBAT(dolWii);
// Because there is no TMD to get the requested system (IOS) version from,

1
Source/Core/Core/Boot/Boot.h
View File

@ -54,6 +54,7 @@ private:
static bool Boot_ELF(const std::string& filename);
static bool Boot_WiiWAD(const std::string& filename);
static void SetupMSR();
static void SetupBAT(bool is_wii);
static bool RunApploader(bool is_wii, const DiscIO::IVolume& volume);
static bool EmulatedBS2_GC(const DiscIO::IVolume* volume, bool skip_app_loader = false);

8
Source/Core/Core/Boot/Boot_BS2Emu.cpp
View File

@ -51,13 +51,17 @@ void CBoot::RunFunction(u32 address)
PowerPC::SingleStep();
}
void CBoot::SetupBAT(bool is_wii)
void CBoot::SetupMSR()
{
UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
m_MSR.FP = 1;
m_MSR.DR = 1;
m_MSR.IR = 1;
m_MSR.EE = 1;
}
void CBoot::SetupBAT(bool is_wii)
{
PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
@ -155,6 +159,7 @@ bool CBoot::EmulatedBS2_GC(const DiscIO::IVolume* volume, bool skip_app_loader)
{
INFO_LOG(BOOT, "Faking GC BS2...");
SetupMSR();
SetupBAT(/*is_wii*/ false);
// Write necessary values
@ -346,6 +351,7 @@ bool CBoot::EmulatedBS2_Wii(const DiscIO::IVolume* volume)
// after this check during booting.
DVDRead(*volume, 0, 0x3180, 4, true);
SetupMSR();
SetupBAT(/*is_wii*/ true);
Memory::Write_U32(0x4c000064, 0x00000300); // Write default DSI Handler: rfi

1
Source/Core/Core/Boot/Boot_ELF.cpp
View File

@ -70,6 +70,7 @@ bool CBoot::Boot_ELF(const std::string& filename)
const bool is_wii = IsElfWii(filename);
if (is_wii)
HID4.SBE = 1;
SetupMSR();
SetupBAT(is_wii);
if (!reader.LoadSymbols())