claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the Compaq CPU selection mess

Browse Source
This commit is contained in:
RichardG867
2024-01-25 21:17:05 -03:00
parent c5dc7109d4
commit e779ea5902
3 changed files with 44 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/cpu/cpu.h
View File

@@ -92,31 +92,27 @@ enum {
CPU_PKG_188 = (1 << 3), CPU_PKG_188 = (1 << 3),
CPU_PKG_186 = (1 << 4), CPU_PKG_186 = (1 << 4),
CPU_PKG_286 = (1 << 5), CPU_PKG_286 = (1 << 5),
CPU_PKG_286_CPQ_PORTABLE_II = (1 << 6), CPU_PKG_386SX = (1 << 6),
CPU_PKG_386SX = (1 << 7), CPU_PKG_386DX = (1 << 7),
CPU_PKG_386DX = (1 << 8), CPU_PKG_M6117 = (1 << 8),
CPU_PKG_386DX_CPQ_09_1986 = (1 << 9), CPU_PKG_386SLC_IBM = (1 << 9),
CPU_PKG_386DX_CPQ_1987 = (1 << 10), CPU_PKG_486SLC = (1 << 10),
CPU_PKG_386DX_CPQ_05_1988 = (1 << 11), CPU_PKG_486SLC_IBM = (1 << 11),
CPU_PKG_M6117 = (1 << 12), CPU_PKG_486BL = (1 << 12),
CPU_PKG_386SLC_IBM = (1 << 13), CPU_PKG_486DLC = (1 << 13),
CPU_PKG_486SLC = (1 << 14), CPU_PKG_SOCKET1 = (1 << 14),
CPU_PKG_486SLC_IBM = (1 << 15), CPU_PKG_SOCKET3 = (1 << 15),
CPU_PKG_486BL = (1 << 16), CPU_PKG_SOCKET3_PC330 = (1 << 16),
CPU_PKG_486DLC = (1 << 17), CPU_PKG_STPC = (1 << 17),
CPU_PKG_SOCKET1 = (1 << 18), CPU_PKG_SOCKET4 = (1 << 18),
CPU_PKG_SOCKET3 = (1 << 19), CPU_PKG_SOCKET5_7 = (1 << 19),
CPU_PKG_SOCKET3_PC330 = (1 << 20), CPU_PKG_SOCKET8 = (1 << 20),
CPU_PKG_STPC = (1 << 21), CPU_PKG_SLOT1 = (1 << 21),
CPU_PKG_SOCKET4 = (1 << 22), CPU_PKG_SLOT2 = (1 << 22),
CPU_PKG_SOCKET5_7 = (1 << 23), CPU_PKG_SLOTA = (1 << 23),
CPU_PKG_SOCKET8 = (1 << 24), CPU_PKG_SOCKET370 = (1 << 24),
CPU_PKG_SLOT1 = (1 << 25), CPU_PKG_SOCKETA = (1 << 25),
CPU_PKG_SLOT2 = (1 << 26), CPU_PKG_EBGA368 = (1 << 26)
CPU_PKG_SLOTA = (1 << 27),
CPU_PKG_SOCKET370 = (1 << 28),
CPU_PKG_SOCKETA = (1 << 29),
CPU_PKG_EBGA368 = (1 << 30)
}; };
#define MANU_INTEL 0 #define MANU_INTEL 0

95
src/cpu/cpu_table.c
View File

