summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathew Maidment <mathew1800@gmail.com>2016-01-19 19:02:42 +0100
committerMathew Maidment <mathew1800@gmail.com>2016-01-19 19:02:42 +0100
commit1b9012aea00efc4afa4c2e22acb335de9c31ed4f (patch)
treebd7d41193eb187d92445760883a01b7dcc5c25a5
parentMerge pull request #1360 from lioncash/var (diff)
parentARM_Disasm::DisassembleMemHalf: actually use width in determining opcode name (diff)
downloadyuzu-1b9012aea00efc4afa4c2e22acb335de9c31ed4f.tar
yuzu-1b9012aea00efc4afa4c2e22acb335de9c31ed4f.tar.gz
yuzu-1b9012aea00efc4afa4c2e22acb335de9c31ed4f.tar.bz2
yuzu-1b9012aea00efc4afa4c2e22acb335de9c31ed4f.tar.lz
yuzu-1b9012aea00efc4afa4c2e22acb335de9c31ed4f.tar.xz
yuzu-1b9012aea00efc4afa4c2e22acb335de9c31ed4f.tar.zst
yuzu-1b9012aea00efc4afa4c2e22acb335de9c31ed4f.zip
Diffstat (limited to '')
-rw-r--r--src/core/arm/disassembler/arm_disasm.cpp18
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 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);
}
}