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-12-13 14:03:24 +01:00
parent badc9ed975 6710b968c0
commit 606b0ddc11
126 changed files with 8491 additions and 2184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/cpu.c
View File

@@ -2612,7 +2612,7 @@ cpu_ven_reset(void)
void
cpu_RDMSR(void)
{
if (CPL)
if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1))
x86gpf(NULL, 0);
else switch (cpu_s->cpu_type) {
case CPU_IBM386SLC:
@@ -3469,7 +3469,7 @@ cpu_WRMSR(void)
cpu_log("WRMSR %08X %08X%08X\n", ECX, EDX, EAX);
if (CPL)
if ((CPL || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1))
x86gpf(NULL, 0);
else switch (cpu_s->cpu_type) {
case CPU_IBM386SLC: