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

Merge pull request #5421 from JosJuice/load-bs2-setupbat 

Use SetupBAT in Load_BS2
This commit is contained in:
Markus Wick 2017-05-23 14:40:11 +02:00 committed by GitHub
parent 4870e4119b 1e56972e4f
commit e2d4fe6881
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -250,23 +250,23 @@ bool CBoot::Load_BS2(const std::string& boot_rom_filename)
// to work around this. // to work around this.
Memory::CopyToEmu(0x01200000, data.data() + 0x100, 0x700); Memory::CopyToEmu(0x01200000, data.data() + 0x100, 0x700);
Memory::CopyToEmu(0x01300000, data.data() + 0x820, 0x1AFE00); Memory::CopyToEmu(0x01300000, data.data() + 0x820, 0x1AFE00);
PowerPC::ppcState.gpr[3] = 0xfff0001f; PowerPC::ppcState.gpr[3] = 0xfff0001f;
PowerPC::ppcState.gpr[4] = 0x00002030; PowerPC::ppcState.gpr[4] = 0x00002030;
PowerPC::ppcState.gpr[5] = 0x0000009c; PowerPC::ppcState.gpr[5] = 0x0000009c;
PowerPC::ppcState.msr = 0x00002030;
UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
m_MSR.FP = 1;
m_MSR.DR = 1;
m_MSR.IR = 1;
PowerPC::ppcState.spr[SPR_HID0] = 0x0011c464; PowerPC::ppcState.spr[SPR_HID0] = 0x0011c464;
PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
PowerPC::ppcState.spr[SPR_IBAT3U] = 0xfff0001f; PowerPC::ppcState.spr[SPR_IBAT3U] = 0xfff0001f;
PowerPC::ppcState.spr[SPR_IBAT3L] = 0xfff00001; PowerPC::ppcState.spr[SPR_IBAT3L] = 0xfff00001;
PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
PowerPC::ppcState.spr[SPR_DBAT0L] = 0x00000002;
PowerPC::ppcState.spr[SPR_DBAT1U] = 0xc0001fff;
PowerPC::ppcState.spr[SPR_DBAT1L] = 0x0000002a;
PowerPC::ppcState.spr[SPR_DBAT3U] = 0xfff0001f; PowerPC::ppcState.spr[SPR_DBAT3U] = 0xfff0001f;
PowerPC::ppcState.spr[SPR_DBAT3L] = 0xfff00001; PowerPC::ppcState.spr[SPR_DBAT3L] = 0xfff00001;
PowerPC::DBATUpdated(); SetupBAT(/*is_wii*/ false);
PowerPC::IBATUpdated();
PC = 0x81200150; PC = 0x81200150;
return true; return true;
} }
@ -359,6 +359,7 @@ bool CBoot::BootUp()
if (dolWii) if (dolWii)
{ {
HID4.SBE = 1; HID4.SBE = 1;
SetupMSR();
SetupBAT(dolWii); SetupBAT(dolWii);
// Because there is no TMD to get the requested system (IOS) version from, // Because there is no TMD to get the requested system (IOS) version from,

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

@ -55,6 +55,7 @@ private:
static bool Boot_ELF(const std::string& filename); static bool Boot_ELF(const std::string& filename);
static bool Boot_WiiWAD(const std::string& filename); static bool Boot_WiiWAD(const std::string& filename);
static void SetupMSR();
static void SetupBAT(bool is_wii); static void SetupBAT(bool is_wii);
static bool RunApploader(bool is_wii, const DiscIO::IVolume& volume); static bool RunApploader(bool is_wii, const DiscIO::IVolume& volume);
static bool EmulatedBS2_GC(const DiscIO::IVolume* volume, bool skip_app_loader = false); 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(); PowerPC::SingleStep();
} }
void CBoot::SetupBAT(bool is_wii) void CBoot::SetupMSR()
{ {
UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr); UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
m_MSR.FP = 1; m_MSR.FP = 1;
m_MSR.DR = 1; m_MSR.DR = 1;
m_MSR.IR = 1; m_MSR.IR = 1;
m_MSR.EE = 1; m_MSR.EE = 1;
}
void CBoot::SetupBAT(bool is_wii)
{
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;
@ -158,6 +162,7 @@ bool CBoot::EmulatedBS2_GC(const DiscIO::IVolume* volume, bool skip_app_loader)
{ {
INFO_LOG(BOOT, "Faking GC BS2..."); INFO_LOG(BOOT, "Faking GC BS2...");
SetupMSR();
SetupBAT(/*is_wii*/ false); SetupBAT(/*is_wii*/ false);
// Write necessary values // Write necessary values
@ -350,6 +355,7 @@ bool CBoot::EmulatedBS2_Wii(const DiscIO::IVolume* volume)
// after this check during booting. // after this check during booting.
DVDRead(*volume, 0, 0x3180, 4, partition); DVDRead(*volume, 0, 0x3180, 4, partition);
SetupMSR();
SetupBAT(/*is_wii*/ true); SetupBAT(/*is_wii*/ true);
Memory::Write_U32(0x4c000064, 0x00000300); // Write default DSI Handler: rfi 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); const bool is_wii = IsElfWii(filename);
if (is_wii) if (is_wii)
HID4.SBE = 1; HID4.SBE = 1;
SetupMSR();
SetupBAT(is_wii); SetupBAT(is_wii);
if (!reader.LoadSymbols()) if (!reader.LoadSymbols())