citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #1363 from robturn/master 

DisassembleMemHalf: actually use width in determining opcode name
This commit is contained in:
Mathew Maidment 2016-01-19 13:02:42 -05:00
parent 2c663fbc3e d29578d467
commit 1b9012aea0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/arm/disassembler/arm_disasm.cpp
View File

@ -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);
}
}