AVR: rework ARCH/CPU models.

Separate AVR architectures ("avr5", "avr51", "avr6", etc.) from actual
MCU models. Only list the most representative MCU models.

Signed-off-by: Glenn Baker <[email protected]>

Author: glennsec

include/unicorn/avr.h

@@ -17,11 +17,36 @@ extern "C" {
 #pragma warning(disable : 4201)
 #endif
 
+//> AVR architectures
+typedef enum uc_avr_arch {
+    UC_AVR_ARCH_AVR1 = 10,
+    UC_AVR_ARCH_AVR2 = 20,
+    UC_AVR_ARCH_AVR25 = 25,
+    UC_AVR_ARCH_AVR3 = 30,
+    UC_AVR_ARCH_AVR4 = 40,
+    UC_AVR_ARCH_AVR5 = 50,
+    UC_AVR_ARCH_AVR51 = 51,
+    UC_AVR_ARCH_AVR6 = 60,
+} uc_avr_arch;
+
+#define UC_CPU_AVR_ARCH 1000
+
 //> AVR CPU
 typedef enum uc_cpu_avr {
-    UC_CPU_AVR_AVR5 = 5,
-    UC_CPU_AVR_AVR51 = 51,
-    UC_CPU_AVR_AVR6 = 6,
+    // Enhanced Core with 16K up to 64K of program memory ("AVR5")
+    UC_CPU_AVR_ATMEGA16 = UC_AVR_ARCH_AVR5*UC_CPU_AVR_ARCH + 16,
+    UC_CPU_AVR_ATMEGA32 = UC_AVR_ARCH_AVR5*UC_CPU_AVR_ARCH + 32,
+    UC_CPU_AVR_ATMEGA64 = UC_AVR_ARCH_AVR5*UC_CPU_AVR_ARCH + 64,
+
+    // Enhanced Core with 128K of program memory ("AVR5.1")
+    UC_CPU_AVR_ATMEGA128 = UC_AVR_ARCH_AVR51*UC_CPU_AVR_ARCH + 128,
+    UC_CPU_AVR_ATMEGA128RFR2,
+    UC_CPU_AVR_ATMEGA1280,
+
+    // Enhanced Core with 128K+ of program memory, i.e. 3-byte PC ("AVR6")
+    UC_CPU_AVR_ATMEGA256 = UC_AVR_ARCH_AVR6*UC_CPU_AVR_ARCH + 256,
+    UC_CPU_AVR_ATMEGA256RFR2,
+    UC_CPU_AVR_ATMEGA2560,
 } uc_cpu_avr;
 
 //> AVR memory

qemu/target/avr/cpu.c

@@ -343,9 +343,19 @@ typedef struct AVRCPUInfo {
 } AVRCPUInfo;
 
 static const AVRCPUInfo avr_cpu_info[] ={
-    {UC_CPU_AVR_AVR5, "avr5", avr_avr5_initfn},
-    {UC_CPU_AVR_AVR51, "avr51", avr_avr51_initfn},
-    {UC_CPU_AVR_AVR6, "avr6", avr_avr6_initfn},
+    {UC_CPU_AVR_ATMEGA16, "arch:avr5", avr_avr5_initfn},
+    {UC_CPU_AVR_ATMEGA16, "atmega16", avr_avr5_initfn},
+    {UC_CPU_AVR_ATMEGA32, "atmega32", avr_avr5_initfn},
+    {UC_CPU_AVR_ATMEGA64, "atmega64", avr_avr5_initfn},
+
+    {UC_CPU_AVR_ATMEGA128, "arch:avr51", avr_avr51_initfn},
+    {UC_CPU_AVR_ATMEGA128, "atmega128", avr_avr51_initfn},
+    {UC_CPU_AVR_ATMEGA128RFR2, "atmega128rfr2", avr_avr51_initfn},
+    {UC_CPU_AVR_ATMEGA1280, "atmega1280", avr_avr51_initfn},
+
+    {UC_CPU_AVR_ATMEGA256, "arch:avr6", avr_avr6_initfn},
+    {UC_CPU_AVR_ATMEGA256RFR2, "atmega256rfr2", avr_avr6_initfn},
+    {UC_CPU_AVR_ATMEGA2560, "atmega2560", avr_avr6_initfn},
 };
 
 static const AVRCPUInfo *avr_cpu_info_get(int cpu_model)
@@ -412,7 +422,7 @@ AVRCPU *cpu_avr_init(struct uc_struct *uc)
     }
 
     if (uc->cpu_model == INT_MAX)
-        uc->cpu_model = UC_CPU_AVR_AVR6;
+        uc->cpu_model = UC_CPU_AVR_ATMEGA128;
     const AVRCPUInfo *const cip = avr_cpu_info_get(uc->cpu_model);
     if (!cip) {
         free(cpu);