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

Separate Pentium and Cx6x86 MSR handling

Browse Source
This commit is contained in:
Alexander Babikov
2024-01-26 22:06:05 +05:00
parent a1540eee92
commit 37cf0b6845
1 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/cpu/cpu.c
View File

@@ -2782,14 +2782,7 @@ amd_k_invalid_rdmsr:
case CPU_P24T: case CPU_P24T:
case CPU_PENTIUM: case CPU_PENTIUM:
case CPU_PENTIUMMMX: case CPU_PENTIUMMMX:
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86) EAX = EDX = 0;
case CPU_Cx6x86:
case CPU_Cx6x86L:
case CPU_CxGX1:
case CPU_Cx6x86MX:
if (cpu_s->cpu_type < CPU_Cx6x86)
#endif
EAX = EDX = 0;
switch (ECX) { switch (ECX) {
case 0x00: case 0x00:
case 0x01: case 0x01:
@@ -2802,6 +2795,24 @@ amd_k_invalid_rdmsr:
cpu_log("RDMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX); cpu_log("RDMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
break; break;
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
case CPU_Cx6x86:
case CPU_Cx6x86L:
case CPU_CxGX1:
case CPU_Cx6x86MX:
switch (ECX) {
case 0x00:
case 0x01:
break;
case 0x10:
EAX = tsc & 0xffffffff;
EDX = tsc >> 32;
break;
}
cpu_log("RDMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
break;
#endif
case CPU_PENTIUMPRO: case CPU_PENTIUMPRO:
case CPU_PENTIUM2: case CPU_PENTIUM2:
case CPU_PENTIUM2D: case CPU_PENTIUM2D:
@@ -3276,12 +3287,6 @@ amd_k_invalid_wrmsr:
case CPU_P24T: case CPU_P24T:
case CPU_PENTIUM: case CPU_PENTIUM:
case CPU_PENTIUMMMX: case CPU_PENTIUMMMX:
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
case CPU_Cx6x86:
case CPU_Cx6x86L:
case CPU_CxGX1:
case CPU_Cx6x86MX:
#endif
cpu_log("WRMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX); cpu_log("WRMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
switch (ECX) { switch (ECX) {
case 0x00: case 0x00:
@@ -3291,18 +3296,29 @@ amd_k_invalid_wrmsr:
tsc = EAX | ((uint64_t) EDX << 32); tsc = EAX | ((uint64_t) EDX << 32);
break; break;
case 0x8b: case 0x8b:
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86) cpu_log("WRMSR: Invalid MSR: 0x8B\n");
if (cpu_s->cpu_type < CPU_Cx6x86) { x86gpf(NULL, 0); /* Needed for Vista to correctly break on Pentium */
#endif
cpu_log("WRMSR: Invalid MSR: 0x8B\n");
x86gpf(NULL, 0); /* Needed for Vista to correctly break on Pentium */
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
}
#endif
break; break;
} }
break; break;
#if defined(DEV_BRANCH) && defined(USE_CYRIX_6X86)
case CPU_Cx6x86:
case CPU_Cx6x86L:
case CPU_CxGX1:
case CPU_Cx6x86MX:
cpu_log("WRMSR: ECX = %08X, val = %08X%08X\n", ECX, EDX, EAX);
switch (ECX) {
case 0x00:
case 0x01:
break;
case 0x10:
tsc = EAX | ((uint64_t) EDX << 32);
break;
}
break;
#endif
case CPU_PENTIUMPRO: case CPU_PENTIUMPRO:
case CPU_PENTIUM2: case CPU_PENTIUM2:
case CPU_PENTIUM2D: case CPU_PENTIUM2D: