Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FAST486]

Browse source 
Save and restore the prefix flags in Fast486InterruptInternal instead of hacking around this
everywhere else.


svn path=/trunk/; revision=64668
This commit is contained in:
Aleksandar Andrejevic 2014-10-11 14:03:17 +00:00
parent f8931b8774
commit 0b60516799
2 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/lib/fast486/common.c
View file

@ -168,6 +168,8 @@ Fast486InterruptInternal(PFAST486_STATE State,
{ {
BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32) BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32)
|| (GateType == FAST486_IDT_TRAP_GATE_32); || (GateType == FAST486_IDT_TRAP_GATE_32);
BOOLEAN Success = FALSE;
ULONG OldPrefixFlags = State->PrefixFlags;
/* Check for protected mode */ /* Check for protected mode */
if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE)
@ -195,7 +197,7 @@ Fast486InterruptInternal(PFAST486_STATE State,
sizeof(Tss))) sizeof(Tss)))
{ {
/* Exception occurred */ /* Exception occurred */
return FALSE; goto Cleanup;
} }
/* Check the new (higher) privilege level */ /* Check the new (higher) privilege level */
@ -206,7 +208,7 @@ Fast486InterruptInternal(PFAST486_STATE State,
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0)) if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0))
{ {
/* Exception occurred */ /* Exception occurred */
return FALSE; goto Cleanup;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0; State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0;
@ -218,7 +220,7 @@ Fast486InterruptInternal(PFAST486_STATE State,
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1)) if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1))
{ {
/* Exception occurred */ /* Exception occurred */
return FALSE; goto Cleanup;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1; State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1;
@ -230,7 +232,7 @@ Fast486InterruptInternal(PFAST486_STATE State,
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2)) if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2))
{ {
/* Exception occurred */ /* Exception occurred */
return FALSE; goto Cleanup;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2; State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2;
@ -245,10 +247,10 @@ Fast486InterruptInternal(PFAST486_STATE State,
} }
/* Push SS selector */ /* Push SS selector */
if (!Fast486StackPush(State, OldSs)) return FALSE; if (!Fast486StackPush(State, OldSs)) goto Cleanup;
/* Push stack pointer */ /* Push stack pointer */
if (!Fast486StackPush(State, OldEsp)) return FALSE; if (!Fast486StackPush(State, OldEsp)) goto Cleanup;
} }
} }
else else
@ -261,13 +263,13 @@ Fast486InterruptInternal(PFAST486_STATE State,
} }
/* Push EFLAGS */ /* Push EFLAGS */
if (!Fast486StackPush(State, State->Flags.Long)) return FALSE; if (!Fast486StackPush(State, State->Flags.Long)) goto Cleanup;
/* Push CS selector */ /* Push CS selector */
if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_CS].Selector)) return FALSE; if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_CS].Selector)) goto Cleanup;
/* Push the instruction pointer */ /* Push the instruction pointer */
if (!Fast486StackPush(State, State->InstPtr.Long)) return FALSE; if (!Fast486StackPush(State, State->InstPtr.Long)) goto Cleanup;
if ((GateType == FAST486_IDT_INT_GATE) || (GateType == FAST486_IDT_INT_GATE_32)) if ((GateType == FAST486_IDT_INT_GATE) || (GateType == FAST486_IDT_INT_GATE_32))
{ {
@ -279,7 +281,7 @@ Fast486InterruptInternal(PFAST486_STATE State,
if (!Fast486LoadSegment(State, FAST486_REG_CS, SegmentSelector)) if (!Fast486LoadSegment(State, FAST486_REG_CS, SegmentSelector))
{ {
/* An exception occurred during the jump */ /* An exception occurred during the jump */
return FALSE; goto Cleanup;
} }
if (GateSize) if (GateSize)
@ -293,7 +295,13 @@ Fast486InterruptInternal(PFAST486_STATE State,
State->InstPtr.LowWord = LOWORD(Offset); State->InstPtr.LowWord = LOWORD(Offset);
} }
return TRUE; Success = TRUE;
Cleanup:
/* Restore the prefix flags */
State->PrefixFlags = OldPrefixFlags;
return Success;
} }
VOID VOID

3
reactos/lib/fast486/fast486.c
View file

@ -103,9 +103,6 @@ Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command)
IdtEntry.Selector, IdtEntry.Selector,
MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh),
IdtEntry.Type); IdtEntry.Type);
/* Restore the prefix flags, which would be set to OPSIZE for 32-bit real mode */
State->PrefixFlags = 0;
} }
/* Clear the interrupt status */ /* Clear the interrupt status */