RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 20:22:30 +01:00
Code Issues Releases Wiki Activity

Remove throwing and catching cpu_flag::stop

Browse Source 
Since there is spu_runtime::g_escape function now.
This commit is contained in:
Nekotekina 2019-11-08 01:36:19 +03:00
parent e74a311931
commit ccac9d4777
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/CPU/CPUThread.cpp
View File

@ -344,10 +344,6 @@ void cpu_thread::operator()()
{
cpu_task();
}
catch (cpu_flag _s)
{
state += _s;
}
catch (const std::exception& e)
{
Emu.Pause();

5
rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp
View File

@ -4,6 +4,7 @@
#include "Emu/Cell/PPUModule.h"
#include "Emu/Cell/SPUThread.h"
#include "Emu/Cell/SPURecompiler.h"
#include "Emu/Cell/lv2/sys_lwmutex.h"
#include "Emu/Cell/lv2/sys_lwcond.h"
#include "Emu/Cell/lv2/sys_spu.h"
@ -1799,7 +1800,7 @@ void spursTasksetDispatch(spu_thread& spu)
{
// TODO: Figure this out
spu.status |= SPU_STATUS_STOPPED_BY_STOP;
throw cpu_flag::stop;
spu_runtime::g_escape(&spu);
}
spursTasksetStartTask(spu, taskInfo->args);
@ -1853,7 +1854,7 @@ void spursTasksetDispatch(spu_thread& spu)
{
// TODO: Figure this out
spu.status |= SPU_STATUS_STOPPED_BY_STOP;
throw cpu_flag::stop;
spu_runtime::g_escape(&spu);
}
spu.gpr[3].clear();

14
rpcs3/Emu/Cell/PPUThread.cpp
View File

@ -868,19 +868,7 @@ void ppu_thread::fast_call(u32 addr, u32 rtoc)
}
});
try
{
exec_task();
}
catch (cpu_flag _s)
{
state += _s;
if (_s != cpu_flag::ret)
{
throw;
}
}
exec_task();
}
u32 ppu_thread::stack_push(u32 size, u32 align_v)

13
rpcs3/Emu/Cell/SPUThread.cpp
View File

@ -3125,7 +3125,8 @@ void spu_thread::halt()
int_ctrl[2].set(SPU_INT2_STAT_SPU_HALT_OR_STEP_INT);
throw cpu_flag::stop;
state += cpu_flag::stop;
spu_runtime::g_escape(this);
}
status |= SPU_STATUS_STOPPED_BY_HALT;
@ -3144,15 +3145,7 @@ void spu_thread::fast_call(u32 ls_addr)
pc = ls_addr;
gpr[0]._u32[3] = 0x0;
try
{
cpu_task();
}
catch (cpu_flag _s)
{
state += _s;
if (_s != cpu_flag::ret) throw;
}
cpu_task();
state -= cpu_flag::ret;