Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-05 13:54:42 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

i286 - some fixes from Carl (no whatsnew)

Browse Source
This commit is contained in:
Miodrag Milanovic 2011-05-22 15:47:04 +00:00
parent dbe84fd73d
commit e4ccc74ae3
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/emu/cpu/i86/instr286.c
View File

@ -337,6 +337,7 @@ static void i80286_code_descriptor(i80286_state *cpustate, UINT16 selector, UINT
} else { // systemdescriptor } else { // systemdescriptor
UINT16 gatedesc[3]={0,0,0}; UINT16 gatedesc[3]={0,0,0};
UINT16 gatesel = GATESEL(desc); UINT16 gatesel = GATESEL(desc);
if (!gate) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(selector)); // can't ret through gate
if (DPL(r) < PMAX(CPL,RPL(selector))) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(selector)); if (DPL(r) < PMAX(CPL,RPL(selector))) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(selector));
if (!PRES(r)) throw TRAP(SEG_NOT_PRESENT, IDXTBL(selector)); if (!PRES(r)) throw TRAP(SEG_NOT_PRESENT, IDXTBL(selector));
@ -381,8 +382,6 @@ static void i80286_code_descriptor(i80286_state *cpustate, UINT16 selector, UINT
case TASKGATE: case TASKGATE:
gatesel = GATESEL(gatedesc); gatesel = GATESEL(gatedesc);
if ((addr = i80286_selector_address(cpustate,gatesel)) == -1) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(gatesel)); if ((addr = i80286_selector_address(cpustate,gatesel)) == -1) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(gatesel));
gatedesc[0] = ReadWord(addr);
gatedesc[1] = ReadWord(addr+2);
gatedesc[2] = ReadWord(addr+4); gatedesc[2] = ReadWord(addr+4);
r = RIGHTS(gatedesc); r = RIGHTS(gatedesc);
if (SEGDESC(r) || (GATE(r) != TSSDESCIDLE)) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(gatesel)); if (SEGDESC(r) || (GATE(r) != TSSDESCIDLE)) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(gatesel));
@ -406,7 +405,7 @@ static void i80286_code_descriptor(i80286_state *cpustate, UINT16 selector, UINT
static void i80286_interrupt_descriptor(i80286_state *cpustate,UINT16 number, int hwint, int error) static void i80286_interrupt_descriptor(i80286_state *cpustate,UINT16 number, int hwint, int error)
{ {
UINT16 desc[3], gatedesc[3]={0,0,0}, gatesel, oldcs, oldip, oldflags; UINT16 desc[3], gatedesc[3]={0,0,0}, gatesel;
UINT8 r; UINT8 r;
UINT32 addr; UINT32 addr;
@ -425,14 +424,8 @@ static void i80286_interrupt_descriptor(i80286_state *cpustate,UINT16 number, in
switch (GATE(r)) { switch (GATE(r)) {
case TASKGATE: case TASKGATE:
oldcs = cpustate->sregs[CS];
oldip = cpustate->pc-cpustate->base[CS];
oldflags = CompressFlags();
gatesel = GATESEL(gatedesc); gatesel = GATESEL(gatedesc);
i80286_switch_task(cpustate, gatesel, 2); i80286_switch_task(cpustate, gatesel, 2);
PUSH(oldflags);
PUSH(oldcs);
PUSH(oldip);
if((hwint == 1) && (error != -1)) PUSH(error); if((hwint == 1) && (error != -1)) PUSH(error);
i80286_load_flags(cpustate, cpustate->flags, CPL); i80286_load_flags(cpustate, cpustate->flags, CPL);
break; break;