From b3eb63b5db1d03827418893859c28e158b301eeb Mon Sep 17 00:00:00 2001
From: an7s <an7s@git.zephyr-software.com>
Date: Wed, 28 Feb 2018 16:58:25 +0000
Subject: [PATCH] Handle movsX instructions better

Former-commit-id: 3fcce5be96a4f151247080a74d554f0505941377
---
 libIRDB/src/core/decode_cs.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libIRDB/src/core/decode_cs.cpp b/libIRDB/src/core/decode_cs.cpp
index 9cd0e6a6f..ff59991ca 100644
--- a/libIRDB/src/core/decode_cs.cpp
+++ b/libIRDB/src/core/decode_cs.cpp
@@ -154,7 +154,14 @@ void DecodedInstructionCapstone_t::Disassemble(const virtual_offset_t start_addr
 
 	if(string(insn->mnemonic)=="fcompi")
 		strcpy(insn->mnemonic, "fcomip"); // bad opcode out of capstone.
-
+	else if(string(insn->mnemonic)=="movsq")
+		strcpy(insn->op_str, ""); // force into MOVS
+	else if(string(insn->mnemonic)=="movsd")
+		strcpy(insn->op_str, ""); // force into MOVS
+	else if(string(insn->mnemonic)=="movsw")
+		strcpy(insn->op_str, ""); // force into MOVS
+	else if(string(insn->mnemonic)=="movsb")
+		strcpy(insn->op_str, ""); // force into MOVS
 
 	const auto cs_freer=[](cs_insn * insn) -> void 
 		{  
-- 
GitLab