From ba44d3cbac01162ab1ef11c2dbdb7ca73258f508 Mon Sep 17 00:00:00 2001
From: Jasmine Iwanek <jasmine@iwanek.co.uk>
Date: Fri, 3 Nov 2023 21:32:57 -0400
Subject: [PATCH] Named-initializers for 80186 CPU's

---
 src/cpu/cpu_table.c | 164 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 154 insertions(+), 10 deletions(-)

diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c
index 6556b9380..52d8edf5a 100644
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -628,16 +628,160 @@ const cpu_family_t cpu_families[] = {
     .name = "80186",
     .internal_name = "80186",
     .cpus = (const CPU[]) {
-        {"6",       CPU_186, fpus_80186,   6000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"7.16",    CPU_186, fpus_80186,   7159092,    1, 0, 0, 0, 0, CPU_ALTERNATE_XTAL, 0,0,0,0, 1},
-        {"8",       CPU_186, fpus_80186,   8000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"9.54",    CPU_186, fpus_80186,   9545456,    1, 0, 0, 0, 0, CPU_ALTERNATE_XTAL, 0,0,0,0, 1},
-        {"10",      CPU_186, fpus_80186,  10000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"12",      CPU_186, fpus_80186,  12000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"16",      CPU_186, fpus_80186,  16000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 2},
-        {"20",      CPU_186, fpus_80186,  20000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 3},
-        {"25",      CPU_186, fpus_80186,  25000000,    1, 0, 0, 0, 0, 0, 0,0,0,0, 3},
-        {"", 0}
+        {
+            .name = "6",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 6000000,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = 0,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 1
+        },
+        {
+            .name = "7.16",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 7159092,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = CPU_ALTERNATE_XTAL,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 1
+        },
+        {
+            .name = "8",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 8000000,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = 0,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 1
+        },
+        {
+            .name = "9.54",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 9545456,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = CPU_ALTERNATE_XTAL,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 1
+        },
+        {
+            .name = "10",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 10000000,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = 0,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 1
+        },
+        {
+            .name = "12",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 12000000,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = 0,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 1
+        },
+        {
+            .name = "16",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 16000000,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = 0,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 2
+        },
+        {
+            .name = "20",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 20000000,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = 0,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 3
+        },
+        {
+            .name = "25",
+            .cpu_type = CPU_186,
+            .fpus = fpus_80186,
+            .rspeed = 25000000,
+            .multi = 1,
+            .voltage = 0,
+            .edx_reset = 0,
+            .cpuid_model = 0,
+            .cyrix_id = 0,
+            .cpu_flags = 0,
+            .mem_read_cycles = 0,
+            .mem_write_cycles = 0,
+            .cache_read_cycles = 0,
+            .cache_write_cycles = 0,
+            .atclk_div = 3
+        },
+        { .name = "", 0 }
     }
     }, {
     .package = CPU_PKG_8086,