Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-04 16:36:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FAST486]

Browse source 
XADD: Fix the order of operations.
POP <modrm>: The value must be popped from the stack before parsing the
Mod-Reg-R/M, because of the "POP DWORD [ESP]" case.


svn path=/branches/ntvdm/; revision=60984
This commit is contained in:
Aleksandar Andrejevic 2013-11-13 22:33:37 +00:00
parent 53dfb7da48
commit cd496c8e21
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fast486/common.inl
View file

@ -326,7 +326,7 @@ Fast486StackPop(PFAST486_STATE State,
BOOLEAN Size = State->SegmentRegs[FAST486_REG_SS].Size;
/* The OPSIZE prefix toggles the size */
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) Size = !Size;
TOGGLE_OPSIZE(Size);
if (Size)
{

16
lib/fast486/extraops.c
View file

@ -2032,15 +2032,15 @@ FAST486_OPCODE_HANDLER(Fast486ExtOpcodeXadd)
State->Flags.Sf = ((Result & SIGN_FLAG_LONG) != 0);
State->Flags.Pf = Fast486CalculateParity(Result);
/* Write the sum to the destination */
if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, FALSE, Result))
/* Write the old value of the destination to the source */
if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, TRUE, Destination))
{
/* Exception occurred */
return FALSE;
}
/* Write the old value of the destination to the source */
if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, TRUE, Destination))
/* Write the sum to the destination */
if (!Fast486WriteModrmDwordOperands(State, &ModRegRm, FALSE, Result))
{
/* Exception occurred */
return FALSE;
@ -2071,15 +2071,15 @@ FAST486_OPCODE_HANDLER(Fast486ExtOpcodeXadd)
State->Flags.Sf = ((Result & SIGN_FLAG_WORD) != 0);
State->Flags.Pf = Fast486CalculateParity(Result);
/* Write the sum to the destination */
if (!Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, Result))
/* Write the old value of the destination to the source */
if (!Fast486WriteModrmWordOperands(State, &ModRegRm, TRUE, Destination))
{
/* Exception occurred */
return FALSE;
}
/* Write the old value of the destination to the source */
if (!Fast486WriteModrmWordOperands(State, &ModRegRm, TRUE, Destination))
/* Write the sum to the destination */
if (!Fast486WriteModrmWordOperands(State, &ModRegRm, FALSE, Result))
{
/* Exception occurred */
return FALSE;

19
lib/fast486/opgroups.c
View file

@ -486,12 +486,22 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroup8F)
TOGGLE_OPSIZE(OperandSize);
TOGGLE_ADSIZE(AddressSize);
if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm))
/* Pop a value from the stack - this must be done first */
if (!Fast486StackPop(State, &Value))
{
/* Exception occurred */
return FALSE;
}
if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm))
{
/* Exception occurred - restore SP */
if (OperandSize) State->GeneralRegs[FAST486_REG_ESP].Long += sizeof(ULONG);
else State->GeneralRegs[FAST486_REG_ESP].LowWord += sizeof(USHORT);
return FALSE;
}
if (ModRegRm.Register != 0)
{
/* Invalid */
@ -499,13 +509,6 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroup8F)
return FALSE;
}
/* Pop a value from the stack */
if (!Fast486StackPop(State, &Value))
{
/* Exception occurred */
return FALSE;
}
if (OperandSize)
{
return Fast486WriteModrmDwordOperands(State,