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

Fix for a single core mode stop-hang. Fix a build error in IL mode. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2328 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-02-21 00:54:52 +00:00
parent 757d8728b7
commit e6ca85c059
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -475,9 +475,8 @@ THREAD_RETURN EmuThread(void *pArg)
// The hardware is uninitialized // The hardware is uninitialized
g_bHwInit = false; g_bHwInit = false;
Plugins.ShutdownPlugins();
HW::Shutdown(); HW::Shutdown();
Plugins.ShutdownPlugins();
LOG(MASTER_LOG, "EmuThread exited"); LOG(MASTER_LOG, "EmuThread exited");
// The CPU should return when a game is stopped and cleanup should be done here, // The CPU should return when a game is stopped and cleanup should be done here,

1
Source/Core/Core/Src/PowerPC/Jit64IL/JitAsm.cpp
View File

@ -30,7 +30,6 @@
#include "JitCache.h" #include "JitCache.h"
#include "Thunk.h" #include "Thunk.h"
#include "../../HW/CPUCompare.h"
#include "../../HW/GPFifo.h" #include "../../HW/GPFifo.h"
#include "../../Core.h" #include "../../Core.h"
#include "JitAsm.h" #include "JitAsm.h"

3
Source/Core/VideoCommon/Src/Fifo.cpp
View File

@ -51,7 +51,7 @@ void Fifo_Init()
{ {
videoBuffer = (u8*)AllocateMemoryPages(FIFO_SIZE); videoBuffer = (u8*)AllocateMemoryPages(FIFO_SIZE);
fifo_exit_event.Init(); fifo_exit_event.Init();
fifoStateRun = true; fifoStateRun = false;
g_XFBUpdateRequested = FALSE; g_XFBUpdateRequested = FALSE;
} }
@ -101,6 +101,7 @@ void Fifo_ExitLoop()
void Fifo_EnterLoop(const SVideoInitialize &video_initialize) void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
{ {
fifoStateRun = true;
SCPFifoStruct &_fifo = *video_initialize.pCPFifo; SCPFifoStruct &_fifo = *video_initialize.pCPFifo;
s32 distToSend; s32 distToSend;