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

Merge pull request #3811 from jgilje/cpl_override_pmodeiret_nt

Browse Source 
add cpl_override in pmodeiret() when cpu_state.flags has NT_FLAG
This commit is contained in:
Miran Grča
2023-11-08 06:31:00 +01:00
committed by GitHub
parent 9d61b3a262 a436c12de3
commit dde4c1475f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/x86seg.c
View File

@@ -1796,7 +1796,9 @@ pmodeiret(int is32)
} }
if (cpu_state.flags & NT_FLAG) { if (cpu_state.flags & NT_FLAG) {
cpl_override = 1;
seg = readmemw(tr.base, 0); seg = readmemw(tr.base, 0);
cpl_override = 0;
addr = seg & 0xfff8; addr = seg & 0xfff8;
if (seg & 0x0004) { if (seg & 0x0004) {
x86seg_log("TS LDT %04X %04X IRET\n", seg, gdt.limit); x86seg_log("TS LDT %04X %04X IRET\n", seg, gdt.limit);
@@ -1809,8 +1811,8 @@ pmodeiret(int is32)
} }
addr += gdt.base; addr += gdt.base;
} }
cpl_override = 1;
read_descriptor(addr, segdat, segdat32, 1); read_descriptor(addr, segdat, segdat32, 1);
cpl_override = 1;
op_taskswitch286(seg, segdat, segdat[2] & 0x0800); op_taskswitch286(seg, segdat, segdat[2] & 0x0800);
cpl_override = 0; cpl_override = 0;
return; return;