Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-15 13:45:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FAST486]

Browse source 
In the string functions, use ADSIZE and not OPSIZE.
In SCAS and CMPS, fix the "(1 << 32) - 1" bug.


svn path=/branches/ntvdm/; revision=61067
This commit is contained in:
Aleksandar Andrejevic 2013-11-22 00:46:28 +00:00
parent 9c999826e1
commit c0d571c92a
1 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
lib/fast486/opcodes.c
View file

@ -5437,7 +5437,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovs)
if (State->PrefixFlags & FAST486_PREFIX_REP) if (State->PrefixFlags & FAST486_PREFIX_REP)
{ {
UCHAR Block[STRING_BLOCK_SIZE]; UCHAR Block[STRING_BLOCK_SIZE];
ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long
: State->GeneralRegs[FAST486_REG_ECX].LowWord; : State->GeneralRegs[FAST486_REG_ECX].LowWord;
/* Clear the memory block */ /* Clear the memory block */
@ -5488,7 +5488,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovs)
Processed * DataSize)) Processed * DataSize))
{ {
/* Set ECX */ /* Set ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count);
/* Exception occurred */ /* Exception occurred */
@ -5504,7 +5504,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovs)
Processed * DataSize)) Processed * DataSize))
{ {
/* Set ECX */ /* Set ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count);
/* Exception occurred */ /* Exception occurred */
@ -5531,7 +5531,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovs)
} }
/* Clear ECX */ /* Clear ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0;
} }
else else
@ -5562,7 +5562,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovs)
} }
/* Increment/decrement ESI and EDI */ /* Increment/decrement ESI and EDI */
if (OperandSize) if (AddressSize)
{ {
if (!State->Flags.Df) if (!State->Flags.Df)
{ {
@ -5620,8 +5620,8 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeCmps)
else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT);
/* Calculate the mask and sign flag */ /* Calculate the mask and sign flag */
DataMask = (1 << (DataSize * 8)) - 1;
SignFlag = 1 << ((DataSize * 8) - 1); SignFlag = 1 << ((DataSize * 8) - 1);
DataMask = SignFlag | (SignFlag - 1);
/* Read from the first source operand */ /* Read from the first source operand */
if (!Fast486ReadMemory(State, if (!Fast486ReadMemory(State,
@ -5664,7 +5664,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeCmps)
State->Flags.Pf = Fast486CalculateParity(Result); State->Flags.Pf = Fast486CalculateParity(Result);
/* Increment/decrement ESI and EDI */ /* Increment/decrement ESI and EDI */
if (OperandSize) if (AddressSize)
{ {
if (!State->Flags.Df) if (!State->Flags.Df)
{ {
@ -5697,7 +5697,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeCmps)
{ {
BOOLEAN Repeat = TRUE; BOOLEAN Repeat = TRUE;
if (OperandSize) if (AddressSize)
{ {
if ((--State->GeneralRegs[FAST486_REG_ECX].Long) == 0) if ((--State->GeneralRegs[FAST486_REG_ECX].Long) == 0)
{ {
@ -5752,7 +5752,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeStos)
if (State->PrefixFlags & FAST486_PREFIX_REP) if (State->PrefixFlags & FAST486_PREFIX_REP)
{ {
UCHAR Block[STRING_BLOCK_SIZE]; UCHAR Block[STRING_BLOCK_SIZE];
ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long
: State->GeneralRegs[FAST486_REG_ECX].LowWord; : State->GeneralRegs[FAST486_REG_ECX].LowWord;
/* Fill the memory block with the data */ /* Fill the memory block with the data */
@ -5809,7 +5809,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeStos)
Processed * DataSize)) Processed * DataSize))
{ {
/* Set ECX */ /* Set ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count);
/* Exception occurred */ /* Exception occurred */
@ -5828,7 +5828,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeStos)
} }
/* Clear ECX */ /* Clear ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0;
} }
else else
@ -5846,7 +5846,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeStos)
} }
/* Increment/decrement EDI */ /* Increment/decrement EDI */
if (OperandSize) if (AddressSize)
{ {
if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize; if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize;
else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize;
@ -5888,7 +5888,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeLods)
if (State->PrefixFlags & FAST486_PREFIX_REP) if (State->PrefixFlags & FAST486_PREFIX_REP)
{ {
ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long
: State->GeneralRegs[FAST486_REG_ECX].LowWord; : State->GeneralRegs[FAST486_REG_ECX].LowWord;
/* If the count is 0, do nothing */ /* If the count is 0, do nothing */
@ -5907,7 +5907,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeLods)
} }
/* Clear ECX */ /* Clear ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0;
} }
@ -5925,7 +5925,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeLods)
} }
/* Increment/decrement ESI */ /* Increment/decrement ESI */
if (OperandSize) if (AddressSize)
{ {
if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_ESI].Long += DataSize; if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_ESI].Long += DataSize;
else State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize; else State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize;
@ -5961,8 +5961,8 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeScas)
else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT);
/* Calculate the mask and sign flag */ /* Calculate the mask and sign flag */
DataMask = (1 << (DataSize * 8)) - 1;
SignFlag = 1 << ((DataSize * 8) - 1); SignFlag = 1 << ((DataSize * 8) - 1);
DataMask = SignFlag | (SignFlag - 1);
/* Read from the source operand */ /* Read from the source operand */
if (!Fast486ReadMemory(State, if (!Fast486ReadMemory(State,
@ -5992,7 +5992,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeScas)
State->Flags.Pf = Fast486CalculateParity(Result); State->Flags.Pf = Fast486CalculateParity(Result);
/* Increment/decrement EDI */ /* Increment/decrement EDI */
if (OperandSize) if (AddressSize)
{ {
if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize; if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize;
else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize;
@ -6009,7 +6009,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeScas)
{ {
BOOLEAN Repeat = TRUE; BOOLEAN Repeat = TRUE;
if (OperandSize) if (AddressSize)
{ {
if ((--State->GeneralRegs[FAST486_REG_ECX].Long) == 0) if ((--State->GeneralRegs[FAST486_REG_ECX].Long) == 0)
{ {
@ -6064,7 +6064,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeIns)
if (State->PrefixFlags & FAST486_PREFIX_REP) if (State->PrefixFlags & FAST486_PREFIX_REP)
{ {
UCHAR Block[STRING_BLOCK_SIZE]; UCHAR Block[STRING_BLOCK_SIZE];
ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long
: State->GeneralRegs[FAST486_REG_ECX].LowWord; : State->GeneralRegs[FAST486_REG_ECX].LowWord;
/* Clear the memory block */ /* Clear the memory block */
@ -6123,7 +6123,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeIns)
Processed * DataSize)) Processed * DataSize))
{ {
/* Set ECX */ /* Set ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count);
/* Exception occurred */ /* Exception occurred */
@ -6142,7 +6142,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeIns)
} }
/* Clear ECX */ /* Clear ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0;
} }
else else
@ -6169,7 +6169,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeIns)
} }
/* Increment/decrement EDI */ /* Increment/decrement EDI */
if (OperandSize) if (AddressSize)
{ {
if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize; if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_EDI].Long += DataSize;
else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize; else State->GeneralRegs[FAST486_REG_EDI].Long -= DataSize;
@ -6205,7 +6205,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeOuts)
if (State->PrefixFlags & FAST486_PREFIX_REP) if (State->PrefixFlags & FAST486_PREFIX_REP)
{ {
UCHAR Block[STRING_BLOCK_SIZE]; UCHAR Block[STRING_BLOCK_SIZE];
ULONG Count = OperandSize ? State->GeneralRegs[FAST486_REG_ECX].Long ULONG Count = AddressSize ? State->GeneralRegs[FAST486_REG_ECX].Long
: State->GeneralRegs[FAST486_REG_ECX].LowWord; : State->GeneralRegs[FAST486_REG_ECX].LowWord;
/* Clear the memory block */ /* Clear the memory block */
@ -6237,7 +6237,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeOuts)
Processed * DataSize)) Processed * DataSize))
{ {
/* Set ECX */ /* Set ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = Count;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count); else State->GeneralRegs[FAST486_REG_ECX].LowWord = LOWORD(Count);
/* Exception occurred */ /* Exception occurred */
@ -6284,7 +6284,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeOuts)
} }
/* Clear ECX */ /* Clear ECX */
if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; if (AddressSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0;
else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0;
} }
else else
@ -6312,7 +6312,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeOuts)
DataSize); DataSize);
/* Increment/decrement ESI */ /* Increment/decrement ESI */
if (OperandSize) if (AddressSize)
{ {
if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_ESI].Long += DataSize; if (!State->Flags.Df) State->GeneralRegs[FAST486_REG_ESI].Long += DataSize;
else State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize; else State->GeneralRegs[FAST486_REG_ESI].Long -= DataSize;