80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Migrate enhanced Am486 to a standard naming convention

Browse Source
This commit is contained in:
RichardG867
2021-07-25 22:46:51 -03:00
parent b24d5219a6
commit 2fdda7bd47
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/config.c
View File

@@ -687,7 +687,12 @@ load_machine(void)
cpu_f = NULL;
p = config_get_string(cat, "cpu_family", NULL);
if (p) {
cpu_f = cpu_get_family(p);
if (! strcmp(p, "enh_am486dx2")) /* migrate modified names */
cpu_f = cpu_get_family("am486dx2_slenh");
else if (! strcmp(p, "enh_am486dx4")) /* migrate modified names */
cpu_f = cpu_get_family("am486dx4_slenh");
else
cpu_f = cpu_get_family(p);
if (cpu_f && !cpu_family_is_eligible(cpu_f, machine)) /* only honor eligible families */
cpu_f = NULL;

4
src/cpu/cpu_table.c
View File

@@ -493,7 +493,7 @@ const cpu_family_t cpu_families[] = {
.package = CPU_PKG_SOCKET3,
.manufacturer = "AMD",
.name = "Am486DX2 (Enhanced)",
.internal_name = "enh_am486dx2",
.internal_name = "am486dx2_slenh",
.cpus = (const CPU[]) {
{"66", CPU_ENH_Am486DX, fpus_internal, 66666666, 2, 5000, 0x435, 0x435, 0, CPU_SUPPORTS_DYNAREC, 12,12, 6, 6, 8},
{"80", CPU_ENH_Am486DX, fpus_internal, 80000000, 2, 5000, 0x435, 0x435, 0, CPU_SUPPORTS_DYNAREC, 14,14, 6, 6, 10},
@@ -503,7 +503,7 @@ const cpu_family_t cpu_families[] = {
.package = CPU_PKG_SOCKET3,
.manufacturer = "AMD",
.name = "Am486DX4 (Enhanced)",
.internal_name = "enh_am486dx4",
.internal_name = "am486dx4_slenh",
.cpus = (const CPU[]) {
{"75", CPU_ENH_Am486DX, fpus_internal, 75000000, 3.0, 5000, 0x482, 0x482, 0, CPU_SUPPORTS_DYNAREC, 12,12, 9, 9, 9},
{"100", CPU_ENH_Am486DX, fpus_internal, 100000000, 3.0, 5000, 0x482, 0x482, 0, CPU_SUPPORTS_DYNAREC, 15,15, 9, 9, 12},