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

Some CPU fixes.

Browse Source
This commit is contained in:
OBattler
2023-11-06 06:07:43 +01:00
parent d797659c79
commit 09d2f7517c
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/cpu/cpu.c
View File

@@ -1816,12 +1816,13 @@ cpu_set_isa_speed(int speed)
{ {
if (speed) { if (speed) {
cpu_isa_speed = speed; cpu_isa_speed = speed;
pc_speed_changed();
} else if (cpu_busspeed >= 8000000) } else if (cpu_busspeed >= 8000000)
cpu_isa_speed = 8000000; cpu_isa_speed = 8000000;
else else
cpu_isa_speed = cpu_busspeed; cpu_isa_speed = cpu_busspeed;
pc_speed_changed();
cpu_log("cpu_set_isa_speed(%d) = %d\n", speed, cpu_isa_speed); cpu_log("cpu_set_isa_speed(%d) = %d\n", speed, cpu_isa_speed);
} }
@@ -2471,6 +2472,28 @@ cpu_ven_reset(void)
memset(&msr, 0, sizeof(msr)); memset(&msr, 0, sizeof(msr));
switch (cpu_s->cpu_type) { switch (cpu_s->cpu_type) {
case CPU_WINCHIP:
case CPU_WINCHIP2:
msr.fcr = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 19) | (1 << 21);
if (cpu_s->cpu_type == CPU_WINCHIP2)
msr.fcr |= (1 << 18) | (1 << 20);
break;
case CPU_P24T:
case CPU_PENTIUM:
case CPU_PENTIUMMMX:
msr.fcr = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 19) | (1 << 21);
break;
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
case CPU_Cx6x86:
case CPU_Cx6x86L:
case CPU_CxGX1:
case CPU_Cx6x86MX:
msr.fcr = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 19) | (1 << 21);
break;
#endif
case CPU_K6_2P: case CPU_K6_2P:
case CPU_K6_3P: case CPU_K6_3P:
case CPU_K6_3: case CPU_K6_3:
@@ -2484,12 +2507,19 @@ cpu_ven_reset(void)
#endif #endif
case CPU_K6: case CPU_K6:
msr.amd_efer = (cpu_s->cpu_type >= CPU_K6_2C) ? 2ULL : 0ULL; msr.amd_efer = (cpu_s->cpu_type >= CPU_K6_2C) ? 2ULL : 0ULL;
msr.fcr = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 19) | (1 << 21);
break; break;
case CPU_PENTIUMPRO: case CPU_PENTIUMPRO:
case CPU_PENTIUM2: case CPU_PENTIUM2:
case CPU_PENTIUM2D: case CPU_PENTIUM2D:
msr.mtrr_cap = 0x00000508ULL; msr.mtrr_cap = 0x00000508ULL;
msr.fcr = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 19) | (1 << 21);
break;
case CPU_CYRIX3S:
msr.fcr = (1 << 8) | (1 << 9) | (1 << 12) | (1 << 16) | (1 << 18) | (1 << 19) |
(1 << 20) | (1 << 21);
break; break;
} }
} }