piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

DSPDisassembler: cleanup disassembler text handling

Browse Source
This commit is contained in:
Michael Maltese
2017-05-15 17:30:21 -07:00
parent 0f98cd636b
commit 2564823522
1 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Source/Core/Core/DSP/DSPDisassembler.cpp
View File

@ -129,13 +129,6 @@ std::string DSPDisassembler::DisassembleParameters(const DSPOPCTemplate& opc, u1
return buf; return buf;
} }
static std::string MakeLowerCase(std::string in)
{
std::transform(in.begin(), in.end(), in.begin(), ::tolower);
return in;
}
bool DSPDisassembler::DisassembleOpcode(const u16* binbuf, int base_addr, u16* pc, bool DSPDisassembler::DisassembleOpcode(const u16* binbuf, int base_addr, u16* pc,
std::string& dest) std::string& dest)
{ {
@ -150,10 +143,9 @@ bool DSPDisassembler::DisassembleOpcode(const u16* binbuf, int base_addr, u16* p
// Find main opcode // Find main opcode
const DSPOPCTemplate* opc = FindOpInfoByOpcode(op1); const DSPOPCTemplate* opc = FindOpInfoByOpcode(op1);
const DSPOPCTemplate fake_op = {"CW", 0x0000, 0x0000, DSP::Interpreter::nop, const DSPOPCTemplate fake_op = {
nullptr, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}}, "CW", 0x0000, 0x0000, nullptr, nullptr, 1, 1, {{P_VAL, 2, 0, 0, 0xffff}},
false, false, false, false, false, false, false, false, false};
false};
if (!opc) if (!opc)
opc = &fake_op; opc = &fake_op;
@ -200,21 +192,15 @@ bool DSPDisassembler::DisassembleOpcode(const u16* binbuf, int base_addr, u16* p
} }
std::string opname = opc->name; std::string opname = opc->name;
if (settings_.lower_case_ops)
opname = MakeLowerCase(opname);
std::string ext_buf;
if (is_extended) if (is_extended)
ext_buf = StringFromFormat("%s%c%s", opname.c_str(), settings_.ext_separator, opc_ext->name); opname += StringFromFormat("%c%s", settings_.ext_separator, opc_ext->name);
else
ext_buf = opname;
if (settings_.lower_case_ops) if (settings_.lower_case_ops)
ext_buf = MakeLowerCase(ext_buf); std::transform(opname.begin(), opname.end(), opname.begin(), ::tolower);
if (settings_.print_tabs) if (settings_.print_tabs)
dest += StringFromFormat("%s\t", ext_buf.c_str()); dest += StringFromFormat("%s\t", opname.c_str());
else else
dest += StringFromFormat("%-12s", ext_buf.c_str()); dest += StringFromFormat("%-12s", opname.c_str());
if (opc->param_count > 0) if (opc->param_count > 0)
dest += DisassembleParameters(*opc, op1, op2); dest += DisassembleParameters(*opc, op1, op2);
@ -237,10 +223,7 @@ bool DSPDisassembler::DisassembleOpcode(const u16* binbuf, int base_addr, u16* p
dest += "\t\t; *** UNKNOWN OPCODE ***"; dest += "\t\t; *** UNKNOWN OPCODE ***";
} }
if (is_extended) *pc += is_extended ? opc_ext->size : opc->size;
*pc += opc_ext->size;
else
*pc += opc->size;
return true; return true;
} }