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

[SOFT386]

Browse source 
Implement the RET instruction.


svn path=/branches/ntvdm/; revision=60229
This commit is contained in:
Aleksandar Andrejevic 2013-09-19 23:24:05 +00:00
parent d3a6556ea5
commit 1d3d2fc07a
2 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lib/soft386/opcodes.c
View file

@ -218,7 +218,7 @@ Soft386OpcodeHandlers[SOFT386_NUM_OPCODE_HANDLERS] =
Soft386OpcodeMovRegImm, Soft386OpcodeMovRegImm,
NULL, // TODO: OPCODE 0xC0 NOT SUPPORTED NULL, // TODO: OPCODE 0xC0 NOT SUPPORTED
NULL, // TODO: OPCODE 0xC1 NOT SUPPORTED NULL, // TODO: OPCODE 0xC1 NOT SUPPORTED
Soft386OpcodeRetImm, Soft386OpcodeRet,
Soft386OpcodeRet, Soft386OpcodeRet,
Soft386OpcodeLes, Soft386OpcodeLes,
Soft386OpcodeLds, Soft386OpcodeLds,
@ -4166,20 +4166,50 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf)
return FALSE; return FALSE;
} }
SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm)
{
// TODO: NOT IMPLEMENTED
UNIMPLEMENTED;
return FALSE;
}
SOFT386_OPCODE_HANDLER(Soft386OpcodeRet) SOFT386_OPCODE_HANDLER(Soft386OpcodeRet)
{ {
// TODO: NOT IMPLEMENTED ULONG ReturnAddress;
UNIMPLEMENTED; USHORT BytesToPop = 0;
BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size;
/* Make sure this is the right instruction */
ASSERT((Opcode & 0xFE) == 0xC2);
if (State->PrefixFlags & SOFT386_PREFIX_LOCK)
{
/* Invalid prefix */
Soft386Exception(State, SOFT386_EXCEPTION_UD);
return FALSE; return FALSE;
}
if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE)
{
/* The OPSIZE prefix toggles the size */
Size = !Size;
}
if (Opcode == 0xC2)
{
/* Fetch the number of bytes to pop after the return */
if (!Soft386FetchWord(State, &BytesToPop)) return FALSE;
}
/* Pop the return address */
if (!Soft386StackPop(State, &ReturnAddress)) return FALSE;
/* Return to the calling procedure, and if necessary, pop the parameters */
if (Size)
{
State->InstPtr.Long = ReturnAddress;
State->GeneralRegs[SOFT386_REG_ESP].Long += BytesToPop;
}
else
{
State->InstPtr.LowWord = LOWORD(ReturnAddress);
State->GeneralRegs[SOFT386_REG_ESP].LowWord += BytesToPop;
}
return TRUE;
} }
SOFT386_OPCODE_HANDLER(Soft386OpcodeLes) SOFT386_OPCODE_HANDLER(Soft386OpcodeLes)

1
lib/soft386/opcodes.h
View file

@ -115,7 +115,6 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodePushFlags);
SOFT386_OPCODE_HANDLER(Soft386OpcodePopFlags); SOFT386_OPCODE_HANDLER(Soft386OpcodePopFlags);
SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf); SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf);
SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf); SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf);
SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm);
SOFT386_OPCODE_HANDLER(Soft386OpcodeRet); SOFT386_OPCODE_HANDLER(Soft386OpcodeRet);
SOFT386_OPCODE_HANDLER(Soft386OpcodeLes); SOFT386_OPCODE_HANDLER(Soft386OpcodeLes);
SOFT386_OPCODE_HANDLER(Soft386OpcodeLds); SOFT386_OPCODE_HANDLER(Soft386OpcodeLds);