Fix type casting for immediate values in addressing modes and enhance m68k architecture support in cstool

Author: b1llow

arch/M68K/M68KInstPrinter.c

@@ -361,10 +361,10 @@ static void printAddressingMode(SStream *O, unsigned int pc,
 		printRegAddrMode(O, pc, op);
 		break;
 	case M68K_AM_ABSOLUTE_DATA_SHORT:
-		SStream_concat(O, "$%" PRIx32 ".w", op->imm);
+		SStream_concat(O, "$%" PRIx32 ".w", (uint32_t)op->imm);
 		break;
 	case M68K_AM_ABSOLUTE_DATA_LONG:
-		SStream_concat(O, "$%" PRIx64 ".l", op->imm);
+		SStream_concat(O, "$%" PRIx64 ".l", (uint64_t)op->imm);
 		break;
 	case M68K_AM_IMMEDIATE:
 		printImmediate(O, inst, op);

cstool/cstool.c

@@ -417,9 +417,12 @@ static struct {
 	{ "xcore", "xcore, big endian", CS_ARCH_XCORE, CS_MODE_BIG_ENDIAN },
 
 	{ "m68k", "m68k + big endian", CS_ARCH_M68K, CS_MODE_BIG_ENDIAN },
-	{ "m68k40", "m68k40", CS_ARCH_M68K, CS_MODE_M68K_040 },
-	{ "m68k60", "m68k60", CS_ARCH_M68K, CS_MODE_M68K_060 },
-	{ "m68kcpu32", "m68kcpu32", CS_ARCH_M68K, CS_MODE_M68K_CPU32 },
+	{ "m68k10", "m68k, 68010", CS_ARCH_M68K, CS_MODE_M68K_010 },
+	{ "m68k20", "m68k, 68020", CS_ARCH_M68K, CS_MODE_M68K_020 },
+	{ "m68k30", "m68k, 68030", CS_ARCH_M68K, CS_MODE_M68K_030 },
+	{ "m68k40", "m68k, 68040", CS_ARCH_M68K, CS_MODE_M68K_040 },
+	{ "m68k60", "m68k, 68060", CS_ARCH_M68K, CS_MODE_M68K_060 },
+	{ "m68kcpu32", "m68k, cpu32", CS_ARCH_M68K, CS_MODE_M68K_CPU32 },
 
 	{ "tms320c64x", "tms320c64x, big endian", CS_ARCH_TMS320C64X,
 	  CS_MODE_BIG_ENDIAN },