Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 03:48:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FAST486]

Browse source 
Support legacy (286) Task State Segments in Fast486InterruptInternal and Fast486CallGate.


svn path=/trunk/; revision=67593
This commit is contained in:
Aleksandar Andrejevic 2015-05-07 13:38:29 +00:00
parent 26ba3ae4f6
commit e37ae6f6bd
1 changed files with 75 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -315,12 +315,16 @@ Fast486InterruptInternal(PFAST486_STATE State,
if ((OldCpl > GET_SEGMENT_RPL(IdtEntry->Selector)) || State->Flags.Vm) if ((OldCpl > GET_SEGMENT_RPL(IdtEntry->Selector)) || State->Flags.Vm)
{ {
FAST486_TSS Tss; FAST486_TSS Tss;
PFAST486_LEGACY_TSS LegacyTss = (PFAST486_LEGACY_TSS)&Tss;
USHORT NewSs;
ULONG NewEsp;
/* Read the TSS */ /* Read the TSS */
if (!Fast486ReadLinearMemory(State, if (!Fast486ReadLinearMemory(State,
State->TaskReg.Base, State->TaskReg.Base,
&Tss, &Tss,
sizeof(Tss))) State->TaskReg.Limit >= sizeof(FAST486_TSS)
? sizeof(FAST486_TSS) : sizeof(FAST486_LEGACY_TSS)))
{ {
/* Exception occurred */ /* Exception occurred */
return FALSE; return FALSE;
@ -334,36 +338,48 @@ Fast486InterruptInternal(PFAST486_STATE State,
{ {
case 0: case 0:
{ {
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0)) if (State->TaskReg.Limit >= sizeof(FAST486_TSS))
{ {
/* Exception occurred */ NewSs = Tss.Ss0;
return FALSE; NewEsp = Tss.Esp0;
}
else
{
NewSs = LegacyTss->Ss0;
NewEsp = LegacyTss->Sp0;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0;
break; break;
} }
case 1: case 1:
{ {
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1)) if (State->TaskReg.Limit >= sizeof(FAST486_TSS))
{ {
/* Exception occurred */ NewSs = Tss.Ss1;
return FALSE; NewEsp = Tss.Esp1;
}
else
{
NewSs = LegacyTss->Ss1;
NewEsp = LegacyTss->Sp1;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1;
break; break;
} }
case 2: case 2:
{ {
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2)) if (State->TaskReg.Limit >= sizeof(FAST486_TSS))
{ {
/* Exception occurred */ NewSs = Tss.Ss2;
return FALSE; NewEsp = Tss.Esp2;
}
else
{
NewSs = LegacyTss->Ss2;
NewEsp = LegacyTss->Sp2;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2;
break; break;
} }
@ -374,6 +390,14 @@ Fast486InterruptInternal(PFAST486_STATE State,
ASSERT(FALSE); ASSERT(FALSE);
} }
} }
if (!Fast486LoadSegment(State, FAST486_REG_SS, NewSs))
{
/* Exception occurred */
return FALSE;
}
State->GeneralRegs[FAST486_REG_ESP].Long = NewEsp;
} }
/* Load new CS */ /* Load new CS */
@ -935,6 +959,7 @@ Fast486CallGate(PFAST486_STATE State,
FAST486_GDT_ENTRY NewCodeSegment; FAST486_GDT_ENTRY NewCodeSegment;
BOOLEAN GateSize = (Gate->Type == FAST486_CALL_GATE_SIGNATURE); BOOLEAN GateSize = (Gate->Type == FAST486_CALL_GATE_SIGNATURE);
FAST486_TSS Tss; FAST486_TSS Tss;
PFAST486_LEGACY_TSS LegacyTss = (PFAST486_LEGACY_TSS)&Tss;
USHORT OldCs = State->SegmentRegs[FAST486_REG_CS].Selector; USHORT OldCs = State->SegmentRegs[FAST486_REG_CS].Selector;
ULONG OldEip = State->InstPtr.Long; ULONG OldEip = State->InstPtr.Long;
USHORT OldCpl = State->Cpl; USHORT OldCpl = State->Cpl;
@ -984,11 +1009,15 @@ Fast486CallGate(PFAST486_STATE State,
{ {
if (Call) if (Call)
{ {
USHORT NewSs;
ULONG NewEsp;
/* Read the TSS */ /* Read the TSS */
if (!Fast486ReadLinearMemory(State, if (!Fast486ReadLinearMemory(State,
State->TaskReg.Base, State->TaskReg.Base,
&Tss, &Tss,
sizeof(Tss))) State->TaskReg.Limit >= sizeof(FAST486_TSS)
? sizeof(FAST486_TSS) : sizeof(FAST486_LEGACY_TSS)))
{ {
/* Exception occurred */ /* Exception occurred */
return FALSE; return FALSE;
@ -1002,36 +1031,48 @@ Fast486CallGate(PFAST486_STATE State,
{ {
case 0: case 0:
{ {
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0)) if (State->TaskReg.Limit >= sizeof(FAST486_TSS))
{ {
/* Exception occurred */ NewSs = Tss.Ss0;
return FALSE; NewEsp = Tss.Esp0;
}
else
{
NewSs = LegacyTss->Ss0;
NewEsp = LegacyTss->Sp0;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0;
break; break;
} }
case 1: case 1:
{ {
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1)) if (State->TaskReg.Limit >= sizeof(FAST486_TSS))
{ {
/* Exception occurred */ NewSs = Tss.Ss1;
return FALSE; NewEsp = Tss.Esp1;
}
else
{
NewSs = LegacyTss->Ss1;
NewEsp = LegacyTss->Sp1;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1;
break; break;
} }
case 2: case 2:
{ {
if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2)) if (State->TaskReg.Limit >= sizeof(FAST486_TSS))
{ {
/* Exception occurred */ NewSs = Tss.Ss2;
return FALSE; NewEsp = Tss.Esp2;
}
else
{
NewSs = LegacyTss->Ss2;
NewEsp = LegacyTss->Sp2;
} }
State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2;
break; break;
} }
@ -1042,6 +1083,14 @@ Fast486CallGate(PFAST486_STATE State,
ASSERT(FALSE); ASSERT(FALSE);
} }
} }
if (!Fast486LoadSegment(State, FAST486_REG_SS, NewSs))
{
/* Exception occurred */
return FALSE;
}
State->GeneralRegs[FAST486_REG_ESP].Long = NewEsp;
} }
else if (!NewCodeSegment.DirConf) else if (!NewCodeSegment.DirConf)
{ {