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

Removed the VM_FLAG access from DRx access again.

Browse Source
This commit is contained in:
OBattler
2024-05-25 17:24:43 +02:00
parent 44a6e7c1b4
commit 38557b33dc
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpu/x86_ops_mov_ctrl.h
View File

@@ -82,7 +82,7 @@ opMOV_r_CRx_a32(uint32_t fetchdat)
static int static int
opMOV_r_DRx_a16(uint32_t fetchdat) opMOV_r_DRx_a16(uint32_t fetchdat)
{ {
if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) { if ((CPL > 0) && (cr0 & 1)) {
x86gpf(NULL, 0); x86gpf(NULL, 0);
return 1; return 1;
} }
@@ -126,7 +126,7 @@ opMOV_r_DRx_a16(uint32_t fetchdat)
static int static int
opMOV_r_DRx_a32(uint32_t fetchdat) opMOV_r_DRx_a32(uint32_t fetchdat)
{ {
if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) { if ((CPL > 0) && (cr0 & 1)) {
x86gpf(NULL, 0); x86gpf(NULL, 0);
return 1; return 1;
} }
@@ -286,7 +286,7 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
static int static int
opMOV_DRx_r_a16(uint32_t fetchdat) opMOV_DRx_r_a16(uint32_t fetchdat)
{ {
if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) { if ((CPL > 0) && (cr0 & 1)) {
x86gpf(NULL, 0); x86gpf(NULL, 0);
return 1; return 1;
} }
@@ -334,7 +334,7 @@ opMOV_DRx_r_a16(uint32_t fetchdat)
static int static int
opMOV_DRx_r_a32(uint32_t fetchdat) opMOV_DRx_r_a32(uint32_t fetchdat)
{ {
if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) { if ((CPL > 0) && (cr0 & 1)) {
x86gpf(NULL, 0); x86gpf(NULL, 0);
return 1; return 1;
} }

8
src/cpu/x86_ops_mov_ctrl_2386.h
View File

@@ -82,7 +82,7 @@ opMOV_r_CRx_a32(uint32_t fetchdat)
static int static int
opMOV_r_DRx_a16(uint32_t fetchdat) opMOV_r_DRx_a16(uint32_t fetchdat)
{ {
if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) { if ((CPL > 0) && (cr0 & 1)) {
x86gpf(NULL, 0); x86gpf(NULL, 0);
return 1; return 1;
} }
@@ -124,7 +124,7 @@ opMOV_r_DRx_a16(uint32_t fetchdat)
static int static int
opMOV_r_DRx_a32(uint32_t fetchdat) opMOV_r_DRx_a32(uint32_t fetchdat)
{ {
if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) { if ((CPL > 0) && (cr0 & 1)) {
x86gpf(NULL, 0); x86gpf(NULL, 0);
return 1; return 1;
} }
@@ -282,7 +282,7 @@ opMOV_CRx_r_a32(uint32_t fetchdat)
static int static int
opMOV_DRx_r_a16(uint32_t fetchdat) opMOV_DRx_r_a16(uint32_t fetchdat)
{ {
if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) { if ((CPL > 0) && (cr0 & 1)) {
x86gpf(NULL, 0); x86gpf(NULL, 0);
return 1; return 1;
} }
@@ -325,7 +325,7 @@ opMOV_DRx_r_a16(uint32_t fetchdat)
static int static int
opMOV_DRx_r_a32(uint32_t fetchdat) opMOV_DRx_r_a32(uint32_t fetchdat)
{ {
if (((CPL > 0) || (cpu_state.eflags & VM_FLAG)) && (cr0 & 1)) { if ((CPL > 0) && (cr0 & 1)) {
x86gpf(NULL, 0); x86gpf(NULL, 0);
return 1; return 1;
} }