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

apply patches in the gamecube's bs2 hle, good for things that need to have patches applied very early. 

misc cleanup

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4436 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-10-19 15:09:22 +00:00
parent 091a454c50
commit f5f0823867
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
View File

@ -158,6 +158,9 @@ void CBoot::EmulatedBS2(bool _bDebug)
PatchEngine::LoadPatches(gameID.c_str()); PatchEngine::LoadPatches(gameID.c_str());
PowerPC::ppcState.DebugCount = 0; PowerPC::ppcState.DebugCount = 0;
// If we have any patches that need to be applied very early, here's a good place
PatchEngine::ApplyFramePatches();
} }

12
Source/Core/Core/Src/HW/ProcessorInterface.cpp
View File

@ -232,20 +232,20 @@ void SetInterrupt(u32 _causemask, bool _bSet)
if (_bSet && !(m_InterruptCause & _causemask)) if (_bSet && !(m_InterruptCause & _causemask))
{ {
DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (%s)",Debug_GetInterruptName(_causemask), "set"); DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (%s)", Debug_GetInterruptName(_causemask), "set");
} }
if (!_bSet && (m_InterruptCause & _causemask)) if (!_bSet && (m_InterruptCause & _causemask))
{ {
DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (%s)",Debug_GetInterruptName(_causemask), "clear"); DEBUG_LOG(PROCESSORINTERFACE, "Setting Interrupt %s (%s)", Debug_GetInterruptName(_causemask), "clear");
} }
if (_bSet) if (_bSet)
m_InterruptCause |= _causemask; m_InterruptCause |= _causemask;
else else
m_InterruptCause &= ~_causemask; // is there any reason to have this possibility? m_InterruptCause &= ~_causemask;// is there any reason to have this possibility?
// F|RES: i think the hw devices reset the interrupt in the PI to 0 // F|RES: i think the hw devices reset the interrupt in the PI to 0
// if the interrupt cause is eliminated. that isnt done by software (afaik) // if the interrupt cause is eliminated. that isnt done by software (afaik)
UpdateException(); UpdateException();
} }

4
Source/Core/Core/Src/PluginManager.cpp
View File

@ -389,10 +389,10 @@ Common::PluginPAD *CPluginManager::GetPad(int controller)
// Else do this // Else do this
if (OkayToInitPlugin(controller) == -1) { if (OkayToInitPlugin(controller) == -1) {
m_pad[controller] = (Common::PluginPAD*)LoadPlugin(m_params->m_strPadPlugin[controller].c_str(), controller); m_pad[controller] = (Common::PluginPAD*)LoadPlugin(m_params->m_strPadPlugin[controller].c_str(), controller);
INFO_LOG(CONSOLE, "LoadPlugin: %i\n", controller); INFO_LOG(CONSOLE, "LoadPlugin: %i", controller);
} }
else { else {
INFO_LOG(CONSOLE, "Pointed: %i to %i\n", controller, OkayToInitPlugin(controller)); INFO_LOG(CONSOLE, "Pointed: %i to %i", controller, OkayToInitPlugin(controller));
m_pad[controller] = m_pad[OkayToInitPlugin(controller)]; m_pad[controller] = m_pad[OkayToInitPlugin(controller)];
} }
return m_pad[controller]; return m_pad[controller];