diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c
index b5c223231..f12bb254a 100644
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -76,14 +76,128 @@ const cpu_family_t cpu_families[] = {
     .name = "8088",
     .internal_name = "8088",
     .cpus = (const CPU[]) {
-        {"4.77",    CPU_8088, fpus_8088,  4772728,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"7.16",    CPU_8088, fpus_8088,  7159092,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"8",       CPU_8088, fpus_8088,  8000000,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-//      {"9.54",    CPU_8088, fpus_8088,  9545456,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"10",      CPU_8088, fpus_8088, 10000000,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"12",      CPU_8088, fpus_8088, 12000000,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"16",      CPU_8088, fpus_8088, 16000000,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"", 0}
+        {
+            .name = "4.77",
+            .cpu_type = CPU_8088,
+            .fpus = fpus_8088,
+            .rspeed =  4772728,
+            .multi = 1,
+            .voltage = 5000,
+            .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_8088,
+            .fpus = fpus_8088,
+            .rspeed =  7159092,
+            .multi = 1,
+            .voltage = 5000,
+            .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 = "8",
+            .cpu_type = CPU_8088,
+            .fpus = fpus_8088,
+            .rspeed =  8000000,
+            .multi = 1,
+            .voltage = 5000,
+            .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
+        },
+#if 0
+        {
+            .name = "9.54",
+            .cpu_type = CPU_8088,
+            .fpus = fpus_8088,
+            .rspeed =  9545456,
+            .multi = 1,
+            .voltage = 5000,
+            .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
+        },
+#endif
+        {
+            .name = "10",
+            .cpu_type = CPU_8088,
+            .fpus = fpus_8088,
+            .rspeed = 10000000,
+            .multi = 1,
+            .voltage = 5000,
+            .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_8088,
+            .fpus = fpus_8088,
+            .rspeed = 12000000,
+            .multi = 1,
+            .voltage = 5000,
+            .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_8088,
+            .fpus = fpus_8088,
+            .rspeed = 16000000,
+            .multi = 1,
+            .voltage = 5000,
+            .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 = "", 0 }
     }
     }, {
     .package = CPU_PKG_8088_EUROPC,
@@ -91,10 +205,58 @@ const cpu_family_t cpu_families[] = {
     .name = "8088",
     .internal_name = "8088_europc",
     .cpus = (const CPU[]) {
-        {"4.77",    CPU_8088, fpus_8088,  4772728,    1, 5000, 0, 0, 0, CPU_ALTERNATE_XTAL, 0,0,0,0, 1},
-        {"7.16",    CPU_8088, fpus_8088,  7159092,    1, 5000, 0, 0, 0, CPU_ALTERNATE_XTAL, 0,0,0,0, 1},
-        {"9.54",    CPU_8088, fpus_8088,  9545456,    1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
-        {"", 0}
+        {
+            .name = "4.77",
+            .cpu_type = CPU_8088,
+            .fpus = fpus_8088,
+            .rspeed = 4772728,
+            .multi = 1,
+            .voltage = 5000,
+            .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 = "7.16",
+            .cpu_type = CPU_8088,
+            .fpus = fpus_8088,
+            .rspeed = 7159092,
+            .multi = 1,
+            .voltage = 5000,
+            .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 = "9.54",
+            .cpu_type = CPU_8088,
+            .fpus = fpus_8088,
+            .rspeed = 9545456,
+            .multi = 1,
+            .voltage = 5000,
+            .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 = "", 0 }
     }
     }, {
     .package = CPU_PKG_8086,