More 32bit bug fixes

Author: Rot127

arch/AArch64/AArch64InstPrinter.c

@@ -1131,7 +1131,7 @@ void printShifter(MCInst *MI, unsigned OpNum, SStream *O)
 	    AArch64_AM_getShiftValue(Val) == 0)
 		return;
 	SStream_concat(
-		O, "%s%s%s%s#%d", ", ",
+		O, "%s%s%s%s#%u", ", ",
 		AArch64_AM_getShiftExtendName(AArch64_AM_getShiftType(Val)),
 		" ", markup("<imm:"), AArch64_AM_getShiftValue(Val));
 	SStream_concat0(O, markup(">"));
@@ -1202,7 +1202,7 @@ static void printMemExtendImpl(bool SignExtend, bool DoShift, unsigned Width,
 		if (getUseMarkup)
 			SStream_concat0(O, "<imm:");
 		unsigned ShiftAmount = DoShift ? Log2_32(Width / 8) : 0;
-		SStream_concat(O, "%s%d", "#", ShiftAmount);
+		SStream_concat(O, "%s%u", "#", ShiftAmount);
 		if (getUseMarkup)
 			SStream_concat0(O, ">");
 	}
@@ -2319,7 +2319,7 @@ void printSIMDType10Operand(MCInst *MI, unsigned OpNo, SStream *O)
 		unsigned Val = \
 			MCOperand_getImm(MCInst_getOperand(MI, (OpNo))); \
 		SStream_concat(O, "%s", markup("<imm:")); \
-		SStream_concat(O, "#%d", (Val * Angle) + Remainder); \
+		SStream_concat(O, "#%" PRId32, (int32_t)((Val * Angle) + Remainder)); \
 		SStream_concat0(O, markup(">")); \
 	}
 DEFINE_printComplexRotationOp(180, 90);

arch/ARM/ARMInstPrinter.c

@@ -1367,8 +1367,8 @@ static inline void printFBits16(MCInst *MI, unsigned OpNum, SStream *O)
 	add_cs_detail(MI, ARM_OP_GROUP_FBits16, OpNum);
 	SStream_concat(O, "%s%s", markup("<imm:"), "#");
 	SStream_concat(
-		O, "%" PRId32,
-		(int32_t)16 - MCOperand_getImm(MCInst_getOperand(MI, (OpNum))));
+		O, "%" PRIu32,
+		(uint32_t)(16 - MCOperand_getImm(MCInst_getOperand(MI, (OpNum)))));
 	SStream_concat0(O, markup(">"));
 }
 
@@ -1627,7 +1627,7 @@ DEFINE_printMVEVectorList(2) DEFINE_printMVEVectorList(4)
 			OpNo, Angle, Remainder); \
 		unsigned Val = \
 			MCOperand_getImm(MCInst_getOperand(MI, (OpNo))); \
-		SStream_concat(O, "#%d", (Val * Angle) + Remainder); \
+		SStream_concat(O, "#%u", (uint32_t)((Val * Angle) + Remainder)); \
 	}
 	DEFINE_printComplexRotationOp(90, 0) DEFINE_printComplexRotationOp(180,
 									   90)

arch/X86/X86ATTInstPrinter.c

@@ -555,7 +555,7 @@ static void printU8Imm(MCInst *MI, unsigned Op, SStream *O)
 	if (val > HEX_THRESHOLD)
 		SStream_concat(O, "$0x%x", val);
 	else
-		SStream_concat(O, "$%u", val);
+		SStream_concat(O, "$%" PRIu8, val);
 
 	if (MI->csh->detail_opt) {
 		MI->flat_insn->detail->x86
@@ -744,7 +744,7 @@ static void printOperand(MCInst *MI, unsigned OpNo, SStream *O)
 			// do not print number in negative form
 			imm = imm & 0xff;
 			if (imm >= 0 && imm <= HEX_THRESHOLD)
-				SStream_concat(O, "$%u", imm);
+				SStream_concat(O, "$%" PRIu64, imm);
 			else {
 				SStream_concat(O, "$0x%x", imm);
 			}
@@ -767,7 +767,7 @@ static void printOperand(MCInst *MI, unsigned OpNo, SStream *O)
 		case X86_INS_XOR:
 			// do not print number in negative form
 			if (imm >= 0 && imm <= HEX_THRESHOLD)
-				SStream_concat(O, "$%u", imm);
+				SStream_concat(O, "$%" PRIu64, imm);
 			else {
 				imm = arch_masks[opsize ? opsize : MI->imm_size] &
 				      imm;
@@ -779,7 +779,7 @@ static void printOperand(MCInst *MI, unsigned OpNo, SStream *O)
 		case X86_INS_RETF:
 			// RET imm16
 			if (imm >= 0 && imm <= HEX_THRESHOLD)
-				SStream_concat(O, "$%u", imm);
+				SStream_concat(O, "$%" PRIu64, imm);
 			else {
 				imm = 0xffff & imm;
 				SStream_concat(O, "$0x%x", imm);
@@ -937,7 +937,7 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O)
 							  .op_count]
 					.mem.scale = (int)ScaleVal;
 			if (ScaleVal != 1) {
-				SStream_concat(O, ", %u", ScaleVal);
+				SStream_concat(O, ", %" PRIu64, ScaleVal);
 			}
 		}