From dfee5b9a6cc03ebecd60d2456bd773340f641302 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 16 May 2024 01:28:58 +0200 Subject: [PATCH] threads: replace magic number id_type with thread_class --- Utilities/Thread.cpp | 10 +- Utilities/Thread.h | 11 ++ rpcs3/Emu/CPU/CPUThread.cpp | 64 ++++--- rpcs3/Emu/CPU/CPUThread.h | 6 + rpcs3/Emu/Cell/SPUThread.cpp | 8 +- rpcs3/Emu/Cell/lv2/lv2.cpp | 4 +- rpcs3/Emu/Cell/lv2/sys_mmapper.cpp | 2 +- rpcs3/Emu/Cell/lv2/sys_rsx.cpp | 4 +- rpcs3/Emu/GDB.cpp | 181 +++++++++++++------- rpcs3/Emu/Memory/vm.cpp | 4 +- rpcs3/Emu/RSX/Core/RSXIOMap.hpp | 2 +- rpcs3/rpcs3qt/breakpoint_list.cpp | 11 +- rpcs3/rpcs3qt/debugger_frame.cpp | 62 +++---- rpcs3/rpcs3qt/debugger_list.cpp | 30 ++-- rpcs3/rpcs3qt/instruction_editor_dialog.cpp | 8 +- rpcs3/rpcs3qt/kernel_explorer.cpp | 2 +- rpcs3/rpcs3qt/memory_viewer_panel.cpp | 6 +- rpcs3/rpcs3qt/register_editor_dialog.cpp | 12 +- 18 files changed, 260 insertions(+), 167 deletions(-) diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index bb48d101af..f556927087 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -1520,7 +1520,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe return area->falloc(addr & -0x10000, 0x10000) || vm::check_addr(addr, is_writing ? vm::page_writable : vm::page_readable); }; - if (cpu && (cpu->id_type() == 1 || cpu->id_type() == 2)) + if (cpu && (cpu->get_class() == thread_class::ppu || cpu->get_class() == thread_class::spu)) { vm::temporary_unlock(*cpu); u32 pf_port_id = 0; @@ -1587,7 +1587,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe auto& pf_events = g_fxo->get(); // De-schedule - if (cpu->id_type() == 1) + if (cpu->get_class() == thread_class::ppu) { cpu->state -= cpu_flag::signal; // Cannot use check_state here and signal must be removed if exists lv2_obj::sleep(*cpu); @@ -1611,7 +1611,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe sig_log.warning("Page_fault %s location 0x%x because of %s memory", is_writing ? "writing" : "reading", addr, data3 == SYS_MEMORY_PAGE_FAULT_CAUSE_READ_ONLY ? "writing read-only" : "using unmapped"); - if (cpu->id_type() == 1) + if (cpu->get_class() == thread_class::ppu) { if (const auto func = static_cast(cpu)->current_function) { @@ -1661,7 +1661,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe return true; } - if (cpu->id_type() == 2) + if (cpu->get_class() == thread_class::spu) { if (!g_tls_access_violation_recovered) { @@ -1708,7 +1708,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe // Do not log any further access violations in this case. if (!g_tls_access_violation_recovered) { - vm_log.fatal("Access violation %s location 0x%x (%s)", is_writing ? "writing" : (cpu && cpu->id_type() == 1 && cpu->get_pc() == addr ? "executing" : "reading"), addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory"); + vm_log.fatal("Access violation %s location 0x%x (%s)", is_writing ? "writing" : (cpu && cpu->get_class() == thread_class::ppu && cpu->get_pc() == addr ? "executing" : "reading"), addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory"); } while (Emu.IsPaused()) diff --git a/Utilities/Thread.h b/Utilities/Thread.h index 052abbac23..5da3699f41 100644 --- a/Utilities/Thread.h +++ b/Utilities/Thread.h @@ -36,6 +36,17 @@ enum class thread_state : u32 mask = 3 }; +static inline thread_class get_thread_class(u32 thread_id_type) +{ + switch (thread_id_type) + { + case 1: return thread_class::ppu; + case 2: return thread_class::spu; + case 0x55: return thread_class::rsx; + default: return thread_class::general; + } +} + template class named_thread; diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 195f4da044..1f9e50b208 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -388,10 +388,10 @@ namespace cpu_counter { void add(cpu_thread* _this) noexcept { - switch (_this->id_type()) + switch (_this->get_class()) { - case 1: - case 2: + case thread_class::ppu: + case thread_class::spu: break; default: return; } @@ -521,7 +521,7 @@ void cpu_thread::operator()() if (g_cfg.core.thread_scheduler != thread_scheduler_mode::os) { - thread_ctrl::set_thread_affinity_mask(thread_ctrl::get_affinity_mask(id_type() == 1 ? thread_class::ppu : thread_class::spu)); + thread_ctrl::set_thread_affinity_mask(thread_ctrl::get_affinity_mask(get_class())); } while (!g_fxo->is_init()) @@ -535,14 +535,14 @@ void cpu_thread::operator()() thread_ctrl::wait_for(1000); } - switch (id_type()) + switch (get_class()) { - case 1: + case thread_class::ppu: { //g_fxo->get().registered.push(id); break; } - case 2: + case thread_class::spu: { if (g_cfg.core.spu_prof) { @@ -557,7 +557,7 @@ void cpu_thread::operator()() // Register thread in g_cpu_array s_cpu_counter++; - atomic_wait_engine::set_notify_callback(g_use_rtm || id_type() != 1 /* PPU */ ? nullptr : +[](const void*, u64 progress) + atomic_wait_engine::set_notify_callback(g_use_rtm || get_class() != thread_class::ppu ? nullptr : +[](const void*, u64 progress) { static thread_local bool wait_set = false; @@ -676,6 +676,7 @@ cpu_thread::~cpu_thread() cpu_thread::cpu_thread(u32 id) : id(id) + , m_class(get_thread_class(id_type())) { while (Emu.GetStatus() == system_state::paused) { @@ -1027,18 +1028,27 @@ void cpu_thread::notify() state.notify_one(); // Downcast to correct type - if (id_type() == 1) + switch (get_class()) + { + case thread_class::ppu: { thread_ctrl::notify(*static_cast*>(this)); + break; } - else if (id_type() == 2) + case thread_class::spu: { thread_ctrl::notify(*static_cast*>(this)); + break; } - else if (id_type() != 0x55) + case thread_class::rsx: + { + break; + } + default: { fmt::throw_exception("Invalid cpu_thread type"); } + } } cpu_thread& cpu_thread::operator=(thread_state) @@ -1108,13 +1118,13 @@ void cpu_thread::add_remove_flags(bs_t to_add, bs_t to_remov std::string cpu_thread::get_name() const { // Downcast to correct type - switch (id_type()) + switch (get_class()) { - case 1: + case thread_class::ppu: { return thread_ctrl::get_name(*static_cast*>(this)); } - case 2: + case thread_class::spu: { return thread_ctrl::get_name(*static_cast*>(this)); } @@ -1125,7 +1135,7 @@ std::string cpu_thread::get_name() const return thread_ctrl::get_name(); } - if (id_type() == 0x55) + if (get_class() == thread_class::rsx) { return fmt::format("rsx::thread"); } @@ -1139,19 +1149,19 @@ u32 cpu_thread::get_pc() const { const u32* pc = nullptr; - switch (id_type()) + switch (get_class()) { - case 1: + case thread_class::ppu: { pc = &static_cast(this)->cia; break; } - case 2: + case thread_class::spu: { pc = &static_cast(this)->pc; break; } - case 0x55: + case thread_class::rsx: { const auto ctrl = static_cast(this)->ctrl; return ctrl ? ctrl->get.load() : umax; @@ -1164,17 +1174,17 @@ u32 cpu_thread::get_pc() const u32* cpu_thread::get_pc2() { - switch (id_type()) + switch (get_class()) { - case 1: + case thread_class::ppu: { return &static_cast(this)->dbg_step_pc; } - case 2: + case thread_class::spu: { return &static_cast(this)->dbg_step_pc; } - case 0x55: + case thread_class::rsx: { const auto ctrl = static_cast(this)->ctrl; return ctrl ? &static_cast(this)->dbg_step_pc : nullptr; @@ -1187,13 +1197,13 @@ u32* cpu_thread::get_pc2() cpu_thread* cpu_thread::get_next_cpu() { - switch (id_type()) + switch (get_class()) { - case 1: + case thread_class::ppu: { return static_cast(this)->next_cpu; } - case 2: + case thread_class::spu: { return static_cast(this)->next_cpu; } @@ -1259,7 +1269,7 @@ std::vector> cpu_thread::dump_callstack_list() const std::string cpu_thread::dump_misc() const { - return fmt::format("Type: %s; State: %s\n", id_type() == 1 ? "PPU" : id_type() == 2 ? "SPU" : "RSX", state.load()); + return fmt::format("Type: %s; State: %s\n", get_class() == thread_class::ppu ? "PPU" : get_class() == thread_class::spu ? "SPU" : "RSX", state.load()); } bool cpu_thread::suspend_work::push(cpu_thread* _this) noexcept diff --git a/rpcs3/Emu/CPU/CPUThread.h b/rpcs3/Emu/CPU/CPUThread.h index a11e4cd869..1bce256c9e 100644 --- a/rpcs3/Emu/CPU/CPUThread.h +++ b/rpcs3/Emu/CPU/CPUThread.h @@ -118,6 +118,11 @@ public: return id >> 24; } + thread_class get_class() const + { + return m_class; + } + template T> T* try_get() { @@ -296,6 +301,7 @@ public: private: static thread_local cpu_thread* g_tls_this_thread; + const thread_class m_class; }; template T = cpu_thread> diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index 43e22f97e3..f2d7a91bc7 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -2401,7 +2401,7 @@ void spu_thread::do_dma_transfer(spu_thread* _this, const spu_mfc_cmd& args, u8* if (!_this) [[unlikely]] { - if (_cpu->id_type() == 2) + if (_cpu->get_class() == thread_class::spu) { // Use range_lock of current SPU thread for range locks range_lock = static_cast(_cpu)->range_lock; @@ -3900,7 +3900,7 @@ void do_cell_atomic_128_store(u32 addr, const void* to_write) mov_rdata(sdata, *static_cast(to_write)); vm::reservation_acquire(addr) += 32; } - else if (cpu->id_type() != 2) + else if (cpu->get_class() != thread_class::spu) { u64 stx, ftx; result = spu_putlluc_tx(addr, to_write, &stx, &ftx); @@ -5319,7 +5319,7 @@ s64 spu_thread::get_ch_value(u32 ch) atomic_wait_engine::set_one_time_use_wait_callback(+[](u64) -> bool { const auto _this = static_cast(cpu_thread::get_current()); - AUDIT(_this->id_type() == 1); + AUDIT(_this->get_class() == thread_class::ppu); return !_this->is_stopped(); }); @@ -5333,7 +5333,7 @@ s64 spu_thread::get_ch_value(u32 ch) atomic_wait_engine::set_one_time_use_wait_callback(mask1 != SPU_EVENT_LR ? nullptr : +[](u64 attempts) -> bool { const auto _this = static_cast(cpu_thread::get_current()); - AUDIT(_this->id_type() == 2); + AUDIT(_this->get_class() == thread_class::spu); const auto old = +_this->state; diff --git a/rpcs3/Emu/Cell/lv2/lv2.cpp b/rpcs3/Emu/Cell/lv2/lv2.cpp index ee67f369af..9dc241a993 100644 --- a/rpcs3/Emu/Cell/lv2/lv2.cpp +++ b/rpcs3/Emu/Cell/lv2/lv2.cpp @@ -1325,7 +1325,7 @@ bool lv2_obj::sleep(cpu_thread& cpu, const u64 timeout) prepare_for_sleep(cpu); } - if (cpu.id_type() == 1) + if (cpu.get_class() == thread_class::ppu) { if (u32 addr = static_cast(cpu).res_notify) { @@ -1571,7 +1571,7 @@ bool lv2_obj::sleep_unlocked(cpu_thread& thread, u64 timeout, u64 current_time) bool lv2_obj::awake_unlocked(cpu_thread* cpu, s32 prio) { // Check thread type - AUDIT(!cpu || cpu->id_type() == 1); + AUDIT(!cpu || cpu->get_class() == thread_class::ppu); bool push_first = false; diff --git a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp index d155cc358f..6a7058267b 100644 --- a/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_mmapper.cpp @@ -851,7 +851,7 @@ error_code mmapper_thread_recover_page_fault(cpu_thread* cpu) pf_events.events.erase(pf_event_ind); - if (cpu->id_type() == 1u) + if (cpu->get_class() == thread_class::ppu) { lv2_obj::awake(cpu); } diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index 7479da7f99..2230cf914e 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -104,7 +104,7 @@ bool rsx::thread::send_event(u64 data1, u64 event_flags, u64 data3) { auto cpu = get_current_cpu_thread(); - if (cpu && cpu->id_type() == 1) + if (cpu && cpu->get_class() == thread_class::ppu) { // Deschedule lv2_obj::sleep(*cpu, 100); @@ -113,7 +113,7 @@ bool rsx::thread::send_event(u64 data1, u64 event_flags, u64 data3) // Wait a bit before resending event thread_ctrl::wait_for(100); - if (cpu && cpu->id_type() == 0x55) + if (cpu && cpu->get_class() == thread_class::rsx) cpu->cpu_wait({}); if (Emu.IsStopped() || (cpu && cpu->check_state())) diff --git a/rpcs3/Emu/GDB.cpp b/rpcs3/Emu/GDB.cpp index b68b2d5e70..4f28f1c8d7 100644 --- a/rpcs3/Emu/GDB.cpp +++ b/rpcs3/Emu/GDB.cpp @@ -82,15 +82,18 @@ bool check_errno_again() #endif } -std::string u32_to_hex(u32 i) { +std::string u32_to_hex(u32 i) +{ return fmt::format("%x", i); } -std::string u64_to_padded_hex(u64 value) { +std::string u64_to_padded_hex(u64 value) +{ return fmt::format("%.16x", value); } -std::string u32_to_padded_hex(u32 value) { +std::string u32_to_padded_hex(u32 value) +{ return fmt::format("%.8x", value); } @@ -230,7 +233,8 @@ char gdb_thread::read_char() { char result; int cnt = read(&result, 1); - if (!cnt) { + if (!cnt) + { fmt::throw_exception("Tried to read char, but no data was available"); } return result; @@ -248,18 +252,22 @@ bool gdb_thread::try_read_cmd(gdb_cmd& out_cmd) { char c = read_char(); //interrupt - if (c == 0x03) [[unlikely]] { + if (c == 0x03) [[unlikely]] + { out_cmd.cmd = '\x03'; out_cmd.data = ""; out_cmd.checksum = 0; return true; } - if (c != '$') [[unlikely]] { + if (c != '$') [[unlikely]] + { //gdb starts conversation with + for some reason - if (c == '+') { + if (c == '+') + { c = read_char(); } - if (c != '$') { + if (c != '$') + { fmt::throw_exception("Expected start of packet character '$', got '%c' instead", c); } } @@ -269,28 +277,36 @@ bool gdb_thread::try_read_cmd(gdb_cmd& out_cmd) out_cmd.checksum = 0; bool cmd_part = true; u8 checksum = 0; - while(true) { + while (true) + { c = read_char(); - if (c == '#') { + if (c == '#') + { break; } checksum = (checksum + reinterpret_cast(c)) % 256; //escaped char - if (c == '}') { + if (c == '}') + { c = read_char() ^ 0x20; checksum = (checksum + reinterpret_cast(c)) % 256; } //cmd-data splitters - if (cmd_part && ((c == ':') || (c == '.') || (c == ';'))) { + if (cmd_part && ((c == ':') || (c == '.') || (c == ';'))) + { cmd_part = false; } - if (cmd_part) { + if (cmd_part) + { out_cmd.cmd += c; //only q and v commands can have multi-char command - if ((out_cmd.cmd.length() == 1) && (c != 'q') && (c != 'v')) { + if ((out_cmd.cmd.length() == 1) && (c != 'q') && (c != 'v')) + { cmd_part = false; } - } else { + } + else + { out_cmd.data += c; } } @@ -360,12 +376,14 @@ void gdb_thread::send_cmd(const std::string& cmd) bool gdb_thread::send_cmd_ack(const std::string& cmd) { - while (true) { + while (true) + { send_cmd(cmd); char c = read_char(); if (c == '+') [[likely]] return true; - if (c != '-') [[unlikely]] { + if (c != '-') [[unlikely]] + { GDB.error("Wrong acknowledge character received: '%c'.", c); return false; } @@ -376,7 +394,8 @@ bool gdb_thread::send_cmd_ack(const std::string& cmd) u8 gdb_thread::append_encoded_char(char c, std::string& str) { u8 checksum = 0; - if ((c == '#') || (c == '$') || (c == '}')) [[unlikely]] { + if ((c == '#') || (c == '$') || (c == '}')) [[unlikely]] + { str += '}'; c ^= 0x20; checksum = '}'; @@ -417,7 +436,8 @@ std::string gdb_thread::get_reg(ppu_thread* thread, u32 rid) { //ids from gdb/features/rs6000/powerpc-64.c //pc - switch (rid) { + switch (rid) + { case 64: return u64_to_padded_hex(thread->cia); //msr? @@ -445,7 +465,8 @@ std::string gdb_thread::get_reg(ppu_thread* thread, u32 rid) bool gdb_thread::set_reg(ppu_thread* thread, u32 rid, std::string value) { - switch (rid) { + switch (rid) + { case 64: thread->cia = static_cast(hex_to_u64(value)); return true; @@ -469,10 +490,13 @@ bool gdb_thread::set_reg(ppu_thread* thread, u32 rid, std::string value) return true; default: if (rid > 70) return false; - if (rid > 31) { + if (rid > 31) + { u64 val = hex_to_u64(value); thread->fpr[rid - 32] = std::bit_cast(val); - } else { + } + else + { thread->gpr[rid] = hex_to_u64(value); } return true; @@ -481,13 +505,15 @@ bool gdb_thread::set_reg(ppu_thread* thread, u32 rid, std::string value) u32 gdb_thread::get_reg_size(ppu_thread*, u32 rid) { - switch (rid) { + switch (rid) + { case 66: case 69: case 70: return 4; default: - if (rid > 70) { + if (rid > 70) + { return 0; } return 8; @@ -516,7 +542,9 @@ void gdb_thread::wait_with_interrupts() GDB.error("Error during socket read."); fmt::throw_exception("Error during socket read"); - } else if (c == 0x03) { + } + else if (c == 0x03) + { paused = true; } } @@ -542,7 +570,8 @@ bool gdb_thread::cmd_thread_info(gdb_cmd&) std::string result; const auto on_select = [&](u32, cpu_thread& cpu) { - if (!result.empty()) { + if (!result.empty()) + { result += ","; } result += u64_to_padded_hex(static_cast(cpu.id)); @@ -563,7 +592,8 @@ bool gdb_thread::cmd_current_thread(gdb_cmd&) bool gdb_thread::cmd_read_register(gdb_cmd& cmd) { - if (!select_thread(general_ops_thread_id)) { + if (!select_thread(general_ops_thread_id)) + { return send_cmd_ack("E02"); } auto th = selected_thread.lock(); @@ -571,7 +601,8 @@ bool gdb_thread::cmd_read_register(gdb_cmd& cmd) { u32 rid = hex_to_u32(cmd.data); std::string result = get_reg(ppu, rid); - if (result.empty()) { + if (result.empty()) + { GDB.warning("Wrong register id %d.", rid); return send_cmd_ack("E01"); } @@ -583,20 +614,24 @@ bool gdb_thread::cmd_read_register(gdb_cmd& cmd) bool gdb_thread::cmd_write_register(gdb_cmd& cmd) { - if (!select_thread(general_ops_thread_id)) { + if (!select_thread(general_ops_thread_id)) + { return send_cmd_ack("E02"); } auto th = selected_thread.lock(); - if (th->id_type() == 1) { + if (th->get_class() == thread_class::ppu) + { auto ppu = static_cast*>(th.get()); usz eq_pos = cmd.data.find('='); - if (eq_pos == umax) { + if (eq_pos == umax) + { GDB.warning("Wrong write_register cmd data '%s'.", cmd.data); return send_cmd_ack("E02"); } u32 rid = hex_to_u32(cmd.data.substr(0, eq_pos)); std::string value = cmd.data.substr(eq_pos + 1); - if (!set_reg(ppu, rid, value)) { + if (!set_reg(ppu, rid, value)) + { GDB.warning("Wrong register id %d.", rid); return send_cmd_ack("E01"); } @@ -613,15 +648,20 @@ bool gdb_thread::cmd_read_memory(gdb_cmd& cmd) u32 len = hex_to_u32(cmd.data.substr(s + 1)); std::string result; result.reserve(len * 2); - for (u32 i = 0; i < len; ++i) { - if (vm::check_addr(addr)) { + for (u32 i = 0; i < len; ++i) + { + if (vm::check_addr(addr)) + { result += to_hexbyte(vm::read8(addr + i)); - } else { + } + else + { break; //result += "xx"; } } - if (len && result.empty()) { + if (len && result.empty()) + { //nothing read return send_cmd_ack("E01"); } @@ -632,24 +672,30 @@ bool gdb_thread::cmd_write_memory(gdb_cmd& cmd) { usz s = cmd.data.find(','); usz s2 = cmd.data.find(':'); - if ((s == umax) || (s2 == umax)) { + if ((s == umax) || (s2 == umax)) + { GDB.warning("Malformed write memory request received: '%s'.", cmd.data); return send_cmd_ack("E01"); } u32 addr = hex_to_u32(cmd.data.substr(0, s)); u32 len = hex_to_u32(cmd.data.substr(s + 1, s2 - s - 1)); const char* data_ptr = (cmd.data.c_str()) + s2 + 1; - for (u32 i = 0; i < len; ++i) { - if (vm::check_addr(addr + i, vm::page_writable)) { + for (u32 i = 0; i < len; ++i) + { + if (vm::check_addr(addr + i, vm::page_writable)) + { u8 val; int res = sscanf_s(data_ptr, "%02hhX", &val); - if (!res) { + if (!res) + { GDB.warning("Couldn't read u8 from string '%s'.", data_ptr); return send_cmd_ack("E02"); } data_ptr += 2; vm::write8(addr + i, val); - } else { + } + else + { return send_cmd_ack("E03"); } } @@ -662,11 +708,13 @@ bool gdb_thread::cmd_read_all_registers(gdb_cmd&) select_thread(general_ops_thread_id); auto th = selected_thread.lock(); - if (th->id_type() == 1) { + if (th->get_class() == thread_class::ppu) + { auto ppu = static_cast*>(th.get()); //68 64-bit registers, and 3 32-bit result.reserve(68*16 + 3*8); - for (int i = 0; i < 71; ++i) { + for (int i = 0; i < 71; ++i) + { result += get_reg(ppu, i); } return send_cmd_ack(result); @@ -679,10 +727,12 @@ bool gdb_thread::cmd_write_all_registers(gdb_cmd& cmd) { select_thread(general_ops_thread_id); auto th = selected_thread.lock(); - if (th->id_type() == 1) { + if (th->get_class() == thread_class::ppu) + { auto ppu = static_cast*>(th.get()); int ptr = 0; - for (int i = 0; i < 71; ++i) { + for (int i = 0; i < 71; ++i) + { int sz = get_reg_size(ppu, i); set_reg(ppu, i, cmd.data.substr(ptr, sz * 2)); ptr += sz * 2; @@ -698,12 +748,16 @@ bool gdb_thread::cmd_set_thread_ops(gdb_cmd& cmd) char type = cmd.data[0]; std::string thread = cmd.data.substr(1); u64 id = thread == "-1" ? ALL_THREADS : hex_to_u64(thread); - if (type == 'c') { + if (type == 'c') + { continue_ops_thread_id = id; - } else { + } + else + { general_ops_thread_id = id; } - if (select_thread(id)) { + if (select_thread(id)) + { return send_cmd_ack("OK"); } GDB.warning("Client asked to use thread 0x%x for %s, but no matching thread was found.", id, type == 'c' ? "continue ops" : "general ops"); @@ -732,21 +786,27 @@ bool gdb_thread::cmd_vcont(gdb_cmd& cmd) { //todo: handle multiple actions and thread ids this->from_breakpoint = false; - if (cmd.data[1] == 'c' || cmd.data[1] == 's') { + if (cmd.data[1] == 'c' || cmd.data[1] == 's') + { select_thread(continue_ops_thread_id); auto ppu = std::static_pointer_cast>(selected_thread.lock()); paused = false; - if (cmd.data[1] == 's') { + if (cmd.data[1] == 's') + { ppu->state += cpu_flag::dbg_step; } ppu->state -= cpu_flag::dbg_pause; //special case if app didn't start yet (only loaded) - if (Emu.IsReady()) { + if (Emu.IsReady()) + { Emu.Run(true); } - if (Emu.IsPaused()) { + if (Emu.IsPaused()) + { Emu.Resume(); - } else { + } + else + { ppu->state.notify_one(); } wait_with_interrupts(); @@ -769,14 +829,17 @@ bool gdb_thread::cmd_set_breakpoint(gdb_cmd& cmd) { char type = cmd.data[0]; //software breakpoint - if (type == '0') { + if (type == '0') + { u32 addr = INVALID_PTR; - if (cmd.data.find(';') != umax) { + if (cmd.data.find(';') != umax) + { GDB.warning("Received request to set breakpoint with condition, but they are not supported."); return send_cmd_ack("E01"); } sscanf_s(cmd.data.c_str(), "0,%x", &addr); - if (addr == INVALID_PTR) { + if (addr == INVALID_PTR) + { GDB.warning("Can't parse breakpoint request, data: '%s'.", cmd.data); return send_cmd_ack("E02"); } @@ -791,10 +854,12 @@ bool gdb_thread::cmd_remove_breakpoint(gdb_cmd& cmd) { char type = cmd.data[0]; //software breakpoint - if (type == '0') { + if (type == '0') + { u32 addr = INVALID_PTR; sscanf_s(cmd.data.c_str(), "0,%x", &addr); - if (addr == INVALID_PTR) { + if (addr == INVALID_PTR) + { GDB.warning("Can't parse breakpoint remove request, data: '%s'.", cmd.data); return send_cmd_ack("E01"); } diff --git a/rpcs3/Emu/Memory/vm.cpp b/rpcs3/Emu/Memory/vm.cpp index 429b947763..7dc1fe26a8 100644 --- a/rpcs3/Emu/Memory/vm.cpp +++ b/rpcs3/Emu/Memory/vm.cpp @@ -705,12 +705,12 @@ namespace vm { const auto _cpu = get_current_cpu_thread(); - if (_cpu && _cpu->id_type() == 1) + if (_cpu && _cpu->get_class() == thread_class::ppu) { // TODO: PPU g_escape } - if (_cpu && _cpu->id_type() == 2) + if (_cpu && _cpu->get_class() == thread_class::spu) { spu_runtime::g_escape(static_cast(_cpu)); } diff --git a/rpcs3/Emu/RSX/Core/RSXIOMap.hpp b/rpcs3/Emu/RSX/Core/RSXIOMap.hpp index 2fd6ba987e..46d749c13b 100644 --- a/rpcs3/Emu/RSX/Core/RSXIOMap.hpp +++ b/rpcs3/Emu/RSX/Core/RSXIOMap.hpp @@ -76,7 +76,7 @@ namespace rsx added_wait |= !self->state.test_and_set(cpu_flag::wait); } - if (!self || self->id_type() != 0x55u) + if (!self || self->get_class() != thread_class::rsx) { mutex_.lock(); continue; diff --git a/rpcs3/rpcs3qt/breakpoint_list.cpp b/rpcs3/rpcs3qt/breakpoint_list.cpp index 2447e91e03..3821db5c0a 100644 --- a/rpcs3/rpcs3qt/breakpoint_list.cpp +++ b/rpcs3/rpcs3qt/breakpoint_list.cpp @@ -10,7 +10,7 @@ constexpr auto qstr = QString::fromStdString; -extern bool is_using_interpreter(u32 id_type); +extern bool is_using_interpreter(thread_class t_class); breakpoint_list::breakpoint_list(QWidget* parent, breakpoint_handler* handler) : QListWidget(parent), m_ppu_breakpoint_handler(handler) { @@ -107,15 +107,15 @@ void breakpoint_list::HandleBreakpointRequest(u32 loc, bool only_add) return; } - if (!is_using_interpreter(m_cpu->id_type())) + if (!is_using_interpreter(m_cpu->get_class())) { QMessageBox::warning(this, tr("Interpreters-Only Feature!"), tr("Cannot set breakpoints on non-interpreter decoders.")); return; } - switch (m_cpu->id_type()) + switch (m_cpu->get_class()) { - case 2: + case thread_class::spu: { if (loc >= SPU_LS_SIZE || loc % 4) { @@ -155,7 +155,8 @@ void breakpoint_list::HandleBreakpointRequest(u32 loc, bool only_add) return; } - case 1: break; + case thread_class::ppu: + break; default: QMessageBox::warning(this, tr("Unimplemented Breakpoints For Thread Type!"), tr("Cannot set breakpoints on a thread not an PPU/SPU currently, sorry.")); return; diff --git a/rpcs3/rpcs3qt/debugger_frame.cpp b/rpcs3/rpcs3qt/debugger_frame.cpp index 5c3b2e44a6..9b6d2ebbe3 100644 --- a/rpcs3/rpcs3qt/debugger_frame.cpp +++ b/rpcs3/rpcs3qt/debugger_frame.cpp @@ -43,23 +43,23 @@ extern atomic_t g_debugger_pause_all_threads_on_bp; extern const ppu_decoder g_ppu_itype; -extern bool is_using_interpreter(u32 id_type) +extern bool is_using_interpreter(thread_class t_class) { - switch (id_type) + switch (t_class) { - case 1: return g_cfg.core.ppu_decoder != ppu_decoder_type::llvm; - case 2: return g_cfg.core.spu_decoder != spu_decoder_type::asmjit && g_cfg.core.spu_decoder != spu_decoder_type::llvm; + case thread_class::ppu: return g_cfg.core.ppu_decoder != ppu_decoder_type::llvm; + case thread_class::spu: return g_cfg.core.spu_decoder != spu_decoder_type::asmjit && g_cfg.core.spu_decoder != spu_decoder_type::llvm; default: return true; } } extern std::shared_ptr make_disasm(const cpu_thread* cpu) { - switch (cpu->id_type()) + switch (cpu->get_class()) { - case 1: return std::make_shared(cpu_disasm_mode::interpreter, vm::g_sudo_addr); - case 2: return std::make_shared(cpu_disasm_mode::interpreter, static_cast(cpu)->ls); - case 0x55: return std::make_shared(cpu_disasm_mode::interpreter, vm::g_sudo_addr, 0, cpu); + case thread_class::ppu: return std::make_shared(cpu_disasm_mode::interpreter, vm::g_sudo_addr); + case thread_class::spu: return std::make_shared(cpu_disasm_mode::interpreter, static_cast(cpu)->ls); + case thread_class::rsx: return std::make_shared(cpu_disasm_mode::interpreter, vm::g_sudo_addr, 0, cpu); default: return nullptr; } } @@ -388,7 +388,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) return; } - const u32 address_limits = (cpu->id_type() == 2 ? 0x3fffc : ~3); + const u32 address_limits = (cpu->get_class() == thread_class::spu ? 0x3fffc : ~3); const u32 pc = (m_debugger_list->m_pc & address_limits); const u32 selected = (m_debugger_list->m_showing_selected_instruction ? m_debugger_list->m_selected_instruction : cpu->get_pc()) & address_limits; @@ -485,7 +485,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) }; - if (cpu->id_type() == 2 && g_cfg.core.mfc_debug) + if (cpu->get_class() == thread_class::spu && g_cfg.core.mfc_debug) { const u32 max = get_max_allowed(tr("Max MFC cmds logged"), tr("Decimal only, max allowed is %0."), spu_thread::max_mfc_dump_idx); @@ -541,7 +541,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) spu_log.success("SPU MFC dump of '%s': %s", cpu->get_name(), ret); } - else if (cpu->id_type() == 1 && g_cfg.core.ppu_call_history) + else if (cpu->get_class() == thread_class::ppu && g_cfg.core.ppu_call_history) { const u32 max = get_max_allowed(tr("Max PPU calls logged"), tr("Decimal only, max allowed is %0."), ppu_thread::call_history_max_size); @@ -603,7 +603,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) break; } - if (cpu->id_type() == 1 || cpu->id_type() == 2) + if (cpu->get_class() == thread_class::ppu || cpu->get_class() == thread_class::spu) { if (!m_inst_editor) { @@ -622,7 +622,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) break; } - if (cpu->id_type() == 1) + if (cpu->get_class() == thread_class::ppu) { static_cast(cpu)->debugger_mode.atomic_op([](ppu_debugger_mode& mode) { @@ -631,7 +631,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) return; } - if (cpu->id_type() == 2) + if (cpu->get_class() == thread_class::spu) { static_cast(cpu)->debugger_mode.atomic_op([](spu_debugger_mode& mode) { @@ -650,9 +650,9 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) break; } - if (cpu->id_type() == 1 || cpu->id_type() == 2) + if (cpu->get_class() == thread_class::ppu || cpu->get_class() == thread_class::spu) { - if (cpu->id_type() == 2 && modifiers & Qt::AltModifier) + if (cpu->get_class() == thread_class::spu && modifiers & Qt::AltModifier) { static_cast(cpu)->try_load_debug_capture(); return; @@ -677,7 +677,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) if (modifiers & Qt::AltModifier) { - if (cpu->id_type() == 0x55) + if (cpu->get_class() == thread_class::rsx) { if (u32 addr = static_cast(cpu)->label_addr) { @@ -688,13 +688,13 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) return; } - if (cpu->id_type() == 1) + if (cpu->get_class() == thread_class::ppu) { new elf_memory_dumping_dialog(pc, m_gui_settings, this); return; } - if (cpu->id_type() != 2) + if (cpu->get_class() != thread_class::spu) { return; } @@ -720,14 +720,14 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) const u32 selected = (m_debugger_list->m_showing_selected_instruction ? m_debugger_list->m_selected_instruction : cpu->get_pc()) & address_limits; - switch (cpu->id_type()) + switch (cpu->get_class()) { - case 2: + case thread_class::spu: { res = op_branch_targets(selected, spu_opcode_t{static_cast(cpu)->_ref(selected)}); break; } - case 1: + case thread_class::ppu: { be_t op{}; @@ -751,7 +751,7 @@ void debugger_frame::keyPressEvent(QKeyEvent* event) break; } - if (m_disasm && cpu->id_type() == 2) + if (m_disasm && cpu->get_class() == thread_class::spu) { // Save shared pointer to shared memory handle, ensure the destructor will not be called until the SPUDisAsm is destroyed static_cast(m_disasm.get())->set_shm(static_cast(cpu)->shm); @@ -911,8 +911,8 @@ void debugger_frame::UpdateUI() else if (m_ui_update_ctr % 5 == 0 || m_ui_update_ctr < m_ui_fast_update_permission_deadline) { const auto cia = cpu->get_pc(); - const auto size_context = cpu->id_type() == 1 ? sizeof(ppu_thread) : - cpu->id_type() == 2 ? sizeof(spu_thread) : sizeof(cpu_thread); + const auto size_context = cpu->get_class() == thread_class::ppu ? sizeof(ppu_thread) : + cpu->get_class() == thread_class::spu ? sizeof(spu_thread) : sizeof(cpu_thread); if (m_last_pc != cia || m_last_query_state.size() != size_context || std::memcmp(m_last_query_state.data(), static_cast(cpu), size_context)) { @@ -940,7 +940,7 @@ void debugger_frame::UpdateUI() ShowPC(); } - if (is_using_interpreter(cpu->id_type())) + if (is_using_interpreter(cpu->get_class())) { m_btn_step->setEnabled(paused); m_btn_step_over->setEnabled(paused); @@ -1188,7 +1188,7 @@ void debugger_frame::ShowGotoAddressDialog() expression_input->setFont(m_mono); expression_input->setMaxLength(18); - if (const auto thread = get_cpu(); !thread || thread->id_type() != 2) + if (const auto thread = get_cpu(); !thread || thread->get_class() != thread_class::spu) { expression_input->setValidator(new QRegularExpressionValidator(QRegularExpression("^(0[xX])?0*[a-fA-F0-9]{0,8}$"), this)); } @@ -1343,7 +1343,7 @@ void debugger_frame::DoStep(bool step_over) { if (const auto cpu = get_cpu()) { - bool should_step_over = step_over && cpu->id_type() == 1; + bool should_step_over = step_over && cpu->get_class() == thread_class::ppu; // If stepping over, lay at the same spot and wait for the thread to finish the call // If not, fixate on the current pointed instruction @@ -1354,7 +1354,7 @@ void debugger_frame::DoStep(bool step_over) m_debugger_list->ShowAddress(cpu->get_pc() + 4, false); } - if (step_over && cpu->id_type() == 0x55) + if (step_over && cpu->get_class() == thread_class::rsx) { const bool was_paused = cpu->is_paused(); static_cast(cpu)->pause_on_draw = true; @@ -1370,7 +1370,7 @@ void debugger_frame::DoStep(bool step_over) if (const auto _state = +cpu->state; _state & s_pause_flags && _state & cpu_flag::wait && !(_state & cpu_flag::dbg_step)) { - if (should_step_over && cpu->id_type() == 1) + if (should_step_over && cpu->get_class() == thread_class::ppu) { const u32 current_instruction_pc = cpu->get_pc(); @@ -1480,7 +1480,7 @@ void debugger_frame::EnableButtons(bool enable) if (!cpu) enable = false; - const bool step = enable && is_using_interpreter(cpu->id_type()); + const bool step = enable && is_using_interpreter(cpu->get_class()); m_go_to_addr->setEnabled(enable); m_go_to_pc->setEnabled(enable); diff --git a/rpcs3/rpcs3qt/debugger_list.cpp b/rpcs3/rpcs3qt/debugger_list.cpp index b2867b1277..7a4bf07736 100644 --- a/rpcs3/rpcs3qt/debugger_list.cpp +++ b/rpcs3/rpcs3qt/debugger_list.cpp @@ -46,7 +46,7 @@ debugger_list::debugger_list(QWidget* parent, std::shared_ptr gui_ u32 pc = m_start_addr; - for (; m_cpu && m_cpu->id_type() == 0x55 && row; row--) + for (; m_cpu && m_cpu->get_class() == thread_class::rsx && row; row--) { // If scrolling forwards (downwards), we can skip entire commands pc += std::max(m_disasm->disasm(pc), 4); @@ -73,12 +73,12 @@ u32 debugger_list::GetStartAddress(u32 address) const u32 steps = m_item_count / 3; const u32 inst_count_jump_on_step = std::min(steps, 4); - const bool is_spu = m_cpu && m_cpu->id_type() == 2; + const bool is_spu = m_cpu && m_cpu->get_class() == thread_class::spu; const u32 address_mask = (is_spu ? 0x3fffc : ~3); u32 result = address & address_mask; - if (m_cpu && m_cpu->id_type() == 0x55) + if (m_cpu && m_cpu->get_class() == thread_class::rsx) { if (auto [count, res] = static_cast(m_cpu)->try_get_pc_of_x_cmds_backwards(steps, address); count == steps) { @@ -92,7 +92,7 @@ u32 debugger_list::GetStartAddress(u32 address) u32 upper_bound = (m_start_addr + (steps * 4)) & address_mask; - if (m_cpu && m_cpu->id_type() == 0x55) + if (m_cpu && m_cpu->get_class() == thread_class::rsx) { if (auto [count, res] = static_cast(m_cpu)->try_get_pc_of_x_cmds_backwards(0 - steps, m_start_addr); count == steps) { @@ -133,20 +133,20 @@ void debugger_list::ShowAddress(u32 addr, bool select_addr, bool direct) { const decltype(spu_thread::local_breakpoints)* spu_bps_list{}; - if (m_cpu && m_cpu->id_type() == 2) + if (m_cpu && m_cpu->get_class() == thread_class::spu) { spu_bps_list = &static_cast(m_cpu)->local_breakpoints; } auto IsBreakpoint = [&](u32 pc) { - switch (m_cpu ? m_cpu->id_type() : 0) + switch (m_cpu ? m_cpu->get_class() : thread_class::general) { - case 1: + case thread_class::ppu: { return m_ppu_breakpoint_handler->HasBreakpoint(pc); } - case 2: + case thread_class::spu: { const u32 pos_at = pc / 4; const u32 pos_bit = 1u << (pos_at % 8); @@ -202,7 +202,7 @@ void debugger_list::ShowAddress(u32 addr, bool select_addr, bool direct) } else { - const bool is_spu = m_cpu->id_type() == 2; + const bool is_spu = m_cpu->get_class() == thread_class::spu; const u32 address_limits = (is_spu ? 0x3fffc : ~3); const u32 current_pc = m_cpu->get_pc(); m_start_addr &= address_limits; @@ -238,14 +238,14 @@ void debugger_list::ShowAddress(u32 addr, bool select_addr, bool direct) list_item->setBackground(default_background); } - if (m_cpu->id_type() == 1 && !vm::check_addr(pc, 0)) + if (m_cpu->get_class() == thread_class::ppu && !vm::check_addr(pc, 0)) { list_item->setText((IsBreakpoint(pc) ? ">> " : " ") + qstr(fmt::format("[%08x] ?? ?? ?? ??:", pc))); count = 4; continue; } - if (m_cpu->id_type() == 1 && !vm::check_addr(pc, vm::page_executable)) + if (m_cpu->get_class() == thread_class::ppu && !vm::check_addr(pc, vm::page_executable)) { const u32 data = *vm::get_super_ptr>(pc); list_item->setText((IsBreakpoint(pc) ? ">> " : " ") + qstr(fmt::format("[%08x] %02x %02x %02x %02x:", pc, @@ -287,13 +287,13 @@ void debugger_list::EnableThreadFollowing(bool enable) void debugger_list::scroll(s32 steps) { - for (; m_cpu && m_cpu->id_type() == 0x55 && steps > 0; steps--) + for (; m_cpu && m_cpu->get_class() == thread_class::rsx && steps > 0; steps--) { // If scrolling forwards (downwards), we can skip entire commands m_start_addr += std::max(m_disasm->disasm(m_start_addr), 4); } - if (m_cpu && m_cpu->id_type() == 0x55 && steps < 0) + if (m_cpu && m_cpu->get_class() == thread_class::rsx && steps < 0) { // If scrolling backwards (upwards), try to obtain the start of commands tail if (auto [count, res] = static_cast(m_cpu)->try_get_pc_of_x_cmds_backwards(-steps, m_start_addr); count == 0u - steps) @@ -347,7 +347,7 @@ void debugger_list::keyPressEvent(QKeyEvent* event) return; } - if (m_cpu && m_cpu->id_type() == 0x55) + if (m_cpu && m_cpu->get_class() == thread_class::rsx) { create_rsx_command_detail(m_showing_selected_instruction ? m_selected_instruction : m_pc); return; @@ -420,7 +420,7 @@ void debugger_list::mouseDoubleClickEvent(QMouseEvent* event) u32 pc = m_start_addr; - for (; m_cpu && m_cpu->id_type() == 0x55 && i; i--) + for (; m_cpu && m_cpu->get_class() == thread_class::rsx && i; i--) { // If scrolling forwards (downwards), we can skip entire commands pc += std::max(m_disasm->disasm(pc), 4); diff --git a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp index dd13793ab6..db491f8e14 100644 --- a/rpcs3/rpcs3qt/instruction_editor_dialog.cpp +++ b/rpcs3/rpcs3qt/instruction_editor_dialog.cpp @@ -29,7 +29,7 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C const auto cpu = m_get_cpu(); - m_cpu_offset = cpu && cpu->id_type() == 2 ? static_cast(*cpu).ls : vm::g_sudo_addr; + m_cpu_offset = cpu && cpu->get_class() == thread_class::spu ? static_cast(*cpu).ls : vm::g_sudo_addr; QVBoxLayout* vbox_panel(new QVBoxLayout()); QHBoxLayout* hbox_panel(new QHBoxLayout()); @@ -60,7 +60,7 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C vbox_right_panel->addWidget(m_instr); vbox_right_panel->addWidget(m_preview); - if (cpu && cpu->id_type() == 2) + if (cpu && cpu->get_class() == thread_class::spu) { // Print block information as if this instruction is its beginning vbox_left_panel->addWidget(new QLabel(tr("Block Info: "))); @@ -70,7 +70,7 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C m_func_info->setText(qstr(format_spu_func_info(m_pc, cpu))); } - if (cpu && cpu->id_type() == 2) + if (cpu && cpu->get_class() == thread_class::spu) { const auto& spu = static_cast(*cpu); @@ -118,7 +118,7 @@ instruction_editor_dialog::instruction_editor_dialog(QWidget *parent, u32 _pc, C const be_t swapped{static_cast(opcode)}; - if (cpu->id_type() == 1) + if (cpu->get_class() == thread_class::ppu) { if (!ppu_patch(m_pc, static_cast(opcode))) { diff --git a/rpcs3/rpcs3qt/kernel_explorer.cpp b/rpcs3/rpcs3qt/kernel_explorer.cpp index a751ca93c8..a70e12cb97 100644 --- a/rpcs3/rpcs3qt/kernel_explorer.cpp +++ b/rpcs3/rpcs3qt/kernel_explorer.cpp @@ -341,7 +341,7 @@ void kernel_explorer::update() { for (; cpu; cpu = cpu->get_next_cpu()) { - add_leaf(tree, qstr(fmt::format("Waiter: ID: 0x%x", cpu->id_type() == 2 ? static_cast(cpu)->lv2_id : cpu->id))); + add_leaf(tree, qstr(fmt::format("Waiter: ID: 0x%x", cpu->get_class() == thread_class::spu ? static_cast(cpu)->lv2_id : cpu->id))); } }; diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp index 19200c8249..8e2624ee36 100644 --- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp +++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp @@ -41,9 +41,9 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptrid_type() == 1) return thread_type::ppu; - if (cpu->id_type() == 0x55) return thread_type::rsx; - if (cpu->id_type() == 2) return thread_type::spu; + if (cpu->get_class() == thread_class::ppu) return thread_type::ppu; + if (cpu->get_class() == thread_class::rsx) return thread_type::rsx; + if (cpu->get_class() == thread_class::spu) return thread_type::spu; fmt::throw_exception("Unknown CPU type (0x%x)", cpu->id_type()); }()) diff --git a/rpcs3/rpcs3qt/register_editor_dialog.cpp b/rpcs3/rpcs3qt/register_editor_dialog.cpp index 98da5fe7da..54eb830975 100644 --- a/rpcs3/rpcs3qt/register_editor_dialog.cpp +++ b/rpcs3/rpcs3qt/register_editor_dialog.cpp @@ -106,7 +106,7 @@ register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disa if (const auto cpu = m_get_cpu()) { - if (cpu->id_type() == 1) + if (cpu->get_class() == thread_class::ppu) { for (int i = ppu_r0; i <= ppu_r31; i++) m_register_combo->addItem(qstr(fmt::format("r%d", i % 32)), i); for (int i = ppu_f0; i <= ppu_f31; i++) m_register_combo->addItem(qstr(fmt::format("f%d", i % 32)), i); @@ -122,7 +122,7 @@ register_editor_dialog::register_editor_dialog(QWidget *parent, CPUDisAsm* _disa m_register_combo->addItem("Priority", +PPU_PRIO); //m_register_combo->addItem("Priority 2", +PPU_PRIO2); } - else if (cpu->id_type() == 2) + else if (cpu->get_class() == thread_class::spu) { for (int i = spu_r0; i <= spu_r127; i++) m_register_combo->addItem(qstr(fmt::format("r%d", i % 128)), i); m_register_combo->addItem("MFC Pending Events", +MFC_PEVENTS); @@ -174,7 +174,7 @@ void register_editor_dialog::updateRegister(int reg) const if (!cpu) { } - else if (cpu->id_type() == 1) + else if (cpu->get_class() == thread_class::ppu) { const auto& ppu = *static_cast(cpu); @@ -199,7 +199,7 @@ void register_editor_dialog::updateRegister(int reg) const else if (reg == RESERVATION_LOST) str = sstr(ppu.raddr ? tr("Lose reservation on OK") : tr("Reservation is inactive")); else if (reg == PC) str = fmt::format("%08x", ppu.cia); } - else if (cpu->id_type() == 2) + else if (cpu->get_class() == thread_class::spu) { const auto& spu = *static_cast(cpu); @@ -263,7 +263,7 @@ void register_editor_dialog::OnOkay() close(); } } - else if (cpu->id_type() == 1) + else if (cpu->get_class() == thread_class::ppu) { auto& ppu = *static_cast(cpu); @@ -350,7 +350,7 @@ void register_editor_dialog::OnOkay() return; } } - else if (cpu->id_type() == 2) + else if (cpu->get_class() == thread_class::spu) { auto& spu = *static_cast(cpu);