ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup disasm classes a bit

This commit is contained in:
Eladash 2020-12-16 08:53:59 +02:00 committed by Ivan
parent e449111c33
commit ef884642e4
13 changed files with 28 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rpcs3/Emu/CPU/CPUDisAsm.h
View File

@ -16,6 +16,7 @@ class CPUDisAsm
{
protected:
const CPUDisAsmMode m_mode;
const std::add_pointer_t<const u8> m_offset;
virtual void Write(const std::string& value)
{
@ -24,20 +25,20 @@ protected:
case CPUDisAsm_DumpMode:
{
last_opcode = fmt::format("\t%08x:\t%02x %02x %02x %02x\t%s\n", dump_pc,
offset[dump_pc],
offset[dump_pc + 1],
offset[dump_pc + 2],
offset[dump_pc + 3], value);
m_offset[dump_pc],
m_offset[dump_pc + 1],
m_offset[dump_pc + 2],
m_offset[dump_pc + 3], value);
break;
}
case CPUDisAsm_InterpreterMode:
{
last_opcode = fmt::format("[%08x] %02x %02x %02x %02x: %s", dump_pc,
offset[dump_pc],
offset[dump_pc + 1],
offset[dump_pc + 2],
offset[dump_pc + 3], value);
m_offset[dump_pc],
m_offset[dump_pc + 1],
m_offset[dump_pc + 2],
m_offset[dump_pc + 3], value);
break;
}
@ -58,12 +59,11 @@ protected:
public:
std::string last_opcode;
u32 dump_pc;
const u8* offset;
protected:
CPUDisAsm(CPUDisAsmMode mode)
CPUDisAsm(CPUDisAsmMode mode, const u8* offset)
: m_mode(mode)
, offset(0)
, m_offset(offset)
{
}

2
rpcs3/Emu/Cell/PPCDisAsm.h
View File

