libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-12-02 06:06:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #431 from unknownbrackets/timing-fix

Browse Source 
Timing fix
This commit is contained in:
Henrik Rydgård 2013-01-17 01:30:54 -08:00
commit 8f5c5df82f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/MIPS/MIPS.h
View File

@ -122,7 +122,7 @@ public:
u32 pc; u32 pc;
u32 nextPC; u32 nextPC;
u32 downcount; // This really doesn't belong here, it belongs in CoreTiming. But you gotta do what you gotta do, this needs to be reachable in the ARM JIT. int downcount; // This really doesn't belong here, it belongs in CoreTiming. But you gotta do what you gotta do, this needs to be reachable in the ARM JIT.
u32 hi; u32 hi;
u32 lo; u32 lo;

8
Core/System.cpp
View File

@ -65,6 +65,8 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string)
LogManager::GetInstance()->SetEnable(LogTypes::G3D, false); LogManager::GetInstance()->SetEnable(LogTypes::G3D, false);
} }
CoreTiming::Init();
// Init all the HLE modules // Init all the HLE modules
HLEInit(); HLEInit();
@ -73,8 +75,7 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string)
if (!LoadFile(coreParameter.fileToStart.c_str(), error_string)) if (!LoadFile(coreParameter.fileToStart.c_str(), error_string))
{ {
pspFileSystem.Shutdown(); pspFileSystem.Shutdown();
CoreTiming::ClearPendingEvents(); CoreTiming::Shutdown();
CoreTiming::UnregisterAllEvents();
__KernelShutdown(); __KernelShutdown();
HLEShutdown(); HLEShutdown();
host->ShutdownSound(); host->ShutdownSound();
@ -102,8 +103,7 @@ void PSP_Shutdown()
TextureCache_Clear(true); TextureCache_Clear(true);
CoreTiming::ClearPendingEvents(); CoreTiming::Shutdown();
CoreTiming::UnregisterAllEvents();
if (coreParameter.enableSound) if (coreParameter.enableSound)
{ {