From c27a1e6354c04904345855e1d28b0e711efa1575 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Wed, 6 Feb 2019 14:35:31 +0100 Subject: Correct registers order in conversion to text for branch instructions. Signed-off-by: Pavel Pisa --- qtmips_machine/instruction.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'qtmips_machine') diff --git a/qtmips_machine/instruction.cpp b/qtmips_machine/instruction.cpp index a0570fd..ed9064b 100644 --- a/qtmips_machine/instruction.cpp +++ b/qtmips_machine/instruction.cpp @@ -458,7 +458,7 @@ QString Instruction::to_str() const { res += " $" + QString::number(rt()); res += ", 0x" + QString::number(immediate(), 16).toUpper() + "(" + QString::number(rs()) + ")"; } else { - if (im.flags & (IMF_BJR_REQ_RT | IMF_ALU_REQ_RT | IMF_REGWRITE)) { + if (im.flags & IMF_REGWRITE) { res += next_delim + "$" + QString::number(rt()); next_delim = ", "; } @@ -466,6 +466,10 @@ QString Instruction::to_str() const { res += next_delim + "$" + QString::number(rs()); next_delim = ", "; } + if (im.flags & (IMF_BJR_REQ_RT | IMF_ALU_REQ_RT) && !(im.flags & IMF_REGWRITE)) { + res += next_delim + "$" + QString::number(rt()); + next_delim = ", "; + } res += next_delim + "0x" + QString::number(immediate(), 16).toUpper(); } break; -- cgit v1.2.3