CMakeLists fix, rebooting fix

This commit is contained in:
Henrik Rydgard 2012-11-06 22:03:25 +01:00
parent 83fb5e96de
commit 00fc7754c6
4 changed files with 8 additions and 1 deletions

View File

@ -28,7 +28,6 @@ set(SRCS
HLE/sceIo.cpp
HLE/sceKernel.cpp
HLE/sceKernelAlarm.cpp
HLE/sceKernelCallback.cpp
HLE/sceKernelEventFlag.cpp
HLE/sceKernelInterrupt.cpp
HLE/sceKernelMemory.cpp

View File

@ -105,6 +105,10 @@ void __KernelShutdown()
kernelRunning = false;
}
bool __KernelIsRunning() {
return kernelRunning;
}
void sceKernelExitGame()
{
INFO_LOG(HLE,"sceKernelExitGame");

View File

@ -240,6 +240,7 @@ struct SceKernelLoadExecParam
void __KernelInit();
void __KernelShutdown();
bool __KernelIsRunning();
bool __KernelLoadExec(const char *filename, SceKernelLoadExecParam *param);

View File

@ -476,6 +476,9 @@ u32 __KernelGetModuleGP(SceUID module)
bool __KernelLoadExec(const char *filename, SceKernelLoadExecParam *param, std::string *error_string)
{
// Wipe kernel here, loadexec should reset the entire system
if (__KernelIsRunning())
__KernelShutdown();
__KernelInit();
PSPFileInfo info = pspFileSystem.GetFileInfo(filename);