commit b584a5041a233a4ac25c551da1f21cc855e985c2
author Nguyen Anh Quynh <aquynh@gmail.com> Sun Aug 16 18:43:49 2015 +0800
committer Nguyen Anh Quynh <aquynh@gmail.com> Sun Aug 16 18:43:49 2015 +0800
tree 14af34f3b32b1a1a6aa13da48e2d8d1b2691dca5
parent b6ae93d7073cab4b4cc7605912a508300fad61ea

x86: another attempt for #456

arch/X86/X86ATTInstPrinter.c

diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c
index 35f1c26..2e93e08 100644
--- a/arch/X86/X86ATTInstPrinter.c
+++ b/arch/X86/X86ATTInstPrinter.c
@@ -462,9 +462,13 @@
 		}
 
 		// CALL/JMP rel16 is special
-		if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2 || MI->Opcode == X86_JMP_4)
+		if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2)
 			imm = imm & 0xffff;
 
+		if (MI->csh->mode == CS_MODE_16 && MI->Opcode == X86_JMP_4)
+			imm = imm & 0xffff;
+
+
 		if (imm < 0) {
 			SStream_concat(O, "0x%"PRIx64, imm);
 		} else {

arch/X86/X86IntelInstPrinter.c

diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c
index 4fdd9c3..0d7ae7b 100644
--- a/arch/X86/X86IntelInstPrinter.c
+++ b/arch/X86/X86IntelInstPrinter.c
@@ -544,7 +544,10 @@
 		}
 
 		// CALL/JMP rel16 is special
-		if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2 || MI->Opcode == X86_JMP_4)
+		if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2)
+			imm = imm & 0xffff;
+
+		if (MI->csh->mode == CS_MODE_16 && MI->Opcode == X86_JMP_4)
 			imm = imm & 0xffff;
 
 		if (imm < 0) {