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

Merge pull request #1135 from FioraAeterna/twidisasmfix 

Disassembler: fix disassembly of some twi instructions
This commit is contained in:
Ryan Houdek 2014-09-21 14:19:05 -05:00
parent 124df2e134 9c4407fb80
commit 9206dd016e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Common/GekkoDisassembler.cpp
View File

@ -356,16 +356,18 @@ void GekkoDisassembler::trapi(u32 in, unsigned char dmode)
{ {
const char* cnd = trap_condition[PPCGETD(in)]; const char* cnd = trap_condition[PPCGETD(in)];
m_flags |= dmode;
if (cnd != nullptr) if (cnd != nullptr)
{ {
m_flags |= dmode;
m_opcode = StringFromFormat("t%c%s", dmode ? 'd' : 'w', cnd); m_opcode = StringFromFormat("t%c%s", dmode ? 'd' : 'w', cnd);
m_operands = imm(in, 0, 2, false);
} }
else else
{ {
ill(in); m_opcode = StringFromFormat("t%ci", dmode ? 'd' : 'w');
m_operands = StringFromFormat("%d, ", PPCGETD(in));
} }
m_operands += imm(in, 0, 2, false);
} }