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

Rewrite CPU table backwards compatibility system, and fix a crash in the speed clamping code

Browse Source
This commit is contained in:
RichardG867
2020-11-18 19:56:22 -03:00
parent e8c83a6c09
commit 149322a06a
4 changed files with 986 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
src/config.c
View File

@@ -509,9 +509,8 @@ load_machine(void)
{ {
char *cat = "Machine"; char *cat = "Machine";
char *p; char *p;
int c, i, speed, legacy_mfg, legacy_cpu, new_cpu; int c, i, speed, legacy_mfg, legacy_cpu;
double multi; double multi;
cpu_family_t *legacy_family;
p = config_get_string(cat, "machine", NULL); p = config_get_string(cat, "machine", NULL);
if (p != NULL) { if (p != NULL) {
@@ -549,7 +548,9 @@ load_machine(void)
/* Backwards compatibility with the previous CPU model system. */ /* Backwards compatibility with the previous CPU model system. */
legacy_mfg = config_get_int(cat, "cpu_manufacturer", 0); legacy_mfg = config_get_int(cat, "cpu_manufacturer", 0);
legacy_cpu = config_get_int(cat, "cpu", 0); legacy_cpu = config_get_int(cat, "cpu", 0);
if (legacy_mfg || legacy_cpu) {
/* Check if either legacy ID is present, and if they are within bounds. */
if (((legacy_mfg > 0) || (legacy_cpu > 0)) && (legacy_mfg >= 0) && (legacy_mfg < 4) && (legacy_cpu >= 0)) {
/* Look for a machine entry on the legacy table. */ /* Look for a machine entry on the legacy table. */
p = machine_get_internal_name(); p = machine_get_internal_name();
c = 0; c = 0;
@@ -559,45 +560,25 @@ load_machine(void)
c++; c++;
} }
if (cpu_legacy_table[c].machine) { if (cpu_legacy_table[c].machine) {
/* Look for a corresponding CPU entry. */ /* Determine the amount of CPU entries on the table. */
i = -1; i = -1;
cpu_legacy_table_t *legacy_table_entry; while (cpu_legacy_table[c].tables[legacy_mfg][++i].family);
do {
i++;
legacy_table_entry = (cpu_legacy_table_t *) &cpu_legacy_table[c].tables[legacy_mfg][i];
if (legacy_cpu >= legacy_table_entry->old_offset) {
/* Found CPU entry, set new values. */
if (!legacy_table_entry->family) /* reset to defaults if the CPU ID is beyond what is supported by the legacy table */ /* If the CPU ID is out of bounds, reset to the last known ID. */
break; if (legacy_cpu >= i)
legacy_cpu = i - 1;
legacy_family = cpu_get_family((char *) legacy_table_entry->family); const cpu_legacy_table_t *legacy_table_entry = &cpu_legacy_table[c].tables[legacy_mfg][legacy_cpu];
if (!legacy_family || !cpu_family_is_eligible(legacy_family, machine)) /* check if the family exists and is eligible; if not, reset to defaults */
break;
config_set_string(cat, "cpu_family", (char *) legacy_family->internal_name);
cpu_f = legacy_family;
legacy_cpu -= legacy_table_entry->old_offset; /* Check if the referenced family exists. */
legacy_cpu += legacy_table_entry->new_offset; cpu_f = cpu_get_family(legacy_table_entry->family);
new_cpu = legacy_cpu; if (cpu_f) {
while (!cpu_is_eligible(legacy_family, new_cpu, machine)) { /* if the legacy CPU is no longer eligible, find the next eligible one */ /* Save the new values. */
new_cpu++; config_set_string(cat, "cpu_family", (char *) legacy_table_entry->family);
if (legacy_family->cpus[new_cpu].cpu_type == 0) /* end of list, wrap around */ config_set_int(cat, "cpu_speed", legacy_table_entry->rspeed);
new_cpu = 0; config_set_double(cat, "cpu_multi", legacy_table_entry->multi);
if (new_cpu == legacy_cpu) { /* back at legacy CPU = no eligible ones found (shouldn't really happen due to the cpu_family_is_eligible check above) */
new_cpu = -1;
break;
} }
} }
if (new_cpu != -1) { /* store only if an eligible CPU was found; if not, reset CPU (but not family) to defaults */
config_set_int(cat, "cpu_speed", legacy_family->cpus[new_cpu].rspeed);
config_set_double(cat, "cpu_multi", legacy_family->cpus[new_cpu].multi);
}
break;
}
} while (cpu_legacy_table[c].tables[legacy_mfg][i].old_offset);
}
} }
} }
@@ -609,17 +590,17 @@ load_machine(void)
cpu = 0; cpu = 0;
c = 0; c = 0;
i = 256; i = 256;
while (cpu_f->cpus[cpu].cpu_type != -1) { while (cpu_f->cpus[cpu].cpu_type) {
if (cpu_is_eligible(cpu_f, cpu, machine)) { /* skip ineligible CPUs */ if (cpu_is_eligible(cpu_f, cpu, machine)) { /* skip ineligible CPUs */
if ((cpu_f->cpus[cpu].rspeed == speed) && (cpu_f->cpus[cpu].multi == multi)) /* check if clock speed and multiplier match */ if ((cpu_f->cpus[cpu].rspeed == speed) && (cpu_f->cpus[cpu].multi == multi)) /* exact speed/multiplier match */
break; break;
else if ((cpu_f->cpus[cpu].rspeed > speed) && (i == 256)) /* store closest matching faster CPU */ else if ((cpu_f->cpus[cpu].rspeed >= speed) && (i == 256)) /* closest speed match */
i = cpu; i = cpu;
c = cpu; /* store fastest eligible CPU */ c = cpu; /* store fastest eligible CPU */
} }
cpu++; cpu++;
} }
if (cpu_f->cpus[cpu].cpu_type == -1) /* if no exact match was found, use closest matching faster CPU, or fastest eligible CPU */ if (!cpu_f->cpus[cpu].cpu_type) /* if no exact match was found, use closest matching faster CPU, or fastest eligible CPU */
cpu = MIN(i, c); cpu = MIN(i, c);
} else { /* default */ } else { /* default */
/* Find first eligible family. */ /* Find first eligible family. */
@@ -630,7 +611,7 @@ load_machine(void)
return; return;
} }
} }
cpu_f = &cpu_families[c]; cpu_f = (cpu_family_t *) &cpu_families[c];
/* Find first eligible CPU in that family. */ /* Find first eligible CPU in that family. */
cpu = 0; cpu = 0;
@@ -1610,7 +1591,7 @@ config_load(void)
memset(zip_drives, 0, sizeof(zip_drive_t)); memset(zip_drives, 0, sizeof(zip_drive_t));
if (! config_read(cfg_path)) { if (! config_read(cfg_path)) {
cpu_f = &cpu_families[0]; cpu_f = (cpu_family_t *) &cpu_families[0];
cpu = 0; cpu = 0;
#ifdef USE_LANGUAGE #ifdef USE_LANGUAGE
plat_langid = 0x0409; plat_langid = 0x0409;
@@ -1796,7 +1777,7 @@ save_machine(void)
{ {
char *cat = "Machine"; char *cat = "Machine";
char *p; char *p;
int c, i, j, old_offset_max, legacy_cpu = -1; int c, i = 0, legacy_mfg, legacy_cpu = -1, closest_legacy_cpu = -1;
p = machine_get_internal_name(); p = machine_get_internal_name();
config_set_string(cat, "machine", p); config_set_string(cat, "machine", p);
@@ -1805,7 +1786,7 @@ save_machine(void)
config_set_int(cat, "cpu_speed", cpu_f->cpus[cpu].rspeed); config_set_int(cat, "cpu_speed", cpu_f->cpus[cpu].rspeed);
config_set_double(cat, "cpu_multi", cpu_f->cpus[cpu].multi); config_set_double(cat, "cpu_multi", cpu_f->cpus[cpu].multi);
/* Limited forwards compatibility with the previous CPU model system. */ /* Forwards compatibility with the previous CPU model system. */
config_delete_var(cat, "cpu_manufacturer"); config_delete_var(cat, "cpu_manufacturer");
config_delete_var(cat, "cpu"); config_delete_var(cat, "cpu");
@@ -1819,28 +1800,41 @@ save_machine(void)
if (cpu_legacy_table[c].machine) { if (cpu_legacy_table[c].machine) {
/* Look for a corresponding CPU entry. */ /* Look for a corresponding CPU entry. */
cpu_legacy_table_t *legacy_table_entry; cpu_legacy_table_t *legacy_table_entry;
for (j = 0; (j < 5) && (legacy_cpu == -1); j++) { for (legacy_mfg = 0; legacy_mfg < 4; legacy_mfg++) {
if (!cpu_legacy_table[c].tables[j]) if (!cpu_legacy_table[c].tables[legacy_mfg])
continue; continue;
old_offset_max = 256; i = 0;
i = -1;
do { do {
i++; legacy_table_entry = (cpu_legacy_table_t *) &cpu_legacy_table[c].tables[legacy_mfg][i];
legacy_table_entry = (cpu_legacy_table_t *) &cpu_legacy_table[c].tables[j][i];
if (legacy_table_entry->family && (cpu >= legacy_table_entry->new_offset) && !strcmp(legacy_table_entry->family, cpu_f->internal_name)) { /* Match the family name, speed and multiplier. */
/* Found CPU entry, set legacy values. */ if (!strcmp(cpu_f->internal_name, legacy_table_entry->family)) {
if (j) if ((legacy_table_entry->rspeed == cpu_f->cpus[cpu].rspeed) &&
config_set_int(cat, "cpu_manufacturer", j); (legacy_table_entry->multi == cpu_f->cpus[cpu].multi)) { /* exact speed/multiplier match */
legacy_cpu = cpu - legacy_table_entry->new_offset + legacy_table_entry->old_offset; legacy_cpu = i;
if (legacy_cpu >= old_offset_max) /* if the CPU ID is beyond what is supported by the legacy table, reset to the last supported ID */ break;
legacy_cpu = old_offset_max - 1; } else if ((legacy_table_entry->rspeed >= cpu_f->cpus[cpu].rspeed) &&
if (legacy_cpu) (closest_legacy_cpu == -1)) { /* closest speed match */
config_set_int(cat, "cpu", legacy_cpu); closest_legacy_cpu = i;
}
}
} while (cpu_legacy_table[c].tables[legacy_mfg][++i].family);
/* Use the closest speed match if no exact match was found. */
if ((legacy_cpu == -1) && (closest_legacy_cpu > -1)) {
legacy_cpu = closest_legacy_cpu;
break;
} else if (legacy_cpu > -1) /* exact match found */
break; break;
} }
old_offset_max = legacy_table_entry->old_offset;
} while (cpu_legacy_table[c].tables[j][i].old_offset); /* Set legacy values if a match was found. */
if (legacy_cpu > -1) {
if (legacy_mfg)
config_set_int(cat, "cpu_manufacturer", legacy_mfg);
if (legacy_cpu)
config_set_int(cat, "cpu", legacy_cpu);
} }
} }

14
src/cpu/cpu.c
View File

@@ -315,7 +315,7 @@ cpu_set_edx(void)
} }
cpu_family_t * cpu_family_t *
cpu_get_family(char *internal_name) cpu_get_family(const char *internal_name)
{ {
int c = 0; int c = 0;
while (cpu_families[c].package) { while (cpu_families[c].package) {
@@ -329,7 +329,7 @@ cpu_get_family(char *internal_name)
uint8_t uint8_t
cpu_is_eligible(cpu_family_t *cpu_family, int cpu, int machine) cpu_is_eligible(const cpu_family_t *cpu_family, int cpu, int machine)
{ {
/* Get machine. */ /* Get machine. */
const machine_t *machine_s = &machines[machine]; const machine_t *machine_s = &machines[machine];
@@ -399,7 +399,7 @@ cpu_is_eligible(cpu_family_t *cpu_family, int cpu, int machine)
uint8_t uint8_t
cpu_family_is_eligible(cpu_family_t *cpu_family, int machine) cpu_family_is_eligible(const cpu_family_t *cpu_family, int machine)
{ {
int c = 0; int c = 0;
@@ -413,7 +413,7 @@ cpu_family_is_eligible(cpu_family_t *cpu_family, int machine)
} }
int fpu_get_type(cpu_family_t *cpu_family, int cpu, const char *internal_name) int fpu_get_type(const cpu_family_t *cpu_family, int cpu, const char *internal_name)
{ {
const CPU *cpu_s = &cpu_family->cpus[cpu]; const CPU *cpu_s = &cpu_family->cpus[cpu];
const FPU *fpus = cpu_s->fpus; const FPU *fpus = cpu_s->fpus;
@@ -430,7 +430,7 @@ int fpu_get_type(cpu_family_t *cpu_family, int cpu, const char *internal_name)
return fpu_type; return fpu_type;
} }
const char *fpu_get_internal_name(cpu_family_t *cpu_family, int cpu, int type) const char *fpu_get_internal_name(const cpu_family_t *cpu_family, int cpu, int type)
{ {
const CPU *cpu_s = &cpu_family->cpus[cpu]; const CPU *cpu_s = &cpu_family->cpus[cpu];
const FPU *fpus = cpu_s->fpus; const FPU *fpus = cpu_s->fpus;
@@ -446,7 +446,7 @@ const char *fpu_get_internal_name(cpu_family_t *cpu_family, int cpu, int type)
return fpus[0].internal_name; return fpus[0].internal_name;
} }
const char *fpu_get_name_from_index(cpu_family_t *cpu_family, int cpu, int c) const char *fpu_get_name_from_index(const cpu_family_t *cpu_family, int cpu, int c)
{ {
const CPU *cpu_s = &cpu_family->cpus[cpu]; const CPU *cpu_s = &cpu_family->cpus[cpu];
const FPU *fpus = cpu_s->fpus; const FPU *fpus = cpu_s->fpus;
@@ -454,7 +454,7 @@ const char *fpu_get_name_from_index(cpu_family_t *cpu_family, int cpu, int c)
return fpus[c].name; return fpus[c].name;
} }
int fpu_get_type_from_index(cpu_family_t *cpu_family, int cpu, int c) int fpu_get_type_from_index(const cpu_family_t *cpu_family, int cpu, int c)
{ {
const CPU *cpu_s = &cpu_family->cpus[cpu]; const CPU *cpu_s = &cpu_family->cpus[cpu];
const FPU *fpus = cpu_s->fpus; const FPU *fpus = cpu_s->fpus;

24
src/cpu/cpu.h
View File

@@ -161,13 +161,13 @@ typedef struct {
typedef struct { typedef struct {
const char *family; const char *family;
const int old_offset; const int rspeed;
const int new_offset; const double multi;
} cpu_legacy_table_t; } cpu_legacy_table_t;
typedef struct { typedef struct {
const char *machine; const char *machine;
const cpu_legacy_table_t *tables[5]; const cpu_legacy_table_t **tables;
} cpu_legacy_machine_t; } cpu_legacy_machine_t;
@@ -370,8 +370,8 @@ COMPILE_TIME_ASSERT(sizeof(cpu_state_t) <= 128)
/* Global variables. */ /* Global variables. */
extern cpu_family_t cpu_families[]; extern const cpu_family_t cpu_families[];
extern cpu_legacy_machine_t cpu_legacy_table[]; extern const cpu_legacy_machine_t cpu_legacy_table[];
extern cpu_family_t *cpu_f; extern cpu_family_t *cpu_f;
extern CPU *cpu_s; extern CPU *cpu_s;
@@ -574,13 +574,13 @@ extern int sysexit(uint32_t fetchdat);
extern int syscall(uint32_t fetchdat); extern int syscall(uint32_t fetchdat);
extern int sysret(uint32_t fetchdat); extern int sysret(uint32_t fetchdat);
extern cpu_family_t *cpu_get_family(char *internal_name); extern cpu_family_t *cpu_get_family(const char *internal_name);
extern uint8_t cpu_is_eligible(cpu_family_t *cpu_family, int cpu, int machine); extern uint8_t cpu_is_eligible(const cpu_family_t *cpu_family, int cpu, int machine);
extern uint8_t cpu_family_is_eligible(cpu_family_t *cpu_family, int machine); extern uint8_t cpu_family_is_eligible(const cpu_family_t *cpu_family, int machine);
extern int fpu_get_type(cpu_family_t *cpu_family, int cpu, const char *internal_name); extern int fpu_get_type(const cpu_family_t *cpu_family, int cpu, const char *internal_name);
extern const char *fpu_get_internal_name(cpu_family_t *cpu_family, int cpu, int type); extern const char *fpu_get_internal_name(const cpu_family_t *cpu_family, int cpu, int type);
extern const char *fpu_get_name_from_index(cpu_family_t *cpu_family, int cpu, int c); extern const char *fpu_get_name_from_index(const cpu_family_t *cpu_family, int cpu, int c);
extern int fpu_get_type_from_index(cpu_family_t *cpu_family, int cpu, int c); extern int fpu_get_type_from_index(const cpu_family_t *cpu_family, int cpu, int c);
void cyrix_load_seg_descriptor(uint32_t addr, x86seg *seg); void cyrix_load_seg_descriptor(uint32_t addr, x86seg *seg);
void cyrix_write_seg_descriptor(uint32_t addr, x86seg *seg); void cyrix_write_seg_descriptor(uint32_t addr, x86seg *seg);

1180
src/cpu/cpu_table.c
View File

File diff suppressed because it is too large Load Diff