Fix asm text test errors on 32bit machines

Author: Rot127

arch/ARM/ARMInstPrinter.c

@@ -886,15 +886,17 @@ static inline void printNoHashImmediate(MCInst *MI, unsigned OpNum, SStream *O)
 static inline void printPImmediate(MCInst *MI, unsigned OpNum, SStream *O)
 {
 	add_cs_detail(MI, ARM_OP_GROUP_PImmediate, OpNum);
-	SStream_concat(O, "%s%d", "p",
-		       MCOperand_getImm(MCInst_getOperand(MI, (OpNum))));
+	SStream_concat(
+		O, "%s%" PRIu32, "p",
+		(uint32_t)MCOperand_getImm(MCInst_getOperand(MI, (OpNum))));
 }
 
 static inline void printCImmediate(MCInst *MI, unsigned OpNum, SStream *O)
 {
 	add_cs_detail(MI, ARM_OP_GROUP_CImmediate, OpNum);
-	SStream_concat(O, "%s%d", "c",
-		       MCOperand_getImm(MCInst_getOperand(MI, (OpNum))));
+	SStream_concat(
+		O, "%s%" PRIu32, "c",
+		(uint32_t)MCOperand_getImm(MCInst_getOperand(MI, (OpNum))));
 }
 
 static inline void printCoprocOptionImm(MCInst *MI, unsigned OpNum, SStream *O)
@@ -1364,8 +1366,9 @@ 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, "%d",
-		       16 - MCOperand_getImm(MCInst_getOperand(MI, (OpNum))));
+	SStream_concat(
+		O, "%" PRId32,
+		(int32_t)16 - MCOperand_getImm(MCInst_getOperand(MI, (OpNum))));
 	SStream_concat0(O, markup(">"));
 }
 

arch/X86/X86IntelInstPrinter.c

@@ -1181,7 +1181,7 @@ static void printMemReference(MCInst *MI, unsigned Op, SStream *O)
 			SStream_concat0(O, " + ");
 		_printOperand(MI, Op + X86_AddrIndexReg, O);
 		if (ScaleVal != 1)
-			SStream_concat(O, "*%u", ScaleVal);
+			SStream_concat(O, "*%" PRIu64, ScaleVal);
 		NeedPlus = true;
 	}
 

suite/cstest/src/helper.c

@@ -2,11 +2,8 @@
 /* By Do Minh Tuan <tuanit96@gmail.com>, 02-2019 */
 
 #include <assert.h>
-#include <stdbool.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <capstone/platform.h>
-#include <stddef.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -91,9 +88,9 @@ void replace_negative(char *src, size_t src_len, size_t arch_bits)
 	char *tmp, *result, *found, *origin, *orig_found;
 	int cnt, valid;
 	char *value, *tmp_tmp;
-	unsigned short int tmp_short;
-	unsigned int tmp_int;
-	unsigned long int tmp_long;
+	uint16_t tmp_short;
+	uint32_t tmp_int;
+	uint64_t tmp_long;
 
 	result = (char *)malloc(sizeof(char));
 	result[0] = '\0';
@@ -124,11 +121,11 @@ void replace_negative(char *src, size_t src_len, size_t arch_bits)
 				sscanf(value, "%hu", &tmp_short);
 				add_str(&result, "%s%hu", tmp_tmp, tmp_short);
 			} else if (arch_bits == 32) {
-				sscanf(value, "%u", &tmp_int);
-				add_str(&result, "%s%u", tmp_tmp, tmp_int);
+				sscanf(value, "%" PRIu32, &tmp_int);
+				add_str(&result, "%s%" PRIu32, tmp_tmp, tmp_int);
 			} else if (arch_bits == 64) {
-				sscanf(value, "%lu", &tmp_long);
-				add_str(&result, "%s%lu", tmp_tmp, tmp_long);
+				sscanf(value, "%" PRIu64, &tmp_long);
+				add_str(&result, "%s%" PRIu64, tmp_tmp, tmp_long);
 			}
 
 		} else