Avoid MOVD/MOVQ disassemble mismatch with old/new capstone versions

dstogov · Sep 19, 2023 · 399a387 · 399a387
1 parent 971c6e0
commit 399a387
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/ir_disasm.c b/ir_disasm.c
@@ -488,6 +488,12 @@ int ir_disasm(const char    *name,
 			fprintf(f, "    %" PRIx64 ":", insn->address);
 		}
 		p = insn->op_str;
+#if defined(IR_TARGET_X64) && (CS_API_MAJOR < 5)
+		/* Fix capstone MOVD/MOVQ disassemble mismatch */
+		if (insn->id == X86_INS_MOVQ && strcmp(insn->mnemonic, "movd") == 0) {
+			insn->mnemonic[3] = 'q';
+		}
+#endif
 		if (strlen(p) == 0) {
 			fprintf(f, "\t%s\n", insn->mnemonic);
 			continue;

diff --git a/tests/x86/conv_004.irt b/tests/x86/conv_004.irt
@@ -15,5 +15,5 @@ x86
 }
 --EXPECT--
 test:
-	movd %xmm0, %rax
+	movq %xmm0, %rax
 	retq
diff --git a/tests/x86/conv_010.irt b/tests/x86/conv_010.irt
@@ -15,5 +15,5 @@ x86
 }
 --EXPECT--
 test:
-	movd %rdi, %xmm0
+	movq %rdi, %xmm0
 	retq
diff --git a/tests/x86_64/conv_004.irt b/tests/x86_64/conv_004.irt
@@ -13,5 +13,5 @@ x86_64
 }
 --EXPECT--
 test:
-	movd %xmm0, %rax
+	movq %xmm0, %rax
 	retq
diff --git a/tests/x86_64/conv_010.irt b/tests/x86_64/conv_010.irt
@@ -13,5 +13,5 @@ x86_64
 }
 --EXPECT--
 test:
-	movd %rdi, %xmm0
+	movq %rdi, %xmm0
 	retq