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

RawSPU: protect NPC from writes/reads in running state

Browse source
This commit is contained in:
Eladash 2020-01-21 20:05:45 +02:00 • committed by Ani
parent fad8b38b28
commit 727d783959
7 changed files with 53 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

49
rpcs3/Emu/Cell/SPUThread.cpp
View file

@ -1067,9 +1067,7 @@ void spu_thread::cpu_init()
}
run_ctrl.raw() = 0;
status.raw() = 0;
npc.raw() = 0;
skip_npc_set = false;
status_npc.raw() = {};
int_ctrl[0].clear();
int_ctrl[1].clear();
@ -1082,15 +1080,19 @@ void spu_thread::cpu_stop()
{
if (!group && offset >= RAW_SPU_BASE_ADDR)
{
// Save next PC and current SPU Interrupt Status
if (skip_npc_set)
status_npc.fetch_op([this](status_npc_sync_var& state)
{
skip_npc_set = false;
}
else
{
npc = pc | interrupts_enabled;
}
if (state.status & SPU_STATUS_RUNNING)
{
// Save next PC and current SPU Interrupt Status
// Used only by RunCtrl stop requests
state.status &= ~SPU_STATUS_RUNNING;
state.npc = pc | +interrupts_enabled;
return true;
}
return false;
});
}
else if (group && is_stopped())
{
@ -1128,9 +1130,7 @@ extern thread_local std::string(*g_tls_log_prefix)();
void spu_thread::cpu_task()
{
// Get next PC and SPU Interrupt status
pc = npc.exchange(0);
skip_npc_set = false;
pc = status_npc.load().npc;
// Note: works both on RawSPU and threaded SPU!
set_interrupt_status((pc & 1) != 0);
@ -2786,14 +2786,13 @@ bool spu_thread::stop_and_signal(u32 code)
if (offset >= RAW_SPU_BASE_ADDR)
{
// Save next PC and current SPU Interrupt Status
npc = (pc + 4) | (interrupts_enabled);
skip_npc_set = true;
state += cpu_flag::stop + cpu_flag::wait;
status.atomic_op([code](u32& status)
status_npc.atomic_op([&](status_npc_sync_var& state)
{
status = (status & 0xffff) | (code << 16);
status |= SPU_STATUS_STOPPED_BY_STOP;
status &= ~SPU_STATUS_RUNNING;
state.status = (state.status & 0xffff) | (code << 16);
state.status |= SPU_STATUS_STOPPED_BY_STOP;
state.status &= ~SPU_STATUS_RUNNING;
state.npc = (pc + 4) | +interrupts_enabled;
});
int_ctrl[2].set(SPU_INT2_STAT_SPU_STOP_AND_SIGNAL_INT);
@ -3118,7 +3117,7 @@ bool spu_thread::stop_and_signal(u32 code)
}
spu_log.trace("sys_spu_thread_exit(status=0x%x)", ch_out_mbox.get_value());
status |= SPU_STATUS_STOPPED_BY_STOP;
status_npc = {SPU_STATUS_STOPPED_BY_STOP, 0};
state += cpu_flag::stop;
check_state();
return true;
@ -3143,10 +3142,11 @@ void spu_thread::halt()
{
state += cpu_flag::stop + cpu_flag::wait;
status.atomic_op([](u32& status)
status_npc.atomic_op([this](status_npc_sync_var& state)
{
status |= SPU_STATUS_STOPPED_BY_HALT;
status &= ~SPU_STATUS_RUNNING;
state.status |= SPU_STATUS_STOPPED_BY_HALT;
state.status &= ~SPU_STATUS_RUNNING;
state.npc = pc | +interrupts_enabled;
});
int_ctrl[2].set(SPU_INT2_STAT_SPU_HALT_OR_STEP_INT);
@ -3154,7 +3154,6 @@ void spu_thread::halt()
spu_runtime::g_escape(this);
}
status |= SPU_STATUS_STOPPED_BY_HALT;
fmt::throw_exception("Halt" HERE);
}