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

NEC V20/V30: Cycle count fixes (#1)

Browse Source 
* Correct the names of NEC V20/V30 in Settings

Make NEC V30 have correct CPU types

* Treat NEC V20 as a Intel 8088 variant
This commit is contained in:
Cacodemon345
2022-09-03 15:55:53 +06:00
committed by GitHub
parent d4d9c4e725
commit 028cbe7b4e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/cpu.c
View File

@@ -373,7 +373,7 @@ cpu_set(void)
unmask_a20_in_smm = 0; unmask_a20_in_smm = 0;
CPUID = cpu_s->cpuid_model; CPUID = cpu_s->cpuid_model;
is8086 = (cpu_s->cpu_type > CPU_8088); is8086 = (cpu_s->cpu_type > CPU_8088) && !(cpu_s->cpu_type == CPU_V20);
is_nec = (cpu_s->cpu_type == CPU_V20) || (cpu_s->cpu_type == CPU_V30); is_nec = (cpu_s->cpu_type == CPU_V20) || (cpu_s->cpu_type == CPU_V30);
is186 = (cpu_s->cpu_type == CPU_186) || (cpu_s->cpu_type == CPU_V20) || (cpu_s->cpu_type == CPU_V30); is186 = (cpu_s->cpu_type == CPU_186) || (cpu_s->cpu_type == CPU_V20) || (cpu_s->cpu_type == CPU_V30);
is286 = (cpu_s->cpu_type >= CPU_286); is286 = (cpu_s->cpu_type >= CPU_286);

14
src/cpu/cpu_table.c
View File

@@ -137,7 +137,7 @@ const cpu_family_t cpu_families[] = {
}, { }, {
.package = CPU_PKG_8088, .package = CPU_PKG_8088,
.manufacturer = "NEC", .manufacturer = "NEC",
.name = "NEC V20", .name = "V20",
.internal_name = "necv20", .internal_name = "necv20",
.cpus = (const CPU[]) { .cpus = (const CPU[]) {
{"5", CPU_V20, fpus_8088, 5000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1}, {"5", CPU_V20, fpus_8088, 5000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
@@ -167,14 +167,14 @@ const cpu_family_t cpu_families[] = {
}, { }, {
.package = CPU_PKG_186, .package = CPU_PKG_186,
.manufacturer = "NEC", .manufacturer = "NEC",
.name = "NEC V30", .name = "V30",
.internal_name = "necv30", .internal_name = "necv30",
.cpus = (const CPU[]) { .cpus = (const CPU[]) {
{"5", CPU_V20, fpus_80186, 5000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1}, {"5", CPU_V30, fpus_80186, 5000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
{"8", CPU_V20, fpus_80186, 8000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1}, {"8", CPU_V30, fpus_80186, 8000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
{"10", CPU_V20, fpus_80186, 10000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1}, {"10", CPU_V30, fpus_80186, 10000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
{"12", CPU_V20, fpus_80186, 12000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1}, {"12", CPU_V30, fpus_80186, 12000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 1},
{"16", CPU_V20, fpus_80186, 16000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 2}, {"16", CPU_V30, fpus_80186, 16000000, 1, 5000, 0, 0, 0, 0, 0,0,0,0, 2},
{"", 0} {"", 0}
} }
}, { }, {