From 6197bde0fc87384b6c941ad06521d06e4ac1aa45 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sun, 30 Jul 2017 18:45:31 +0100 Subject: [PATCH] disassembler_arm: Fix disassembly of LDRH (reg) --- src/frontend/disassembler/disassembler_arm.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/disassembler/disassembler_arm.cpp b/src/frontend/disassembler/disassembler_arm.cpp index ba70a6c4..1ca19045 100644 --- a/src/frontend/disassembler/disassembler_arm.cpp +++ b/src/frontend/disassembler/disassembler_arm.cpp @@ -451,9 +451,9 @@ public: } std::string arm_LDRH_reg(Cond cond, bool P, bool U, bool W, Reg n, Reg t, Reg m) { if (P) { - return fmt::format("ldrd{} {}, [{}, {}{}]{}", CondToString(cond), t, n, U ? '+' : '-', m, W ? "!" : ""); + return fmt::format("ldrh{} {}, [{}, {}{}]{}", CondToString(cond), t, n, U ? '+' : '-', m, W ? "!" : ""); } else { - return fmt::format("ldrd{} {}, [{}], {}{}{}", CondToString(cond), t, n, U ? '+' : '-', m, W ? " (err: W == 1!!!)" : ""); + return fmt::format("ldrh{} {}, [{}], {}{}{}", CondToString(cond), t, n, U ? '+' : '-', m, W ? " (err: W == 1!!!)" : ""); } } std::string arm_LDRHT() { return "ice"; }