librz/arch: fix 6808 naming and add CPU aliases for 6802, 6803, 6808 (#5939)

Author: historicattle

librz/arch/p/analysis/analysis_m680x_cs.c

@@ -12,15 +12,17 @@ static int m680xmode(const char *str) {
 		return CS_MODE_M680X_6800;
 	}
 	// replace this with the asm.features?
-	if (str && strstr(str, "6800")) {
+	if (str && (strstr(str, "6800") || strstr(str, "6802") || strstr(str, "6808"))) {
 		return CS_MODE_M680X_6800;
 	}
-	if (str && strstr(str, "6801")) {
+	if (str && (strstr(str, "6801") || strstr(str, "6803"))) {
 		return CS_MODE_M680X_6801;
 	} else if (str && strstr(str, "6805")) {
 		return CS_MODE_M680X_6805;
-	} else if (str && strstr(str, "6808")) {
+	} else if (str && strstr(str, "68HC08")) {
 		return CS_MODE_M680X_6808;
+	} else if (strstr(str, "6808")) {
+		return CS_MODE_M680X_6800;
 	} else if (str && strstr(str, "6809")) {
 		return CS_MODE_M680X_6809;
 	} else if (str && strstr(str, "6811")) {

librz/arch/p/asm/asm_m680x_cs.c

@@ -12,15 +12,17 @@ static cs_mode m680x_mode(const char *str) {
 		return CS_MODE_M680X_6800;
 	}
 	// replace this with the asm.features?
-	if (strstr(str, "6800")) {
+	if (strstr(str, "6800") || strstr(str, "6802") || strstr(str, "6808")) {
 		return CS_MODE_M680X_6800;
 	}
-	if (strstr(str, "6801")) {
+	if (strstr(str, "6801") || strstr(str, "6803")) {
 		return CS_MODE_M680X_6801;
 	} else if (strstr(str, "6805")) {
 		return CS_MODE_M680X_6805;
-	} else if (strstr(str, "6808")) {
+	} else if (strstr(str, "68HC08")) {
 		return CS_MODE_M680X_6808;
+	} else if (strstr(str, "6808")) {
+		return CS_MODE_M680X_6800;
 	} else if (strstr(str, "6809")) {
 		return CS_MODE_M680X_6809;
 	} else if (strstr(str, "6811")) {
@@ -83,8 +85,11 @@ static char **m680x_cpu_descriptions() {
 	static char *cpu_desc[] = {
 		"6800", "Motorola 6800: 8-bit microprocessor launched in 1974",
 		"6801", "Motorola 6801: Enhanced version of the 6800 with additional features like on-chip RAM and timers.",
+		"6802", "Motorola 6802: Enhanced version of the 6800 with 128 bytes of on-chip RAM and internal clock",
+		"6803", "Motorola 6803: Version of 6801 without internal ROM",
 		"6805", "Motorola 68HC05: 8-bit microcontroller",
 		"6808", "Motorola 6808: Variant of the 6800 microprocessor",
+		"68HC08", "Motorola 68HC08: 8-bit microcontroller (abbreviated as HC08)",
 		"6809", "Motorola 6809: Advanced 8-bit microprocessor",
 		"6811", "Motorola 68HC11: 8-bit microcontroller (also abbreviated as 6811 or HC11)",
 		"cpu12", "Motorola 68HC12: 16-bit microcontroller (also abbreviated as 6812 or HC12)",
@@ -98,7 +103,7 @@ static char **m680x_cpu_descriptions() {
 
 RzAsmPlugin rz_asm_plugin_m680x_cs = {
 	.name = "m680x",
-	.cpus = "6800,6801,6805,6808,6809,6811,cpu12,6301,6309,hcs08",
+	.cpus = "6800,6801,6802,6803,6805,6808,68HC08,6809,6811,cpu12,6301,6309,hcs08",
 	.desc = "Motorola 680X Capstone-based disassembler",
 	.license = "BSD",
 	.arch = "m680x",

test/db/cmd/cmd_aL

@@ -143,8 +143,11 @@ ATTiny48        8-bit AVR microcontroller with 4KB Flash, 256B SRAM
 ATTiny88        8-bit AVR microcontroller with 8KB Flash, 512B SRAM
 6800            Motorola 6800: 8-bit microprocessor launched in 1974
 6801            Motorola 6801: Enhanced version of the 6800 with additional features like on-chip RAM and timers.
+6802            Motorola 6802: Enhanced version of the 6800 with 128 bytes of on-chip RAM and internal clock
+6803            Motorola 6803: Version of 6801 without internal ROM
 6805            Motorola 68HC05: 8-bit microcontroller
 6808            Motorola 6808: Variant of the 6800 microprocessor
+68HC08          Motorola 68HC08: 8-bit microcontroller (abbreviated as HC08)
 6809            Motorola 6809: Advanced 8-bit microprocessor
 6811            Motorola 68HC11: 8-bit microcontroller (also abbreviated as 6811 or HC11)
 cpu12           Motorola 68HC12: 16-bit microcontroller (also abbreviated as 6812 or HC12)

test/db/tools/rz_asm

@@ -667,8 +667,11 @@ ATTiny48        8-bit AVR microcontroller with 4KB Flash, 256B SRAM
 ATTiny88        8-bit AVR microcontroller with 8KB Flash, 512B SRAM
 6800            Motorola 6800: 8-bit microprocessor launched in 1974
 6801            Motorola 6801: Enhanced version of the 6800 with additional features like on-chip RAM and timers.
+6802            Motorola 6802: Enhanced version of the 6800 with 128 bytes of on-chip RAM and internal clock
+6803            Motorola 6803: Version of 6801 without internal ROM
 6805            Motorola 68HC05: 8-bit microcontroller
 6808            Motorola 6808: Variant of the 6800 microprocessor
+68HC08          Motorola 68HC08: 8-bit microcontroller (abbreviated as HC08)
 6809            Motorola 6809: Advanced 8-bit microprocessor
 6811            Motorola 68HC11: 8-bit microcontroller (also abbreviated as 6811 or HC11)
 cpu12           Motorola 68HC12: 16-bit microcontroller (also abbreviated as 6812 or HC12)