diff options
| author |  rob turner | 2016-01-19 18:42:16 +0100 |
|---|---|---|
| committer | rob turner | 2016-01-19 18:42:16 +0100 |
| commit | d29578d467a64af8a54210a091f641c543a9212c (patch) | |
| tree | bd7d41193eb187d92445760883a01b7dcc5c25a5 /src/core/arm/disassembler | |
| parent | Merge pull request #1360 from lioncash/var (diff) | |
| download | yuzu-d29578d467a64af8a54210a091f641c543a9212c.tar.gz yuzu-d29578d467a64af8a54210a091f641c543a9212c.tar.xz yuzu-d29578d467a64af8a54210a091f641c543a9212c.zip | |
ARM_Disasm::DisassembleMemHalf: actually use width in determining opcode name
Diffstat (limited to 'src/core/arm/disassembler')
| -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 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) | |||
| 738 | if (is_immed) { | 738 | if (is_immed) { |
| 739 | if (is_pre) { | 739 | if (is_pre) { |
| 740 | if (offset == 0) { | 740 | if (offset == 0) { |
| 741 | return Common::StringFromFormat("%s%sh\tr%d, [r%d]", opname, cond_to_str(cond), rd, rn); | 741 | return Common::StringFromFormat("%s%s%s\tr%d, [r%d]", opname, cond_to_str(cond), width, rd, rn); |
| 742 | } else { | 742 | } else { |
| 743 | return Common::StringFromFormat("%s%sh\tr%d, [r%d, #%s%u]%s", | 743 | return Common::StringFromFormat("%s%s%s\tr%d, [r%d, #%s%u]%s", |
| 744 | opname, cond_to_str(cond), rd, rn, minus, offset, bang); | 744 | opname, cond_to_str(cond), width, rd, rn, minus, offset, bang); |
| 745 | } | 745 | } |
| 746 | } else { | 746 | } else { |
| 747 | return Common::StringFromFormat("%s%sh\tr%d, [r%d], #%s%u", | 747 | return Common::StringFromFormat("%s%s%s\tr%d, [r%d], #%s%u", |
| 748 | opname, cond_to_str(cond), rd, rn, minus, offset); | 748 | opname, cond_to_str(cond), width, rd, rn, minus, offset); |
| 749 | } | 749 | } |
| 750 | } | 750 | } |
| 751 | 751 | ||
| 752 | if (is_pre) { | 752 | if (is_pre) { |
| 753 | return Common::StringFromFormat("%s%sh\tr%d, [r%d, %sr%d]%s", | 753 | return Common::StringFromFormat("%s%s%s\tr%d, [r%d, %sr%d]%s", |
| 754 | opname, cond_to_str(cond), rd, rn, minus, rm, bang); | 754 | opname, cond_to_str(cond), width, rd, rn, minus, rm, bang); |
| 755 | } else { | 755 | } else { |
| 756 | return Common::StringFromFormat("%s%sh\tr%d, [r%d], %sr%d", | 756 | return Common::StringFromFormat("%s%s%s\tr%d, [r%d], %sr%d", |
| 757 | opname, cond_to_str(cond), rd, rn, minus, rm); | 757 | opname, cond_to_str(cond), width, rd, rn, minus, rm); |
| 758 | } | 758 | } |
| 759 | } | 759 | } |
| 760 | 760 | ||