diff --git a/rpcs3/Emu/CPU/CPUThread.cpp b/rpcs3/Emu/CPU/CPUThread.cpp index 0308b45955..aa5869c578 100644 --- a/rpcs3/Emu/CPU/CPUThread.cpp +++ b/rpcs3/Emu/CPU/CPUThread.cpp @@ -176,7 +176,7 @@ struct cpu_prof { return; } - + const std::string results = format(chart, samples, idle, true); profiler.notice("All Threads: %u samples (%.4f%% idle):%s", samples, 100. * idle / samples, results); } @@ -949,9 +949,7 @@ std::shared_ptr make_disasm(const cpu_thread* cpu); std::string cpu_thread::dump_all() const { - std::string ret = cpu_thread::dump_misc(); - ret += '\n'; - ret += dump_misc(); + std::string ret = dump_misc(); ret += '\n'; ret += dump_regs(); ret += '\n'; @@ -1004,7 +1002,7 @@ std::vector> cpu_thread::dump_callstack_list() const std::string cpu_thread::dump_misc() const { - return fmt::format("Type: %s\n" "State: %s\n", id_type() == 1 ? "PPU" : id_type() == 2 ? "SPU" : "CPU", state.load()); + return fmt::format("Type: %s; State: %s\n", id_type() == 1 ? "PPU" : id_type() == 2 ? "SPU" : "RSX", state.load()); } bool cpu_thread::suspend_work::push(cpu_thread* _this) noexcept diff --git a/rpcs3/Emu/Cell/PPUThread.cpp b/rpcs3/Emu/Cell/PPUThread.cpp index 390365b57b..7a9d3b94ee 100644 --- a/rpcs3/Emu/Cell/PPUThread.cpp +++ b/rpcs3/Emu/Cell/PPUThread.cpp @@ -1211,7 +1211,7 @@ std::vector> ppu_thread::dump_callstack_list() const std::string ppu_thread::dump_misc() const { - std::string ret; + std::string ret = cpu_thread::dump_misc(); fmt::append(ret, "Priority: %d\n", +prio); fmt::append(ret, "Stack: 0x%x..0x%x\n", stack_addr, stack_addr + stack_size - 1); diff --git a/rpcs3/Emu/Cell/SPUThread.cpp b/rpcs3/Emu/Cell/SPUThread.cpp index c993653122..91dc6c88b5 100644 --- a/rpcs3/Emu/Cell/SPUThread.cpp +++ b/rpcs3/Emu/Cell/SPUThread.cpp @@ -1221,7 +1221,7 @@ std::vector> spu_thread::dump_callstack_list() const std::string spu_thread::dump_misc() const { - std::string ret; + std::string ret = cpu_thread::dump_misc(); fmt::append(ret, "Block Weight: %u (Retreats: %u)", block_counter, block_failure);