@ -5,7 +5,7 @@
class PPCDisAsm : public CPUDisAsm
{
protected:
PPCDisAsm(CPUDisAsmMode mode) : CPUDisAsm(mode)
PPCDisAsm(CPUDisAsmMode mode, const u8* offset) : CPUDisAsm(mode, offset)
{
}

3
rpcs3/Emu/Cell/PPUDisAsm.cpp
View File

@ -6,7 +6,8 @@ const ppu_decoder<PPUDisAsm> s_ppu_disasm;
u32 PPUDisAsm::disasm(u32 pc)
{
const u32 op = *reinterpret_cast<const be_t<u32>*>(offset + pc);
dump_pc = pc;
const u32 op = *reinterpret_cast<const be_t<u32>*>(m_offset + pc);
(this->*(s_ppu_disasm.decode(op)))({ op });
return 4;
}

2
rpcs3/Emu/Cell/PPUDisAsm.h
View File

@ -6,7 +6,7 @@
class PPUDisAsm final : public PPCDisAsm
{
public:
PPUDisAsm(CPUDisAsmMode mode) : PPCDisAsm(mode)
PPUDisAsm(CPUDisAsmMode mode, const u8* offset) : PPCDisAsm(mode, offset)
{
}

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

@ -499,9 +499,7 @@ std::string ppu_thread::dump_regs() const
}
else
{
PPUDisAsm dis_asm(CPUDisAsm_NormalMode);
dis_asm.offset = vm::g_sudo_addr;
dis_asm.dump_pc = reg;
PPUDisAsm dis_asm(CPUDisAsm_NormalMode, vm::g_sudo_addr);
dis_asm.disasm(reg);
fmt::append(ret, " -> %s", dis_asm.last_opcode);
}

5
rpcs3/Emu/Cell/SPUDisAsm.cpp
View File

@ -11,7 +11,8 @@ const spu_decoder<spu_iflag> s_spu_iflag;
u32 SPUDisAsm::disasm(u32 pc)
{
const u32 op = *reinterpret_cast<const be_t<u32>*>(offset + pc);
dump_pc = pc;
const u32 op = *reinterpret_cast<const be_t<u32>*>(m_offset + pc);
(this->*(s_spu_disasm.decode(op)))({ op });
return 4;
}
@ -33,7 +34,7 @@ std::pair<bool, v128> SPUDisAsm::try_get_const_value(u32 reg, u32 pc) const
for (s32 i = pc - 4; i >= 0; i -= 4)
{
const u32 opcode = *reinterpret_cast<const be_t<u32>*>(offset + i);
const u32 opcode = *reinterpret_cast<const be_t<u32>*>(m_offset + i);
const spu_opcode_t op0{ opcode };
const auto type = s_spu_itype.decode(opcode);

2
rpcs3/Emu/Cell/SPUDisAsm.h
View File

@ -71,7 +71,7 @@ static constexpr const char* spu_ch_name[128] =
class SPUDisAsm final : public PPCDisAsm
{
public:
SPUDisAsm(CPUDisAsmMode mode) : PPCDisAsm(mode)
SPUDisAsm(CPUDisAsmMode mode, const u8* offset) : PPCDisAsm(mode, offset)
{
}

4
rpcs3/Emu/Cell/SPURecompiler.cpp
View File

@ -3146,8 +3146,7 @@ spu_program spu_recompiler_base::analyse(const be_t<u32>* ls, u32 entry_point)
void spu_recompiler_base::dump(const spu_program& result, std::string& out)
{
SPUDisAsm dis_asm(CPUDisAsm_DumpMode);
dis_asm.offset = reinterpret_cast<const u8*>(result.data.data()) - result.lower_bound;
SPUDisAsm dis_asm(CPUDisAsm_DumpMode, reinterpret_cast<const u8*>(result.data.data()) - result.lower_bound);
std::string hash;
{
@ -3166,7 +3165,6 @@ void spu_recompiler_base::dump(const spu_program& result, std::string& out)
{
for (u32 pos = bb.first, end = bb.first + bb.second.size * 4; pos < end; pos += 4)
{
dis_asm.dump_pc = pos;
dis_asm.disasm(pos);
fmt::append(out, ">%s\n", dis_asm.last_opcode);
}

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

@ -1288,9 +1288,7 @@ std::string spu_thread::dump_regs() const
if (i3 >= 0x80 && is_exec_code(i3))
{
SPUDisAsm dis_asm(CPUDisAsm_NormalMode);
dis_asm.offset = ls;
dis_asm.dump_pc = i3;
SPUDisAsm dis_asm(CPUDisAsm_NormalMode, ls);
dis_asm.disasm(i3);
fmt::append(ret, " -> %s", dis_asm.last_opcode);
}

4
rpcs3/Emu/System.cpp
View File

@ -1807,8 +1807,7 @@ void Emulator::Resume()
// Print and reset debug data collected
if (m_state == system_state::paused && g_cfg.core.ppu_debug)
{
PPUDisAsm dis_asm(CPUDisAsm_DumpMode);
dis_asm.offset = vm::g_sudo_addr;
PPUDisAsm dis_asm(CPUDisAsm_DumpMode, vm::g_sudo_addr);
std::string dump;
@ -1818,7 +1817,6 @@ void Emulator::Resume()
{
if (auto& data = *reinterpret_cast<be_t<u32>*>(vm::g_stat_addr + i))
{
dis_asm.dump_pc = i;
dis_asm.disasm(i);
fmt::append(dump, "\n\t'%08X' %s", data, dis_asm.last_opcode);
data = 0;

4
rpcs3/rpcs3qt/breakpoint_list.cpp
View File

@ -63,10 +63,8 @@ void breakpoint_list::AddBreakpoint(u32 pc)
m_breakpoint_handler->AddBreakpoint(pc);
const auto cpu = this->cpu.lock();
const auto cpu_offset = cpu->id_type() == 2 ? static_cast<spu_thread&>(*cpu).ls : vm::g_sudo_addr;
m_disasm->offset = cpu_offset;
m_disasm->disasm(m_disasm->dump_pc = pc);
m_disasm->disasm(pc);
QString breakpointItemText = qstr(m_disasm->last_opcode);

4
rpcs3/rpcs3qt/debugger_frame.cpp
View File

@ -467,7 +467,7 @@ void debugger_frame::OnSelectUnit()
if (cpu0.get() == idm::check<named_thread<ppu_thread>>(cpu0->id))
{
cpu = cpu0;
m_disasm = std::make_unique<PPUDisAsm>(CPUDisAsm_InterpreterMode);
m_disasm = std::make_unique<PPUDisAsm>(CPUDisAsm_InterpreterMode, vm::g_sudo_addr);
}
}
else if (cpu0->id_type() == 2)
@ -475,7 +475,7 @@ void debugger_frame::OnSelectUnit()
if (cpu0.get() == idm::check<named_thread<spu_thread>>(cpu0->id))
{
cpu = cpu0;
m_disasm = std::make_unique<SPUDisAsm>(CPUDisAsm_InterpreterMode);
m_disasm = std::make_unique<SPUDisAsm>(CPUDisAsm_InterpreterMode, static_cast<const spu_thread*>(cpu0.get())->ls);
}
}
}

6
rpcs3/rpcs3qt/debugger_list.cpp
View File

@ -68,7 +68,7 @@ void debugger_list::ShowAddress(u32 addr, bool force)
const auto default_foreground = palette().color(foregroundRole());
const auto default_background = palette().color(backgroundRole());
if (!cpu)
if (!cpu || !m_disasm)
{
for (uint i = 0; i < m_item_count; ++i)
{
@ -80,10 +80,8 @@ void debugger_list::ShowAddress(u32 addr, bool force)
else
{
const bool is_spu = cpu->id_type() != 1;
const auto cpu_offset = cpu->id_type() != 1 ? static_cast<spu_thread&>(*cpu).ls : vm::g_sudo_addr;
const u32 address_limits = (is_spu ? 0x3fffc : ~3);
m_pc &= address_limits;
m_disasm->offset = cpu_offset;
u32 pc = m_pc;
for (uint i = 0, count = 4; i<m_item_count; ++i, pc = (pc + count) & address_limits)
@ -123,7 +121,7 @@ void debugger_list::ShowAddress(u32 addr, bool force)
continue;
}
count = m_disasm->disasm(m_disasm->dump_pc = pc);
count = m_disasm->disasm(pc);
item(i)->setText((IsBreakpoint(pc) ? ">> " : " ") + qstr(m_disasm->last_opcode));
}