mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 09:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into pc98x1

Browse Source
This commit is contained in:
TC1995
2024-10-16 00:02:49 +02:00
parent bbb9ce0fe1 0a3f1e3279
commit 23a7e488f3
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpu/cpu.c
View File

@@ -2612,7 +2612,9 @@ cpu_ven_reset(void)
void
cpu_RDMSR(void)
{
switch (cpu_s->cpu_type) {
if (CPL)
x86gpf(NULL, 0);
else switch (cpu_s->cpu_type) {
case CPU_IBM386SLC:
case CPU_IBM486SLC:
case CPU_IBM486BL:
@@ -3467,7 +3469,9 @@ cpu_WRMSR(void)
cpu_log("WRMSR %08X %08X%08X\n", ECX, EDX, EAX);
switch (cpu_s->cpu_type) {
if (CPL)
x86gpf(NULL, 0);
else switch (cpu_s->cpu_type) {
case CPU_IBM386SLC:
case CPU_IBM486SLC:
case CPU_IBM486BL:

4
src/cpu/x86_ops_misc.h
View File

@@ -878,6 +878,10 @@ opINVD(uint32_t fetchdat)
static int
opWBINVD(uint32_t fetchdat)
{
if (CPL) {
x86gpf(NULL, 0);
return 1;
}
CLOCK_CYCLES(10000);
CPU_BLOCK_END();
return 0;