diff options
author | Lioncash <mathew1800@gmail.com> | 2015-02-28 03:57:38 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2015-02-28 03:59:30 +0100 |
commit | 9ed34889258cd3da1c46696cad5e96011c3a5a0b (patch) | |
tree | 7a5c781fcfa6e98d67b0f7244b58c338190fc650 /src/core/arm/disassembler/arm_disasm.cpp | |
parent | Merge pull request #599 from Subv/morton (diff) | |
download | yuzu-9ed34889258cd3da1c46696cad5e96011c3a5a0b.tar yuzu-9ed34889258cd3da1c46696cad5e96011c3a5a0b.tar.gz yuzu-9ed34889258cd3da1c46696cad5e96011c3a5a0b.tar.bz2 yuzu-9ed34889258cd3da1c46696cad5e96011c3a5a0b.tar.lz yuzu-9ed34889258cd3da1c46696cad5e96011c3a5a0b.tar.xz yuzu-9ed34889258cd3da1c46696cad5e96011c3a5a0b.tar.zst yuzu-9ed34889258cd3da1c46696cad5e96011c3a5a0b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index f7c7451e9..5a8a113cc 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp @@ -131,7 +131,7 @@ static const char *shift_names[] = { "ROR" }; -static const char* cond_to_str(int cond) { +static const char* cond_to_str(uint32_t cond) { return cond_names[cond]; } @@ -337,8 +337,9 @@ std::string ARM_Disasm::DisassembleBX(uint32_t insn) std::string ARM_Disasm::DisassembleBKPT(uint32_t insn) { + uint8_t cond = (insn >> 28) & 0xf; uint32_t immed = (((insn >> 8) & 0xfff) << 4) | (insn & 0xf); - return Common::StringFromFormat("bkpt\t#%d", immed); + return Common::StringFromFormat("bkpt%s\t#%d", cond_to_str(cond), immed); } std::string ARM_Disasm::DisassembleCLZ(uint32_t insn) |