mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-08 07:51:28 +12:00
Migration to named_thread<>
Add atomic_t<>::try_dec instead of fetch_dec_sat Add atomic_t<>::try_inc GDBDebugServer is broken (needs rewrite) Removed old_thread class (former named_thread) Removed storing/rethrowing exceptions from thread Emu.Stop doesn't inject an exception anymore task_stack helper class removed thread_base simplified (no shared_from_this) thread_ctrl::spawn simplified (creates detached thread) Implemented overrideable thread detaching logic Disabled cellAdec, cellDmux, cellFsAio SPUThread renamed to spu_thread RawSPUThread removed, spu_thread used instead Disabled deriving from ppu_thread Partial support for thread renaming lv2_timer... simplified, screw it idm/fxm: butchered support for on_stop/on_init vm: improved allocation structure (added size)
This commit is contained in:
Nekotekina
parent
8ca6c9fff0
commit
1b37e775be
82 changed files with 1820 additions and 2023 deletions
|
|
@ -140,7 +140,7 @@ namespace spu
|
|||
u32 pc = 0;
|
||||
bool active = false;
|
||||
|
||||
concurrent_execution_watchdog(SPUThread& spu)
|
||||
concurrent_execution_watchdog(spu_thread& spu)
|
||||
:pc(spu.pc)
|
||||
{
|
||||
if (g_cfg.core.preferred_spu_threads > 0)
|
||||
|
|
@ -391,35 +391,12 @@ spu_imm_table_t::spu_imm_table_t()
|
|||
}
|
||||
}
|
||||
|
||||
void SPUThread::on_spawn()
|
||||
std::string spu_thread::get_name() const
|
||||
{
|
||||
if (g_cfg.core.thread_scheduler_enabled)
|
||||
{
|
||||
thread_ctrl::set_thread_affinity_mask(thread_ctrl::get_affinity_mask(thread_class::spu));
|
||||
}
|
||||
|
||||
if (g_cfg.core.lower_spu_priority)
|
||||
{
|
||||
thread_ctrl::set_native_priority(-1);
|
||||
}
|
||||
return fmt::format("%sSPU[0x%x] Thread (%s)", offset >= RAW_SPU_BASE_ADDR ? "Raw" : "", id, spu_name.get());
|
||||
}
|
||||
|
||||
void SPUThread::on_init(const std::shared_ptr<void>& _this)
|
||||
{
|
||||
if (!offset)
|
||||
{
|
||||
const_cast<u32&>(offset) = verify("SPU LS" HERE, vm::alloc(0x40000, vm::main));
|
||||
|
||||
cpu_thread::on_init(_this);
|
||||
}
|
||||
}
|
||||
|
||||
std::string SPUThread::get_name() const
|
||||
{
|
||||
return fmt::format("%sSPU[0x%x] Thread (%s)", offset >= RAW_SPU_BASE_ADDR ? "Raw" : "", id, m_name);
|
||||
}
|
||||
|
||||
std::string SPUThread::dump() const
|
||||
std::string spu_thread::dump() const
|
||||
{
|
||||
std::string ret = cpu_thread::dump();
|
||||
|
||||
|
|
@ -451,7 +428,7 @@ std::string SPUThread::dump() const
|
|||
return ret;
|
||||
}
|
||||
|
||||
void SPUThread::cpu_init()
|
||||
void spu_thread::cpu_init()
|
||||
{
|
||||
gpr = {};
|
||||
fpscr.Reset();
|
||||
|
|
@ -501,8 +478,15 @@ void SPUThread::cpu_init()
|
|||
|
||||
extern thread_local std::string(*g_tls_log_prefix)();
|
||||
|
||||
void SPUThread::cpu_task()
|
||||
void spu_thread::cpu_task()
|
||||
{
|
||||
// Get next PC and SPU Interrupt status
|
||||
pc = npc.exchange(0);
|
||||
|
||||
set_interrupt_status((pc & 1) != 0);
|
||||
|
||||
pc &= 0x3fffc;
|
||||
|
||||
std::fesetround(FE_TOWARDZERO);
|
||||
|
||||
if (g_cfg.core.set_daz_and_ftz && g_cfg.core.spu_decoder != spu_decoder_type::precise)
|
||||
|
|
@ -513,9 +497,8 @@ void SPUThread::cpu_task()
|
|||
|
||||
g_tls_log_prefix = []
|
||||
{
|
||||
const auto cpu = static_cast<SPUThread*>(get_current_cpu_thread());
|
||||
|
||||
return fmt::format("%s [0x%05x]", cpu->get_name(), cpu->pc);
|
||||
const auto cpu = static_cast<spu_thread*>(get_current_cpu_thread());
|
||||
return fmt::format("%s [0x%05x]", thread_ctrl::get_name(), cpu->pc);
|
||||
};
|
||||
|
||||
if (jit)
|
||||
|
|
@ -525,6 +508,9 @@ void SPUThread::cpu_task()
|
|||
jit_dispatcher[pc / 4](*this, vm::_ptr<u8>(offset), nullptr);
|
||||
}
|
||||
|
||||
// save next PC and current SPU Interrupt status
|
||||
npc = pc | (interrupts_enabled);
|
||||
|
||||
// Print some stats
|
||||
LOG_NOTICE(SPU, "Stats: Block Weight: %u (Retreats: %u);", block_counter, block_failure);
|
||||
return;
|
||||
|
|
@ -548,7 +534,8 @@ void SPUThread::cpu_task()
|
|||
{
|
||||
if (UNLIKELY(state))
|
||||
{
|
||||
if (check_state()) return;
|
||||
if (check_state())
|
||||
break;
|
||||
|
||||
// Decode single instruction (may be step)
|
||||
const u32 op = *reinterpret_cast<const be_t<u32>*>(base + pc);
|
||||
|
|
@ -606,29 +593,39 @@ void SPUThread::cpu_task()
|
|||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// save next PC and current SPU Interrupt status
|
||||
npc = pc | (interrupts_enabled);
|
||||
}
|
||||
|
||||
void SPUThread::cpu_mem()
|
||||
void spu_thread::cpu_mem()
|
||||
{
|
||||
//vm::passive_lock(*this);
|
||||
}
|
||||
|
||||
void SPUThread::cpu_unmem()
|
||||
void spu_thread::cpu_unmem()
|
||||
{
|
||||
//state.test_and_set(cpu_flag::memory);
|
||||
}
|
||||
|
||||
SPUThread::~SPUThread()
|
||||
spu_thread::~spu_thread()
|
||||
{
|
||||
// Deallocate Local Storage
|
||||
vm::dealloc_verbose_nothrow(offset);
|
||||
|
||||
// Deallocate RawSPU ID
|
||||
if (!group && offset >= RAW_SPU_BASE_ADDR)
|
||||
{
|
||||
g_raw_spu_id[index] = 0;
|
||||
g_raw_spu_ctr--;
|
||||
}
|
||||
}
|
||||
|
||||
SPUThread::SPUThread(const std::string& name, u32 index, lv2_spu_group* group)
|
||||
spu_thread::spu_thread(vm::addr_t ls, lv2_spu_group* group, u32 index, std::string_view name)
|
||||
: cpu_thread(idm::last_id())
|
||||
, m_name(name)
|
||||
, spu_name(name)
|
||||
, index(index)
|
||||
, offset(0)
|
||||
, offset(ls)
|
||||
, group(group)
|
||||
{
|
||||
if (g_cfg.core.spu_decoder == spu_decoder_type::asmjit)
|
||||
|
|
@ -652,9 +649,14 @@ SPUThread::SPUThread(const std::string& name, u32 index, lv2_spu_group* group)
|
|||
std::memset(stack_mirror.data(), 0xff, sizeof(stack_mirror));
|
||||
}
|
||||
}
|
||||
|
||||
if (!group && offset >= RAW_SPU_BASE_ADDR)
|
||||
{
|
||||
cpu_init();
|
||||
}
|
||||
}
|
||||
|
||||
void SPUThread::push_snr(u32 number, u32 value)
|
||||
void spu_thread::push_snr(u32 number, u32 value)
|
||||
{
|
||||
// Get channel
|
||||
const auto channel = number & 1 ? &ch_snr2 : &ch_snr1;
|
||||
|
|
@ -670,7 +672,7 @@ void SPUThread::push_snr(u32 number, u32 value)
|
|||
}
|
||||
}
|
||||
|
||||
void SPUThread::do_dma_transfer(const spu_mfc_cmd& args)
|
||||
void spu_thread::do_dma_transfer(const spu_mfc_cmd& args)
|
||||
{
|
||||
const bool is_get = (args.cmd & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK | MFC_START_MASK)) == MFC_GET_CMD;
|
||||
|
||||
|
|
@ -686,7 +688,7 @@ void SPUThread::do_dma_transfer(const spu_mfc_cmd& args)
|
|||
if (eal < SYS_SPU_THREAD_BASE_LOW)
|
||||
{
|
||||
// RawSPU MMIO
|
||||
auto thread = idm::get<RawSPUThread>((eal - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET);
|
||||
auto thread = idm::get<named_thread<spu_thread>>(find_raw_spu((eal - RAW_SPU_BASE_ADDR) / RAW_SPU_OFFSET));
|
||||
|
||||
if (!thread)
|
||||
{
|
||||
|
|
@ -717,7 +719,7 @@ void SPUThread::do_dma_transfer(const spu_mfc_cmd& args)
|
|||
}
|
||||
else if (group && group->threads[index])
|
||||
{
|
||||
auto& spu = static_cast<SPUThread&>(*group->threads[index]);
|
||||
auto& spu = static_cast<spu_thread&>(*group->threads[index]);
|
||||
|
||||
if (offset + args.size - 1 < 0x40000) // LS access
|
||||
{
|
||||
|
|
@ -890,7 +892,7 @@ void SPUThread::do_dma_transfer(const spu_mfc_cmd& args)
|
|||
}
|
||||
}
|
||||
|
||||
bool SPUThread::do_dma_check(const spu_mfc_cmd& args)
|
||||
bool spu_thread::do_dma_check(const spu_mfc_cmd& args)
|
||||
{
|
||||
const u32 mask = 1u << args.tag;
|
||||
|
||||
|
|
@ -940,7 +942,7 @@ bool SPUThread::do_dma_check(const spu_mfc_cmd& args)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool SPUThread::do_list_transfer(spu_mfc_cmd& args)
|
||||
bool spu_thread::do_list_transfer(spu_mfc_cmd& args)
|
||||
{
|
||||
struct list_element
|
||||
{
|
||||
|
|
@ -994,7 +996,7 @@ bool SPUThread::do_list_transfer(spu_mfc_cmd& args)
|
|||
return true;
|
||||
}
|
||||
|
||||
void SPUThread::do_putlluc(const spu_mfc_cmd& args)
|
||||
void spu_thread::do_putlluc(const spu_mfc_cmd& args)
|
||||
{
|
||||
const u32 addr = args.eal & -128u;
|
||||
|
||||
|
|
@ -1047,7 +1049,7 @@ void SPUThread::do_putlluc(const spu_mfc_cmd& args)
|
|||
vm::reservation_notifier(addr, 128).notify_all();
|
||||
}
|
||||
|
||||
void SPUThread::do_mfc(bool wait)
|
||||
void spu_thread::do_mfc(bool wait)
|
||||
{
|
||||
u32 removed = 0;
|
||||
u32 barrier = 0;
|
||||
|
|
@ -1149,17 +1151,17 @@ void SPUThread::do_mfc(bool wait)
|
|||
}
|
||||
}
|
||||
|
||||
u32 SPUThread::get_mfc_completed()
|
||||
u32 spu_thread::get_mfc_completed()
|
||||
{
|
||||
return ch_tag_mask & ~mfc_fence;
|
||||
}
|
||||
|
||||
bool SPUThread::process_mfc_cmd(spu_mfc_cmd args)
|
||||
bool spu_thread::process_mfc_cmd(spu_mfc_cmd args)
|
||||
{
|
||||
// Stall infinitely if MFC queue is full
|
||||
while (UNLIKELY(mfc_size >= 16))
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1192,7 +1194,7 @@ bool SPUThread::process_mfc_cmd(spu_mfc_cmd args)
|
|||
|
||||
while (rdata == data && vm::reservation_acquire(raddr, 128) == rtime)
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
|
@ -1446,7 +1448,7 @@ bool SPUThread::process_mfc_cmd(spu_mfc_cmd args)
|
|||
args.cmd, args.lsa, args.eal, args.tag, args.size);
|
||||
}
|
||||
|
||||
u32 SPUThread::get_events(bool waiting)
|
||||
u32 spu_thread::get_events(bool waiting)
|
||||
{
|
||||
const u32 mask1 = ch_event_mask;
|
||||
|
||||
|
|
@ -1485,7 +1487,7 @@ u32 SPUThread::get_events(bool waiting)
|
|||
});
|
||||
}
|
||||
|
||||
void SPUThread::set_events(u32 mask)
|
||||
void spu_thread::set_events(u32 mask)
|
||||
{
|
||||
if (mask & ~SPU_EVENT_IMPLEMENTED)
|
||||
{
|
||||
|
|
@ -1502,7 +1504,7 @@ void SPUThread::set_events(u32 mask)
|
|||
}
|
||||
}
|
||||
|
||||
void SPUThread::set_interrupt_status(bool enable)
|
||||
void spu_thread::set_interrupt_status(bool enable)
|
||||
{
|
||||
if (enable)
|
||||
{
|
||||
|
|
@ -1520,7 +1522,7 @@ void SPUThread::set_interrupt_status(bool enable)
|
|||
}
|
||||
}
|
||||
|
||||
u32 SPUThread::get_ch_count(u32 ch)
|
||||
u32 spu_thread::get_ch_count(u32 ch)
|
||||
{
|
||||
LOG_TRACE(SPU, "get_ch_count(ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???");
|
||||
|
||||
|
|
@ -1542,7 +1544,7 @@ u32 SPUThread::get_ch_count(u32 ch)
|
|||
fmt::throw_exception("Unknown/illegal channel (ch=%d [%s])" HERE, ch, ch < 128 ? spu_ch_name[ch] : "???");
|
||||
}
|
||||
|
||||
s64 SPUThread::get_ch_value(u32 ch)
|
||||
s64 spu_thread::get_ch_value(u32 ch)
|
||||
{
|
||||
LOG_TRACE(SPU, "get_ch_value(ch=%d [%s])", ch, ch < 128 ? spu_ch_name[ch] : "???");
|
||||
|
||||
|
|
@ -1557,7 +1559,7 @@ s64 SPUThread::get_ch_value(u32 ch)
|
|||
|
||||
while (!channel.try_pop(out))
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1595,7 +1597,7 @@ s64 SPUThread::get_ch_value(u32 ch)
|
|||
return out;
|
||||
}
|
||||
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1699,7 +1701,7 @@ s64 SPUThread::get_ch_value(u32 ch)
|
|||
|
||||
while (res = get_events(), !res)
|
||||
{
|
||||
if (state & (cpu_flag::stop + cpu_flag::dbg_global_stop))
|
||||
if (is_stopped())
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1712,7 +1714,7 @@ s64 SPUThread::get_ch_value(u32 ch)
|
|||
|
||||
while (res = get_events(true), !res)
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1734,7 +1736,7 @@ s64 SPUThread::get_ch_value(u32 ch)
|
|||
fmt::throw_exception("Unknown/illegal channel (ch=%d [%s])" HERE, ch, ch < 128 ? spu_ch_name[ch] : "???");
|
||||
}
|
||||
|
||||
bool SPUThread::set_ch_value(u32 ch, u32 value)
|
||||
bool spu_thread::set_ch_value(u32 ch, u32 value)
|
||||
{
|
||||
LOG_TRACE(SPU, "set_ch_value(ch=%d [%s], value=0x%x)", ch, ch < 128 ? spu_ch_name[ch] : "???", value);
|
||||
|
||||
|
|
@ -1752,7 +1754,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value)
|
|||
{
|
||||
while (!ch_out_intr_mbox.try_push(value))
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -1898,7 +1900,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value)
|
|||
{
|
||||
while (!ch_out_mbox.try_push(value))
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -2043,7 +2045,7 @@ bool SPUThread::set_ch_value(u32 ch, u32 value)
|
|||
fmt::throw_exception("Unknown/illegal channel (ch=%d [%s], value=0x%x)" HERE, ch, ch < 128 ? spu_ch_name[ch] : "???", value);
|
||||
}
|
||||
|
||||
bool SPUThread::stop_and_signal(u32 code)
|
||||
bool spu_thread::stop_and_signal(u32 code)
|
||||
{
|
||||
LOG_TRACE(SPU, "stop_and_signal(code=0x%x)", code);
|
||||
|
||||
|
|
@ -2087,7 +2089,7 @@ bool SPUThread::stop_and_signal(u32 code)
|
|||
// HACK: wait for executable code
|
||||
while (!_ref<u32>(pc))
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -2143,7 +2145,7 @@ bool SPUThread::stop_and_signal(u32 code)
|
|||
// Check group status, wait if necessary
|
||||
while (group->run_state >= SPU_THREAD_GROUP_STATUS_WAITING && group->run_state <= SPU_THREAD_GROUP_STATUS_SUSPENDED)
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -2212,7 +2214,7 @@ bool SPUThread::stop_and_signal(u32 code)
|
|||
|
||||
while (true)
|
||||
{
|
||||
if (state & cpu_flag::stop)
|
||||
if (is_stopped())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
@ -2246,7 +2248,7 @@ bool SPUThread::stop_and_signal(u32 code)
|
|||
|
||||
if (thread.get() != this)
|
||||
{
|
||||
thread->notify();
|
||||
thread_ctrl::notify(*thread);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2285,7 +2287,7 @@ bool SPUThread::stop_and_signal(u32 code)
|
|||
if (thread && thread.get() != this)
|
||||
{
|
||||
thread->state += cpu_flag::stop;
|
||||
thread->notify();
|
||||
thread_ctrl::notify(*thread);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2329,7 +2331,7 @@ bool SPUThread::stop_and_signal(u32 code)
|
|||
}
|
||||
}
|
||||
|
||||
void SPUThread::halt()
|
||||
void spu_thread::halt()
|
||||
{
|
||||
LOG_TRACE(SPU, "halt()");
|
||||
|
||||
|
|
@ -2350,7 +2352,7 @@ void SPUThread::halt()
|
|||
fmt::throw_exception("Halt" HERE);
|
||||
}
|
||||
|
||||
void SPUThread::fast_call(u32 ls_addr)
|
||||
void spu_thread::fast_call(u32 ls_addr)
|
||||
{
|
||||
// LS:0x0: this is originally the entry point of the interrupt handler, but interrupts are not implemented
|
||||
_ref<u32>(0) = 0x00000002; // STOP 2
|
||||
|
|
@ -2378,3 +2380,6 @@ void SPUThread::fast_call(u32 ls_addr)
|
|||
gpr[0]._u32[3] = old_lr;
|
||||
gpr[1]._u32[3] = old_stack;
|
||||
}
|
||||
|
||||
DECLARE(spu_thread::g_raw_spu_ctr){};
|
||||
DECLARE(spu_thread::g_raw_spu_id){};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue