From d29578d467a64af8a54210a091f641c543a9212c Mon Sep 17 00:00:00 2001 From: rob turner Date: Tue, 19 Jan 2016 18:42:16 +0100 Subject: ARM_Disasm::DisassembleMemHalf: actually use width in determining opcode name --- src/core/arm/disassembler/arm_disasm.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/core/arm') diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 76408e9fa..5ad1f1c29 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp @@ -738,23 +738,23 @@ std::string ARM_Disasm::DisassembleMemHalf(u32 insn) if (is_immed) { if (is_pre) { if (offset == 0) { - return Common::StringFromFormat("%s%sh\tr%d, [r%d]", opname, cond_to_str(cond), rd, rn); + return Common::StringFromFormat("%s%s%s\tr%d, [r%d]", opname, cond_to_str(cond), width, rd, rn); } else { - return Common::StringFromFormat("%s%sh\tr%d, [r%d, #%s%u]%s", - opname, cond_to_str(cond), rd, rn, minus, offset, bang); + return Common::StringFromFormat("%s%s%s\tr%d, [r%d, #%s%u]%s", + opname, cond_to_str(cond), width, rd, rn, minus, offset, bang); } } else { - return Common::StringFromFormat("%s%sh\tr%d, [r%d], #%s%u", - opname, cond_to_str(cond), rd, rn, minus, offset); + return Common::StringFromFormat("%s%s%s\tr%d, [r%d], #%s%u", + opname, cond_to_str(cond), width, rd, rn, minus, offset); } } if (is_pre) { - return Common::StringFromFormat("%s%sh\tr%d, [r%d, %sr%d]%s", - opname, cond_to_str(cond), rd, rn, minus, rm, bang); + return Common::StringFromFormat("%s%s%s\tr%d, [r%d, %sr%d]%s", + opname, cond_to_str(cond), width, rd, rn, minus, rm, bang); } else { - return Common::StringFromFormat("%s%sh\tr%d, [r%d], %sr%d", - opname, cond_to_str(cond), rd, rn, minus, rm); + return Common::StringFromFormat("%s%s%s\tr%d, [r%d], %sr%d", + opname, cond_to_str(cond), width, rd, rn, minus, rm); } } -- cgit v1.2.3