Named initializers for Slot 1's

This commit is contained in:
Jasmine Iwanek
2024-07-23 08:39:30 -04:00
parent 6141577347
commit a880c9a020

View File

@@ -6650,14 +6650,142 @@ const cpu_family_t cpu_families[] = {
.name = "Pentium II (Klamath)",
.internal_name = "pentium2_klamath",
.cpus = (const CPU[]) {
{"66", CPU_PENTIUM2, fpus_internal, 66666666, 1.0, 2800, 0x634, 0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 6, 6, 3, 3, 8}, /* out of spec */
{"100", CPU_PENTIUM2, fpus_internal, 100000000, 1.5, 2800, 0x634, 0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 9, 9, 4, 4, 12}, /* out of spec */
{"133", CPU_PENTIUM2, fpus_internal, 133333333, 2.0, 2800, 0x634, 0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16}, /* out of spec */
{"166", CPU_PENTIUM2, fpus_internal, 166666666, 2.5, 2800, 0x634, 0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20}, /* out of spec */
{"200", CPU_PENTIUM2, fpus_internal, 200000000, 3.0, 2800, 0x634, 0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24}, /* out of spec */
{"233", CPU_PENTIUM2, fpus_internal, 233333333, 3.5, 2800, 0x634, 0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,10,10, 28},
{"266", CPU_PENTIUM2, fpus_internal, 266666666, 4.0, 2800, 0x634, 0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 24,24,12,12, 32},
{"300", CPU_PENTIUM2, fpus_internal, 300000000, 4.5, 2800, 0x634, 0x634, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 25,25,12,12, 36},
{ /* out of spec */
.name = "66",
.cpu_type = CPU_PENTIUM2,
.fpus = fpus_internal,
.rspeed = 66666666,
.multi = 1.0,
.voltage = 2800,
.edx_reset = 0x634,
.cpuid_model = 0x634,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 6,
.mem_write_cycles = 6,
.cache_read_cycles = 3,
.cache_write_cycles = 3,
.atclk_div = 8
},
{ /* out of spec */
.name = "100",
.cpu_type = CPU_PENTIUM2,
.fpus = fpus_internal,
.rspeed = 100000000,
.multi = 1.5,
.voltage = 2800,
.edx_reset = 0x634,
.cpuid_model = 0x634,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 9,
.mem_write_cycles = 9,
.cache_read_cycles = 4,
.cache_write_cycles = 4,
.atclk_div = 12
},
{ /* out of spec */
.name = "133",
.cpu_type = CPU_PENTIUM2,
.fpus = fpus_internal,
.rspeed = 133333333,
.multi = 2.0,
.voltage = 2800,
.edx_reset = 0x634,
.cpuid_model = 0x634,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 12,
.mem_write_cycles = 12,
.cache_read_cycles = 6,
.cache_write_cycles = 6,
.atclk_div = 16
},
{ /* out of spec */
.name = "166",
.cpu_type = CPU_PENTIUM2,
.fpus = fpus_internal,
.rspeed = 166666666,
.multi = 2.5,
.voltage = 2800,
.edx_reset = 0x634,
.cpuid_model = 0x634,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 15,
.mem_write_cycles = 15,
.cache_read_cycles = 7,
.cache_write_cycles = 7,
.atclk_div = 20
},
{ /* out of spec */
.name = "200",
.cpu_type = CPU_PENTIUM2,
.fpus = fpus_internal,
.rspeed = 200000000,
.multi = 3.0,
.voltage = 2800,
.edx_reset = 0x634,
.cpuid_model = 0x634,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 18,
.mem_write_cycles = 18,
.cache_read_cycles = 9,
.cache_write_cycles = 9,
.atclk_div = 24
},
{
.name = "233",
.cpu_type = CPU_PENTIUM2,
.fpus = fpus_internal,
.rspeed = 233333333,
.multi = 3.5,
.voltage = 2800,
.edx_reset = 0x634,
.cpuid_model = 0x634,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 21,
.mem_write_cycles = 21,
.cache_read_cycles = 10,
.cache_write_cycles = 10,
.atclk_div = 28
},
{
.name = "266",
.cpu_type = CPU_PENTIUM2,
.fpus = fpus_internal,
.rspeed = 266666666,
.multi = 4.0,
.voltage = 2800,
.edx_reset = 0x634,
.cpuid_model = 0x634,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 24,
.mem_write_cycles = 24,
.cache_read_cycles = 12,
.cache_write_cycles = 12,
.atclk_div = 32
},
{
.name = "300",
.cpu_type = CPU_PENTIUM2,
.fpus = fpus_internal,
.rspeed = 300000000,
.multi = 4.5,
.voltage = 2800,
.edx_reset = 0x634,
.cpuid_model = 0x634,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 25,
.mem_write_cycles = 25,
.cache_read_cycles = 12,
.cache_write_cycles = 12,
.atclk_div = 36
},
{ .name = "", 0 }
}
}, {
@@ -6666,18 +6794,210 @@ const cpu_family_t cpu_families[] = {
.name = "Pentium II (Deschutes)",
.internal_name = "pentium2_deschutes",
.cpus = (const CPU[]) {
{"66", CPU_PENTIUM2D, fpus_internal, 66666666, 1.0, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 6, 6, 3, 3, 8}, /* out of spec */
{"100", CPU_PENTIUM2D, fpus_internal, 100000000, 1.5, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 9, 9, 5, 5, 12}, /* out of spec */
{"133", CPU_PENTIUM2D, fpus_internal, 133333333, 2.0, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12, 6, 6, 16}, /* out of spec */
{"166", CPU_PENTIUM2D, fpus_internal, 166666666, 2.5, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15, 7, 7, 20}, /* out of spec */
{"200", CPU_PENTIUM2D, fpus_internal, 200000000, 3.0, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18, 9, 9, 24}, /* out of spec */
{"233", CPU_PENTIUM2D, fpus_internal, 233333333, 3.5, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,11,11, 28}, /* out of spec */
{"266", CPU_PENTIUM2D, fpus_internal, 266666666, 4.0, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 24,24,12,12, 32},
{"300", CPU_PENTIUM2D, fpus_internal, 300000000, 4.5, 2050, 0x651, 0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 25,25,12,12, 36},
{"333", CPU_PENTIUM2D, fpus_internal, 333333333, 5.0, 2050, 0x651, 0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 27,27,13,13, 40},
{"350", CPU_PENTIUM2D, fpus_internal, 350000000, 3.5, 2050, 0x651, 0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 32,32,11,11, 42},
{"400", CPU_PENTIUM2D, fpus_internal, 400000000, 4.0, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 36,36,12,12, 48},
{"450", CPU_PENTIUM2D, fpus_internal, 450000000, 4.5, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 41,41,14,14, 54},
{ /* out of spec */
.name = "66",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 66666666,
.multi = 1.0,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 6,
.mem_write_cycles = 6,
.cache_read_cycles = 3,
.cache_write_cycles = 3,
.atclk_div = 8
},
{ /* out of spec */
.name = "100",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 100000000,
.multi = 1.5,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 9,
.mem_write_cycles = 9,
.cache_read_cycles = 5,
.cache_write_cycles = 5,
.atclk_div = 12
},
{ /* out of spec */
.name = "133",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 133333333,
.multi = 2.0,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 12,
.mem_write_cycles = 12,
.cache_read_cycles = 6,
.cache_write_cycles = 6,
.atclk_div = 16
},
{ /* out of spec */
.name = "166",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 166666666,
.multi = 2.5,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 15,
.mem_write_cycles = 15,
.cache_read_cycles = 7,
.cache_write_cycles = 7,
.atclk_div = 20
},
{ /* out of spec */
.name = "200",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 200000000,
.multi = 3.0,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 18,
.mem_write_cycles = 18,
.cache_read_cycles = 9,
.cache_write_cycles = 9,
.atclk_div = 24
},
{ /* out of spec */
.name = "233",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 233333333,
.multi = 3.5,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 21,
.mem_write_cycles = 21,
.cache_read_cycles = 11,
.cache_write_cycles = 11,
.atclk_div = 28
},
{
.name = "266",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 266666666,
.multi = 4.0,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 24,
.mem_write_cycles = 24,
.cache_read_cycles = 12,
.cache_write_cycles = 12,
.atclk_div = 32
},
{
.name = "300",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 300000000,
.multi = 4.5,
.voltage = 2050,
.edx_reset = 0x651,
.cpuid_model = 0x651,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 25,
.mem_write_cycles = 25,
.cache_read_cycles = 12,
.cache_write_cycles = 12,
.atclk_div = 36
},
{
.name = "333",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 333333333,
.multi = 5.0,
.voltage = 2050,
.edx_reset = 0x651,
.cpuid_model = 0x651,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 27,
.mem_write_cycles = 27,
.cache_read_cycles = 13,
.cache_write_cycles = 13,
.atclk_div = 40
},
{
.name = "350",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 350000000,
.multi = 3.5,
.voltage = 2050,
.edx_reset = 0x651,
.cpuid_model = 0x651,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 32,
.mem_write_cycles = 32,
.cache_read_cycles = 11,
.cache_write_cycles = 11,
.atclk_div = 42
},
{
.name = "400",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 400000000,
.multi = 4.0,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 36,
.mem_write_cycles = 36,
.cache_read_cycles = 12,
.cache_write_cycles = 12,
.atclk_div = 48
},
{
.name = "450",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 450000000,
.multi = 4.5,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 41,
.mem_write_cycles = 41,
.cache_read_cycles = 14,
.cache_write_cycles = 14,
.atclk_div = 54
},
{ .name = "", 0 }
}
},
@@ -6687,14 +7007,142 @@ const cpu_family_t cpu_families[] = {
.name = "Celeron (Covington)",
.internal_name = "celeron_covington",
.cpus = (const CPU[]) {
{"66", CPU_PENTIUM2D, fpus_internal, 66666666, 1.0, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 6, 6, 6, 6, 8}, /* out of spec */
{"100", CPU_PENTIUM2D, fpus_internal, 100000000, 1.5, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 9, 9, 9, 9, 12}, /* out of spec */
{"133", CPU_PENTIUM2D, fpus_internal, 133333333, 2.0, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 12,12,12,12, 16}, /* out of spec */
{"166", CPU_PENTIUM2D, fpus_internal, 166666666, 2.5, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 15,15,15,15, 20}, /* out of spec */
{"200", CPU_PENTIUM2D, fpus_internal, 200000000, 3.0, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 18,18,18,18, 24}, /* out of spec */
{"233", CPU_PENTIUM2D, fpus_internal, 233333333, 3.5, 2050, 0x652, 0x652, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 21,21,21,21, 28}, /* out of spec */
{"266", CPU_PENTIUM2D, fpus_internal, 266666666, 4.0, 2050, 0x650, 0x650, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 24,24,24,24, 32},
{"300", CPU_PENTIUM2D, fpus_internal, 300000000, 4.5, 2050, 0x651, 0x651, 0, CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC, 25,25,25,25, 36},
{ /* out of spec */
.name = "66",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 66666666,
.multi = 1.0,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 6,
.mem_write_cycles = 6,
.cache_read_cycles = 6,
.cache_write_cycles = 6,
.atclk_div = 8
},
{ /* out of spec */
.name = "100",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 100000000,
.multi = 1.5,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 9,
.mem_write_cycles = 9,
.cache_read_cycles = 9,
.cache_write_cycles = 9,
.atclk_div = 12
},
{ /* out of spec */
.name = "133",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 133333333,
.multi = 2.0,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 12,
.mem_write_cycles = 12,
.cache_read_cycles = 12,
.cache_write_cycles = 12,
.atclk_div = 16
},
{ /* out of spec */
.name = "166",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 166666666,
.multi = 2.5,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 15,
.mem_write_cycles = 15,
.cache_read_cycles = 15,
.cache_write_cycles = 15,
.atclk_div = 20
},
{ /* out of spec */
.name = "200",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 200000000,
.multi = 3.0,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 18,
.mem_write_cycles = 18,
.cache_read_cycles = 18,
.cache_write_cycles = 18,
.atclk_div = 24
},
{ /* out of spec */
.name = "233",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 233333333,
.multi = 3.5,
.voltage = 2050,
.edx_reset = 0x652,
.cpuid_model = 0x652,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 21,
.mem_write_cycles = 21,
.cache_read_cycles = 21,
.cache_write_cycles = 21,
.atclk_div = 28
},
{
.name = "266",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 266666666,
.multi = 4.0,
.voltage = 2050,
.edx_reset = 0x650,
.cpuid_model = 0x650,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 24,
.mem_write_cycles = 24,
.cache_read_cycles = 24,
.cache_write_cycles = 24,
.atclk_div = 32
},
{
.name = "300",
.cpu_type = CPU_PENTIUM2D,
.fpus = fpus_internal,
.rspeed = 300000000,
.multi = 4.5,
.voltage = 2050,
.edx_reset = 0x651,
.cpuid_model = 0x651,
.cyrix_id = 0,
.cpu_flags = CPU_SUPPORTS_DYNAREC | CPU_REQUIRES_DYNAREC,
.mem_read_cycles = 25,
.mem_write_cycles = 25,
.cache_read_cycles = 25,
.cache_write_cycles = 25,
.atclk_div = 36
},
{ .name = "", 0 }
}
}, {