Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Corrected CPL on INT to conformant code segment.

Browse source
This commit is contained in:
TomW 2015-08-10 15:01:36 +01:00
commit 68546ea3cb
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/x86seg.c
View file

@ -1579,6 +1579,7 @@ void pmodeint(int num, int soft)
uint32_t newsp; uint32_t newsp;
uint16_t seg; uint16_t seg;
int stack_changed=0; int stack_changed=0;
int new_cpl;
// if (!num) pclog("Pmode int 0 at %04X(%06X):%08X\n",CS,cs,pc); // if (!num) pclog("Pmode int 0 at %04X(%06X):%08X\n",CS,cs,pc);
// pclog("Pmode int %02X %i %04X:%08X %04X:%08X %i\n",num,soft,CS,pc, SS, ESP, abrt); // pclog("Pmode int %02X %i %04X:%08X %04X:%08X %i\n",num,soft,CS,pc, SS, ESP, abrt);
@ -1649,6 +1650,7 @@ void pmodeint(int num, int soft)
return; return;
} }
seg=segdat[1]; seg=segdat[1];
new_cpl = seg & 3;
// pclog("Interrupt gate : %04X:%04X%04X\n",seg,segdat[3],segdat[0]); // pclog("Interrupt gate : %04X:%04X%04X\n",seg,segdat[3],segdat[0]);
addr=seg&~7; addr=seg&~7;
@ -1867,6 +1869,7 @@ void pmodeint(int num, int soft)
// if (soft) pclog("Pushwc PC %04X\n", pc); // if (soft) pclog("Pushwc PC %04X\n", pc);
PUSHW(pc); if (abrt) return; PUSHW(pc); if (abrt) return;
} }
new_cpl = CS & 3;
break; break;
default: default:
pclog("Int gate CS not code segment - %04X %04X %04X %04X\n",segdat2[0],segdat2[1],segdat2[2],segdat2[3]); pclog("Int gate CS not code segment - %04X %04X %04X %04X\n",segdat2[0],segdat2[1],segdat2[2],segdat2[3]);
@ -1874,7 +1877,8 @@ void pmodeint(int num, int soft)
return; return;
} }
do_seg_load(&_cs, segdat2); do_seg_load(&_cs, segdat2);
CS=(seg&~3)|CPL; CS = (seg & ~3) | new_cpl;
_cs.access = (_cs.access & ~(3 << 5)) | (new_cpl << 5);
// pclog("New CS = %04X\n",CS); // pclog("New CS = %04X\n",CS);
if (CPL==3 && oldcpl!=3) flushmmucache_cr3(); if (CPL==3 && oldcpl!=3) flushmmucache_cr3();
if (type>0x800) pc=segdat[0]|(segdat[3]<<16); if (type>0x800) pc=segdat[0]|(segdat[3]<<16);