diff options
| author | rob turner <kyo.se.llo.ut@gmail.com> | 2016-01-19 18:42:16 +0100 |
|---|---|---|
| committer | rob turner <kyo.se.llo.ut@gmail.com> | 2016-01-19 18:42:16 +0100 |
| commit | 0d435fe4d896fe5c4f3d03b83885eccf10acc0e5 (patch) | |
| tree | bd7d41193eb187d92445760883a01b7dcc5c25a5 /src/core/arm/disassembler/arm_disasm.cpp | |
| parent | 1d40982a0ad103f6cc7bace6abaff3af453f501a (diff) | |
ARM_Disasm::DisassembleMemHalf: actually use width in determining opcode name
Diffstat (limited to 'src/core/arm/disassembler/arm_disasm.cpp')
| -rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 76408e9fa8..5ad1f1c296 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); } } |