From 9c4407fb803bd150cfd855e27bdbabb5b00ed813 Mon Sep 17 00:00:00 2001 From: Fiora Date: Sun, 21 Sep 2014 08:01:47 -0700 Subject: [PATCH] Disassembler: fix disassembly of some twi instructions --- Source/Core/Common/GekkoDisassembler.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp index afccf35028..34da4279e6 100644 --- a/Source/Core/Common/GekkoDisassembler.cpp +++ b/Source/Core/Common/GekkoDisassembler.cpp @@ -356,16 +356,18 @@ void GekkoDisassembler::trapi(u32 in, unsigned char dmode) { const char* cnd = trap_condition[PPCGETD(in)]; + + m_flags |= dmode; if (cnd != nullptr) { - m_flags |= dmode; m_opcode = StringFromFormat("t%c%s", dmode ? 'd' : 'w', cnd); - m_operands = imm(in, 0, 2, false); } else { - ill(in); + m_opcode = StringFromFormat("t%ci", dmode ? 'd' : 'w'); + m_operands = StringFromFormat("%d, ", PPCGETD(in)); } + m_operands += imm(in, 0, 2, false); }