Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FAST486]

Browse source 
- Don't forget to push the error code when the exception handler is a task gate.
- Use SS0/ESP0, SS1/ESP1, or SS2/ESP2 for ring 0/1/2 code task CALLs.


svn path=/trunk/; revision=69420
This commit is contained in:
Aleksandar Andrejevic 2015-09-30 21:08:31 +00:00
parent 36196c1275
commit b1b7020854
1 changed files with 74 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -313,7 +313,13 @@ Fast486InterruptInternal(PFAST486_STATE State,
if (IdtEntry->Type == FAST486_TASK_GATE_SIGNATURE) if (IdtEntry->Type == FAST486_TASK_GATE_SIGNATURE)
{ {
/* Task call */ /* Task call */
return Fast486TaskSwitch(State, FAST486_TASK_CALL, IdtEntry->Selector); if (!Fast486TaskSwitch(State, FAST486_TASK_CALL, IdtEntry->Selector))
{
/* Exception occurred */
return FALSE;
}
goto Finish;
} }
/* Check if the interrupt handler is more privileged or if we're in V86 mode */ /* Check if the interrupt handler is more privileged or if we're in V86 mode */
@ -497,6 +503,8 @@ Fast486InterruptInternal(PFAST486_STATE State,
/* Push the instruction pointer */ /* Push the instruction pointer */
if (!Fast486StackPushInternal(State, GateSize, OldEip)) return FALSE; if (!Fast486StackPushInternal(State, GateSize, OldEip)) return FALSE;
Finish:
if (PushErrorCode) if (PushErrorCode)
{ {
/* Push the error code */ /* Push the error code */
@ -908,15 +916,45 @@ Fast486TaskSwitch(PFAST486_STATE State, FAST486_TASK_SWITCH_TYPE Type, USHORT Se
State->GeneralRegs[FAST486_REG_ECX].Long = NewTss.Ecx; State->GeneralRegs[FAST486_REG_ECX].Long = NewTss.Ecx;
State->GeneralRegs[FAST486_REG_EDX].Long = NewTss.Edx; State->GeneralRegs[FAST486_REG_EDX].Long = NewTss.Edx;
State->GeneralRegs[FAST486_REG_EBX].Long = NewTss.Ebx; State->GeneralRegs[FAST486_REG_EBX].Long = NewTss.Ebx;
State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp;
State->GeneralRegs[FAST486_REG_EBP].Long = NewTss.Ebp; State->GeneralRegs[FAST486_REG_EBP].Long = NewTss.Ebp;
State->GeneralRegs[FAST486_REG_ESI].Long = NewTss.Esi; State->GeneralRegs[FAST486_REG_ESI].Long = NewTss.Esi;
State->GeneralRegs[FAST486_REG_EDI].Long = NewTss.Edi; State->GeneralRegs[FAST486_REG_EDI].Long = NewTss.Edi;
NewEs = NewTss.Es; NewEs = NewTss.Es;
NewCs = NewTss.Cs; NewCs = NewTss.Cs;
NewSs = NewTss.Ss;
NewDs = NewTss.Ds; NewDs = NewTss.Ds;
NewLdtr = NewTss.Ldtr; NewLdtr = NewTss.Ldtr;
if (Type == FAST486_TASK_CALL && State->Cpl < 3)
{
switch (State->Cpl)
{
case 0:
{
State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp0;
NewSs = NewTss.Ss0;
break;
}
case 1:
{
State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp1;
NewSs = NewTss.Ss1;
break;
}
case 2:
{
State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp2;
NewSs = NewTss.Ss2;
break;
}
}
}
else
{
State->GeneralRegs[FAST486_REG_ESP].Long = NewTss.Esp;
NewSs = NewTss.Ss;
}
} }
else else
{ {
@ -926,15 +964,45 @@ Fast486TaskSwitch(PFAST486_STATE State, FAST486_TASK_SWITCH_TYPE Type, USHORT Se
State->GeneralRegs[FAST486_REG_ECX].LowWord = NewLegacyTss->Cx; State->GeneralRegs[FAST486_REG_ECX].LowWord = NewLegacyTss->Cx;
State->GeneralRegs[FAST486_REG_EDX].LowWord = NewLegacyTss->Dx; State->GeneralRegs[FAST486_REG_EDX].LowWord = NewLegacyTss->Dx;
State->GeneralRegs[FAST486_REG_EBX].LowWord = NewLegacyTss->Bx; State->GeneralRegs[FAST486_REG_EBX].LowWord = NewLegacyTss->Bx;
State->GeneralRegs[FAST486_REG_ESP].LowWord = NewLegacyTss->Sp;
State->GeneralRegs[FAST486_REG_EBP].LowWord = NewLegacyTss->Bp; State->GeneralRegs[FAST486_REG_EBP].LowWord = NewLegacyTss->Bp;
State->GeneralRegs[FAST486_REG_ESI].LowWord = NewLegacyTss->Si; State->GeneralRegs[FAST486_REG_ESI].LowWord = NewLegacyTss->Si;
State->GeneralRegs[FAST486_REG_EDI].LowWord = NewLegacyTss->Di; State->GeneralRegs[FAST486_REG_EDI].LowWord = NewLegacyTss->Di;
NewEs = NewLegacyTss->Es; NewEs = NewLegacyTss->Es;
NewCs = NewLegacyTss->Cs; NewCs = NewLegacyTss->Cs;
NewSs = NewLegacyTss->Ss;
NewDs = NewLegacyTss->Ds; NewDs = NewLegacyTss->Ds;
NewLdtr = NewLegacyTss->Ldtr; NewLdtr = NewLegacyTss->Ldtr;
if (Type == FAST486_TASK_CALL && State->Cpl < 3)
{
switch (State->Cpl)
{
case 0:
{
State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp0;
NewSs = NewLegacyTss->Ss0;
break;
}
case 1:
{
State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp1;
NewSs = NewLegacyTss->Ss1;
break;
}
case 2:
{
State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp2;
NewSs = NewLegacyTss->Ss2;
break;
}
}
}
else
{
State->GeneralRegs[FAST486_REG_ESP].Long = NewLegacyTss->Sp;
NewSs = NewLegacyTss->Ss;
}
} }
/* Set the NT flag if nesting */ /* Set the NT flag if nesting */