[aandrejevic] 60714: [FAST486] Fix prefix handling. Create a macro NO_LOCK_PREFIX to shorten the code.
Author: aandrejevic Date: Sat Oct 19 23:03:40 2013 New Revision: 60714
URL: http://svn.reactos.org/svn/reactos?rev=60714&view=rev Log: [FAST486] Fix prefix handling. Create a macro NO_LOCK_PREFIX to shorten the code.
Modified: branches/ntvdm/lib/fast486/common.h branches/ntvdm/lib/fast486/opcodes.c
Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=6... ============================================================================== --- branches/ntvdm/lib/fast486/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.h [iso-8859-1] Sat Oct 19 23:03:40 2013 @@ -40,6 +40,12 @@ #define GET_SEGMENT_RPL(s) ((s) & 3) #define GET_SEGMENT_INDEX(s) ((s) & 0xFFF8) #define EXCEPTION_HAS_ERROR_CODE(x) (((x) == 8) || ((x) >= 10 && (x) <= 14)) + +#define NO_LOCK_PREFIX() if (State->PrefixFlags & FAST486_PREFIX_LOCK)\ +{\ + Fast486Exception(State, FAST486_EXCEPTION_UD);\ + return FALSE;\ +}
#define PAGE_ALIGN(x) ((x) & 0xFFFFF000) #define PAGE_OFFSET(x) ((x) & 0x00000FFF)
Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev=... ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sat Oct 19 23:03:40 2013 @@ -472,12 +472,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Make sure this is the right instruction */ ASSERT((Opcode & 0xF8) == 0x40); @@ -516,12 +511,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Make sure this is the right instruction */ ASSERT((Opcode & 0xF8) == 0x48); @@ -551,12 +541,7 @@
FAST486_OPCODE_HANDLER(Fast486OpcodePushReg) { - if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Make sure this is the right instruction */ ASSERT((Opcode & 0xF8) == 0x50); @@ -576,12 +561,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Make sure this is the right instruction */ ASSERT((Opcode & 0xF8) == 0x58); @@ -626,12 +606,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Make sure this is the right instruction */ ASSERT((Opcode & 0xF8) == 0x90); @@ -983,12 +958,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (Opcode == 0xE5) { @@ -1083,12 +1053,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (Opcode == 0xE7) { @@ -1163,12 +1128,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (Size) { @@ -1318,17 +1278,6 @@ OperandSize = !OperandSize; }
- if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -1447,12 +1396,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x05);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -1530,15 +1474,6 @@ /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; } - else if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - }
/* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -1595,17 +1530,6 @@ OperandSize = !OperandSize; }
- if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -1718,12 +1642,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x0D);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -1797,15 +1716,6 @@ /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; } - else if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - }
/* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -1862,17 +1772,6 @@ OperandSize = !OperandSize; }
- if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -1949,12 +1848,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x24);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (!Fast486FetchByte(State, &SecondValue)) { @@ -1985,12 +1879,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x25);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -2064,15 +1953,6 @@ /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; } - else if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - }
/* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -2129,17 +2009,6 @@ OperandSize = !OperandSize; }
- if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -2252,12 +2121,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x35);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -2331,15 +2195,6 @@ /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; } - else if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - }
/* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -2392,17 +2247,6 @@ OperandSize = !OperandSize; }
- if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -2504,12 +2348,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xA9);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -2578,15 +2417,6 @@ /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; } - else if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - }
/* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -2647,17 +2477,6 @@ { /* The OPSIZE prefix toggles the operand size */ OperandSize = !OperandSize; - } - - if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; }
/* Get the operands */ @@ -2778,15 +2597,6 @@ { /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; - } - else if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; }
/* Get the operands */ @@ -2850,17 +2660,6 @@ OperandSize = !OperandSize; }
- if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -2992,12 +2791,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x15);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -3311,12 +3105,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x1D);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -3451,15 +3240,6 @@ /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; } - else if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - }
/* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -3536,17 +3316,6 @@ OperandSize = !OperandSize; }
- if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) { @@ -3705,12 +3474,7 @@ /* Make sure this is the right instruction */ ASSERT((Opcode & 0xEF) == 0x2D);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -3891,12 +3655,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Push all the registers in order */ for (i = 0; i < FAST486_NUM_GEN_REGS; i++) @@ -3940,12 +3699,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Pop all the registers in reverse order */ for (i = FAST486_NUM_GEN_REGS - 1; i >= 0; i--) @@ -4042,12 +3796,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0x68);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -4237,15 +3986,6 @@ /* The ADSIZE prefix toggles the size */ AddressSize = !AddressSize; } - else if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - }
/* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -4294,17 +4034,6 @@ { /* The OPSIZE prefix toggles the operand size */ OperandSize = !OperandSize; - } - - if (State->PrefixFlags - & ~(FAST486_PREFIX_ADSIZE - | FAST486_PREFIX_OPSIZE - | FAST486_PREFIX_SEG - | FAST486_PREFIX_LOCK)) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; }
/* Get the operands */ @@ -4544,12 +4273,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (Size) { @@ -4585,12 +4309,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (Size) { @@ -4625,12 +4344,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Fetch the offset */ if (Size) @@ -4697,12 +4411,7 @@ { BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size;
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -4729,12 +4438,7 @@ INT Cpl = Fast486GetCurrentPrivLevel(State); ULONG NewFlags;
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -4892,12 +4596,7 @@ /* Make sure this is the right instruction */ ASSERT((Opcode & 0xFE) == 0xC2);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -5035,12 +4734,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xC8);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -5104,12 +4798,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xC9);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -5158,12 +4847,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (Opcode == 0xCA) { @@ -5281,12 +4965,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xCF);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -5495,12 +5174,7 @@ UCHAR Base; UCHAR Value = State->GeneralRegs[FAST486_REG_EAX].LowByte;
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Fetch the base */ if (!Fast486FetchByte(State, &Base)) @@ -5534,12 +5208,7 @@ UCHAR Base; UCHAR Value = State->GeneralRegs[FAST486_REG_EAX].LowByte;
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Fetch the base */ if (!Fast486FetchByte(State, &Base)) @@ -5601,12 +5270,7 @@ /* Make sure this is the right instruction */ ASSERT((Opcode >= 0xE0) && (Opcode <= 0xE2));
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -5654,12 +5318,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xE3);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) { @@ -5699,12 +5358,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (Size) { @@ -5765,12 +5419,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
if (Size) { @@ -5819,12 +5468,7 @@ Size = !Size; }
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Fetch the offset */ if (Size) @@ -6063,12 +5707,7 @@ /* Make sure this is the right instruction */ ASSERT(Opcode == 0xD6);
- if (State->PrefixFlags & FAST486_PREFIX_LOCK) - { - /* Invalid prefix */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } + NO_LOCK_PREFIX();
/* Set all the bits of AL to CF */ State->GeneralRegs[FAST486_REG_EAX].LowByte = State->Flags.Cf ? 0xFF : 0x00;
-
aandrejevic＠svn.reactos.org