piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Corrected a state bug where newly loaded dols did not have their patches applied.

Browse Source
This commit is contained in:
skidau
2013-01-05 12:32:47 +11:00
parent 95f6685900
commit 1c9c6052d5
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Core/Core/Src/HLE/HLE_Misc.cpp
View File

@ -40,7 +40,6 @@ namespace HLE_Misc
std::string args; std::string args;
u32 argsPtr; u32 argsPtr;
u32 bootType; u32 bootType;
u16 IOSv;
// Helper to quickly read the floating point value at a memory location. // Helper to quickly read the floating point value at a memory location.
inline float F(u32 addr) inline float F(u32 addr)
@ -312,6 +311,7 @@ void ExecuteDOL(u8* dolFile, u32 fileSize)
// Scan for common HLE functions // Scan for common HLE functions
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging) if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableDebugging)
{ {
g_symbolDB.Clear();
PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB); PPCAnalyst::FindFunctions(0x80004000, 0x811fffff, &g_symbolDB);
SignatureDB db; SignatureDB db;
if (db.Load((File::GetSysDirectory() + TOTALDB).c_str())) if (db.Load((File::GetSysDirectory() + TOTALDB).c_str()))
@ -325,9 +325,15 @@ void ExecuteDOL(u8* dolFile, u32 fileSize)
PowerPC::ppcState.iCache.Reset(); PowerPC::ppcState.iCache.Reset();
static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer(); static CWII_IPC_HLE_Device_usb_oh1_57e_305* s_Usb = GetUsbPointer();
for (unsigned int i = 0; i < 4; i++) bool* wiiMoteConnected = new bool[s_Usb->m_WiiMotes.size()];
for(unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++)
wiiMoteConnected[i] = s_Usb->m_WiiMotes[i].IsConnected();
WII_IPC_HLE_Interface::Reset(true);
WII_IPC_HLE_Interface::Init();
for (unsigned int i = 0; i < s_Usb->m_WiiMotes.size(); i++)
{ {
if (s_Usb->m_WiiMotes[i].IsConnected()) if (wiiMoteConnected[i])
{ {
s_Usb->m_WiiMotes[i].Activate(false); s_Usb->m_WiiMotes[i].Activate(false);
s_Usb->m_WiiMotes[i].Activate(true); s_Usb->m_WiiMotes[i].Activate(true);
@ -338,6 +344,8 @@ void ExecuteDOL(u8* dolFile, u32 fileSize)
} }
} }
delete[] wiiMoteConnected;
if (argsPtr) if (argsPtr)
{ {
u32 args_base = Memory::Read_U32(0x800000f4); u32 args_base = Memory::Read_U32(0x800000f4);
@ -475,11 +483,14 @@ void OSGetResetCode()
NPC = LR; NPC = LR;
} }
u16 GetIOSVersion()
{
return Memory::Read_U16(0x00003140);
}
void OSBootDol() void OSBootDol()
{ {
IOSv = Memory::Read_U16(0x00003140); if (GetIOSVersion() >= 30)
if (IOSv >= 30)
{ {
bootType = GPR(4); bootType = GPR(4);