archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 01:08:39 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix thread exit crash

Browse source
This commit is contained in:
elisha464 2014-01-23 21:37:59 +02:00
parent 64bfae6648
commit 8a3835bcef
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
rpcs3/Emu/CPU/CPUThread.cpp
View file

@ -351,6 +351,11 @@ void CPUThread::Task()
{ {
ConLog.Error("Exception: %s", e); ConLog.Error("Exception: %s", e);
} }
catch(int exitcode)
{
ConLog.Success("Exit Code: %d", exitcode);
return;
}
//ConLog.Write("%s leave", CPUThread::GetFName()); //ConLog.Write("%s leave", CPUThread::GetFName());

2
rpcs3/Emu/SysCalls/SysCalls.h
View file

@ -169,7 +169,7 @@ extern int sys_mutex_trylock(u32 mutex_id);
extern int sys_mutex_unlock(u32 mutex_id); extern int sys_mutex_unlock(u32 mutex_id);
//ppu_thread //ppu_thread
extern int sys_ppu_thread_exit(int errorcode); extern void sys_ppu_thread_exit(int errorcode);
extern int sys_ppu_thread_yield(); extern int sys_ppu_thread_yield();
extern int sys_ppu_thread_join(u32 thread_id, u32 vptr_addr); extern int sys_ppu_thread_join(u32 thread_id, u32 vptr_addr);
extern int sys_ppu_thread_detach(u32 thread_id); extern int sys_ppu_thread_detach(u32 thread_id);

4
rpcs3/Emu/SysCalls/lv2/SC_PPU_Thread.cpp
View file

@ -10,7 +10,7 @@ enum
SYS_PPU_THREAD_DONE_INIT, SYS_PPU_THREAD_DONE_INIT,
}; };
int sys_ppu_thread_exit(int errorcode) void sys_ppu_thread_exit(int errorcode)
{ {
if(errorcode == 0) if(errorcode == 0)
{ {
@ -25,7 +25,7 @@ int sys_ppu_thread_exit(int errorcode)
thr.SetExitStatus(errorcode); thr.SetExitStatus(errorcode);
Emu.GetCPU().RemoveThread(thr.GetId()); Emu.GetCPU().RemoveThread(thr.GetId());
return CELL_OK; throw errorcode;
} }
int sys_ppu_thread_yield() int sys_ppu_thread_yield()