@@ -1004,65 +1004,6 @@ const cpu_family_t cpu_families[] = {
{ .name = "", 0 } { .name = "", 0 }
} }
}, { }, {
.package = CPU_PKG_286_CPQ_PORTABLE_II,
.manufacturer = "Intel",
.name = "80286",
.internal_name = "286",
.cpus = (const CPU[]) {
{
.name = "6",
.cpu_type = CPU_286,
.fpus = fpus_80286,
.rspeed = 6000000,
.multi = 1,
.voltage = 5000,
.edx_reset = 0,
.cpuid_model = 0,
.cyrix_id = 0,
.cpu_flags = 0,
.mem_read_cycles = 2,
.mem_write_cycles = 2,
.cache_read_cycles = 2,
.cache_write_cycles = 2,
.atclk_div = 1
},
{
.name = "8",
.cpu_type = CPU_286,
.fpus = fpus_80286,
.rspeed = 8000000,
.multi = 1,
.voltage = 5000,
.edx_reset = 0,
.cpuid_model = 0,
.cyrix_id = 0,
.cpu_flags = 0,
.mem_read_cycles = 2,
.mem_write_cycles = 2,
.cache_read_cycles = 2,
.cache_write_cycles = 2,
.atclk_div = 1
},
{
.name = "16",
.cpu_type = CPU_286,
.fpus = fpus_80286,
.rspeed = 16000000,
.multi = 1,
.voltage = 5000,
.edx_reset = 0,
.cpuid_model = 0,
.cyrix_id = 0,
.cpu_flags = 0,
.mem_read_cycles = 3,
.mem_write_cycles = 3,
.cache_read_cycles = 3,
.cache_write_cycles = 3,
.atclk_div = 2
},
{ .name = "", 0 }
}
}, {
.package = CPU_PKG_386SX, .package = CPU_PKG_386SX,
.manufacturer = "Intel", .manufacturer = "Intel",
.name = "i386SX", .name = "i386SX",
@@ -1089,33 +1030,6 @@ const cpu_family_t cpu_families[] = {
{"", 0} {"", 0}
} }
}, { }, {
.package = CPU_PKG_386DX_CPQ_09_1986,
.manufacturer = "Intel",
.name = "i386DX",
.internal_name = "i386dx",
.cpus = (const CPU[]) {
{"16", CPU_386DX, fpus_80286, 16000000, 1, 5000, 0x0308, 0, 0, 0, 3,3,3,3, 2},
{"", 0}
}
}, {
.package = CPU_PKG_386DX_CPQ_1987,
.manufacturer = "Intel",
.name = "i386DX",
.internal_name = "i386dx",
.cpus = (const CPU[]) {
{"20", CPU_386DX, fpus_80386, 20000000, 1, 5000, 0x0308, 0, 0, 0, 4,4,3,3, 3},
{"", 0}
}
}, {
.package = CPU_PKG_386DX_CPQ_05_1988,
.manufacturer = "Intel",
.name = "i386DX",
.internal_name = "i386dx",
.cpus = (const CPU[]) {
{"25", CPU_386DX, fpus_80386, 25000000, 1, 5000, 0x0308, 0, 0, 0, 4,4,3,3, 3},
{"", 0}
}
}, {
.package = CPU_PKG_386DX, .package = CPU_PKG_386DX,
.manufacturer = "Intel", .manufacturer = "Intel",
.name = "i386DX", .name = "i386DX",
@@ -1256,15 +1170,6 @@ const cpu_family_t cpu_families[] = {
{"", 0} {"", 0}
} }
}, { }, {
.package = CPU_PKG_386DX_CPQ_1987,
.manufacturer = "Cyrix",
.name = "Cx486DRx2",
.internal_name = "cx486drx2",
.cpus = (const CPU[]) {
{"40", CPU_486DLC, fpus_80386, 40000000, 2, 5000, 0x407, 0, 0x0007, 0, 8, 8,6,6, 6},
{"", 0}
}
}, {
.package = CPU_PKG_386DX, .package = CPU_PKG_386DX,
.manufacturer = "Cyrix", .manufacturer = "Cyrix",
.name = "Cx486DRx2", .name = "Cx486DRx2",

34
src/machine/machine_table.c
View File

@@ -2767,10 +2767,10 @@ const machine_t machines[] = {
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL, .gpio_acpi_handler = NULL,
.cpu = { .cpu = {
.package = CPU_PKG_286_CPQ_PORTABLE_II, .package = CPU_PKG_286,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK_NONE,
.min_bus = 0, .min_bus = 6000000,
.max_bus = 0, .max_bus = 16000000,
.min_voltage = 0, .min_voltage = 0,
.max_voltage = 0, .max_voltage = 0,
.min_multi = 0, .min_multi = 0,
@@ -2807,10 +2807,10 @@ const machine_t machines[] = {
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL, .gpio_acpi_handler = NULL,
.cpu = { .cpu = {
.package = CPU_PKG_286_CPQ_PORTABLE_II, .package = CPU_PKG_286,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK_NONE,
.min_bus = 0, .min_bus = 6000000,
.max_bus = 0, .max_bus = 16000000,
.min_voltage = 0, .min_voltage = 0,
.max_voltage = 0, .max_voltage = 0,
.min_multi = 0, .min_multi = 0,
@@ -4875,10 +4875,10 @@ const machine_t machines[] = {
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL, .gpio_acpi_handler = NULL,
.cpu = { .cpu = {
.package = CPU_PKG_386DX_CPQ_09_1986, .package = CPU_PKG_386DX,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK(CPU_486DLC, CPU_RAPIDCAD),
.min_bus = 0, .min_bus = 16000000,
.max_bus = 0, .max_bus = 16000000,
.min_voltage = 0, .min_voltage = 0,
.max_voltage = 0, .max_voltage = 0,
.min_multi = 0, .min_multi = 0,
@@ -4914,10 +4914,10 @@ const machine_t machines[] = {
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL, .gpio_acpi_handler = NULL,
.cpu = { .cpu = {
.package = CPU_PKG_386DX_CPQ_05_1988, .package = CPU_PKG_386DX,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK(CPU_486DLC, CPU_RAPIDCAD),
.min_bus = 0, .min_bus = 25000000,
.max_bus = 0, .max_bus = 25000000,
.min_voltage = 0, .min_voltage = 0,
.max_voltage = 0, .max_voltage = 0,
.min_multi = 0, .min_multi = 0,
@@ -4953,10 +4953,10 @@ const machine_t machines[] = {
.available_flag = MACHINE_AVAILABLE, .available_flag = MACHINE_AVAILABLE,
.gpio_acpi_handler = NULL, .gpio_acpi_handler = NULL,
.cpu = { .cpu = {
.package = CPU_PKG_386DX_CPQ_1987, .package = CPU_PKG_386DX,
.block = CPU_BLOCK_NONE, .block = CPU_BLOCK_NONE,
.min_bus = 0, .min_bus = 20000000,
.max_bus = 0, .max_bus = 20000000,
.min_voltage = 0, .min_voltage = 0,
.max_voltage = 0, .max_voltage = 0,
.min_multi = 0, .min_multi = 0,