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 
Fix the order of operatins in RETF.


svn path=/trunk/; revision=67598
This commit is contained in:
Aleksandar Andrejevic 2015-05-08 03:43:31 +00:00
parent 7dbe9e8e67
commit 93b0b74399
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
reactos/lib/fast486/opcodes.c
View file

@ -4433,6 +4433,9 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeRetFar)
ULONG Offset = 0;
USHORT BytesToPop = 0;
BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size;
ULONG StackPtr;
ULONG StackSel;
UCHAR OldCpl = Fast486GetCurrentPrivLevel(State);
/* Make sure this is the right instruction */
ASSERT((Opcode & 0xFE) == 0xCA);
@ -4460,20 +4463,18 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeRetFar)
return;
}
/* Load the new CS */
if (!Fast486LoadSegment(State, FAST486_REG_CS, Segment))
/* Pop the parameters */
if (State->SegmentRegs[FAST486_REG_SS].Size)
{
/* Exception occurred */
return;
State->GeneralRegs[FAST486_REG_ESP].Long += BytesToPop;
}
else
{
State->GeneralRegs[FAST486_REG_ESP].LowWord += BytesToPop;
}
if ((State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) && !State->Flags.Vm)
{
UINT i;
UINT OldCpl = Fast486GetCurrentPrivLevel(State);
ULONG StackPtr;
ULONG StackSel;
if (GET_SEGMENT_RPL(Segment) > OldCpl)
{
/* Pop ESP */
@ -4490,6 +4491,22 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeRetFar)
return;
}
}
}
/* Load the new CS */
if (!Fast486LoadSegment(State, FAST486_REG_CS, Segment))
{
/* Exception occurred */
return;
}
/* Load new (E)IP */
if (Size) State->InstPtr.Long = Offset;
else State->InstPtr.LowWord = LOWORD(Offset);
if ((State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) && !State->Flags.Vm)
{
UINT i;
/* Update the CPL */
State->Cpl = GET_SEGMENT_RPL(Segment);
@ -4523,18 +4540,6 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeRetFar)
}
}
}
/* Load new (E)IP, and if necessary, pop the parameters */
if (Size)
{
State->InstPtr.Long = Offset;
State->GeneralRegs[FAST486_REG_ESP].Long += BytesToPop;
}
else
{
State->InstPtr.LowWord = LOWORD(Offset);
State->GeneralRegs[FAST486_REG_ESP].LowWord += BytesToPop;
}
}
FAST486_OPCODE_HANDLER(Fast486OpcodeInt)