From 2fdda7bd4720d58df5e11264128b7cbcac18b27f Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Sun, 25 Jul 2021 22:46:51 -0300 Subject: [PATCH] Migrate enhanced Am486 to a standard naming convention --- src/config.c | 7 ++++++- src/cpu/cpu_table.c | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/config.c b/src/config.c index f9347a0a4..cf66f160b 100644 --- a/src/config.c +++ b/src/config.c @@ -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; diff --git a/src/cpu/cpu_table.c b/src/cpu/cpu_table.c index b980c5cf0..0bc66e1c1 100644 --- a/src/cpu/cpu_table.c +++ b/src/cpu/cpu_table.c @@ -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},