x86: temporarily revert a part of commit 2be9b87 due to some broken o…

…utput
opexxx · Mar 31, 2014 · 461f710 · 461f710
1 parent cc39c35
commit 461f710
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c
@@ -370,7 +370,10 @@ static void printOperand(MCInst *MI, unsigned OpNo, SStream *O)
 			else
 				SStream_concat(O, "%s$%"PRIu64"%s", markup("<imm:"), imm, markup(">"));
 		} else {
-			SStream_concat(O, "%s$0x%"PRIx64"%s", markup("<imm:"), arch_masks[MI->x86_imm_size] & imm, markup(">"));
+			if (imm < -HEX_THRESHOLD)
+				SStream_concat(O, "%s$-0x%"PRIx64"%s", markup("<imm:"), -imm, markup(">"));
+			else
+				SStream_concat(O, "%s$-%"PRIu64"%s", markup("<imm:"), -imm, markup(">"));
 		}
 		if (MI->csh->detail) {
 			MI->flat_insn.x86.operands[MI->flat_insn.x86.op_count].type = X86_OP_IMM;
@@ -390,7 +393,10 @@ static void _printOperand(MCInst *MI, unsigned OpNo, SStream *O)
 		// Print X86 immediates as signed values.
 		int64_t imm = MCOperand_getImm(Op);
 		if (imm < 0) {
-			SStream_concat(O, "%s$0x%"PRIx64"%s", markup("<imm:"), arch_masks[MI->x86_imm_size] & imm, markup(">"));
+			if (imm < -HEX_THRESHOLD)
+				SStream_concat(O, "%s$-0x%"PRIx64"%s", markup("<imm:"), -imm, markup(">"));
+			else
+				SStream_concat(O, "%s$-%"PRIu64"%s", markup("<imm:"), -imm, markup(">"));
 		} else {
 			if (imm > HEX_THRESHOLD)
 				SStream_concat(O, "%s$0x%"PRIx64"%s", markup("<imm:"), imm, markup(">"));

diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c
@@ -413,7 +413,10 @@ static void printOperand(MCInst *MI, unsigned OpNo, SStream *O)
 			else
 				SStream_concat(O, "%"PRIu64, imm);
 		} else {
-			SStream_concat(O, "0x%"PRIx64, arch_masks[MI->x86_imm_size] & imm);
+			if (imm < -HEX_THRESHOLD)
+				SStream_concat(O, "-0x%"PRIx64, -imm);
+			else
+				SStream_concat(O, "-%"PRIu64, -imm);
 		}
 
 		if (MI->csh->detail) {
@@ -433,7 +436,11 @@ static void _printOperand(MCInst *MI, unsigned OpNo, SStream *O)
 	} else if (MCOperand_isImm(Op)) {
 		int64_t imm = MCOperand_getImm(Op);
 		if (imm < 0) {
-			SStream_concat(O, "0x%"PRIx64, arch_masks[MI->x86_imm_size] & imm);
+			if (imm < -HEX_THRESHOLD)
+				SStream_concat(O, "-0x%"PRIx64, -imm);
+			else
+				SStream_concat(O, "-%"PRIu64, -imm);
+
 		} else {
 			if (imm > HEX_THRESHOLD)
 				SStream_concat(O, "0x%"PRIx64, imm);