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

[FAST486]

Browse source 
Fix ENTER and LEAVE in the same way I fixed PUSH and POP in the previous 2 commits.


svn path=/trunk/; revision=67322
This commit is contained in:
Aleksandar Andrejevic 2015-04-20 02:22:56 +00:00
parent 399547ef48
commit 53abec3cb5
1 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4405,16 +4405,24 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeEnter)
if (NestingLevel > 0) Fast486StackPush(State, FramePointer.Long); if (NestingLevel > 0) Fast486StackPush(State, FramePointer.Long);
/* Set EBP to the frame pointer */ /* Set EBP to the frame pointer */
State->GeneralRegs[FAST486_REG_EBP] = FramePointer; if (Size) State->GeneralRegs[FAST486_REG_EBP].Long = FramePointer.Long;
else State->GeneralRegs[FAST486_REG_EBP].LowWord = FramePointer.LowWord;
/* Reserve space for the frame */ /* Reserve space for the frame */
if (Size) State->GeneralRegs[FAST486_REG_ESP].Long -= (ULONG)FrameSize; if (State->SegmentRegs[FAST486_REG_SS].Size)
else State->GeneralRegs[FAST486_REG_ESP].LowWord -= FrameSize; {
State->GeneralRegs[FAST486_REG_ESP].Long -= (ULONG)FrameSize;
}
else
{
State->GeneralRegs[FAST486_REG_ESP].LowWord -= FrameSize;
}
} }
FAST486_OPCODE_HANDLER(Fast486OpcodeLeave) FAST486_OPCODE_HANDLER(Fast486OpcodeLeave)
{ {
BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size;
ULONG Value;
/* Make sure this is the right instruction */ /* Make sure this is the right instruction */
ASSERT(Opcode == 0xC9); ASSERT(Opcode == 0xC9);
@ -4422,26 +4430,22 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeLeave)
NO_LOCK_PREFIX(); NO_LOCK_PREFIX();
TOGGLE_OPSIZE(Size); TOGGLE_OPSIZE(Size);
if (Size) if (State->SegmentRegs[FAST486_REG_SS].Size)
{ {
/* Set the stack pointer (ESP) to the base pointer (EBP) */ /* Set the stack pointer (ESP) to the base pointer (EBP) */
State->GeneralRegs[FAST486_REG_ESP].Long = State->GeneralRegs[FAST486_REG_EBP].Long; State->GeneralRegs[FAST486_REG_ESP].Long = State->GeneralRegs[FAST486_REG_EBP].Long;
/* Pop the saved base pointer from the stack */
Fast486StackPop(State, &State->GeneralRegs[FAST486_REG_EBP].Long);
} }
else else
{ {
ULONG Value;
/* Set the stack pointer (SP) to the base pointer (BP) */ /* Set the stack pointer (SP) to the base pointer (BP) */
State->GeneralRegs[FAST486_REG_ESP].LowWord = State->GeneralRegs[FAST486_REG_EBP].LowWord; State->GeneralRegs[FAST486_REG_ESP].LowWord = State->GeneralRegs[FAST486_REG_EBP].LowWord;
}
/* Pop the saved base pointer from the stack */ /* Pop the saved base pointer from the stack */
if (Fast486StackPop(State, &Value)) if (Fast486StackPop(State, &Value))
{ {
State->GeneralRegs[FAST486_REG_EBP].LowWord = LOWORD(Value); if (Size) State->GeneralRegs[FAST486_REG_EBP].Long = Value;
} else State->GeneralRegs[FAST486_REG_EBP].LowWord = LOWORD(Value);
} }
} }