From 87ac13a95075a82cc064b0fa321f56d604cc06e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Wed, 19 Feb 2014 19:27:05 +0000 Subject: [PATCH] [FAST486]: Hardcoded_values--; svn path=/branches/ntvdm/; revision=62256 --- lib/fast486/common.inl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/fast486/common.inl b/lib/fast486/common.inl index 175fb018292..97c5d4e309b 100644 --- a/lib/fast486/common.inl +++ b/lib/fast486/common.inl @@ -281,7 +281,7 @@ Fast486StackPush(PFAST486_STATE State, } /* Subtract ESP by 4 */ - State->GeneralRegs[FAST486_REG_ESP].Long -= 4; + State->GeneralRegs[FAST486_REG_ESP].Long -= sizeof(ULONG); /* Store the value in SS:ESP */ return Fast486WriteMemory(State, @@ -303,7 +303,7 @@ Fast486StackPush(PFAST486_STATE State, } /* Subtract SP by 2 */ - State->GeneralRegs[FAST486_REG_ESP].LowWord -= 2; + State->GeneralRegs[FAST486_REG_ESP].LowWord -= sizeof(USHORT); /* Store the value in SS:SP */ return Fast486WriteMemory(State, @@ -319,8 +319,6 @@ BOOLEAN Fast486StackPop(PFAST486_STATE State, PULONG Value) { - ULONG LongValue; - USHORT ShortValue; BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; /* The OPSIZE prefix toggles the size */ @@ -329,6 +327,7 @@ Fast486StackPop(PFAST486_STATE State, if (Size) { /* 32-bit size */ + ULONG LongValue; /* Check if ESP is 0xFFFFFFFF */ if (State->GeneralRegs[FAST486_REG_ESP].Long == 0xFFFFFFFF) @@ -350,7 +349,7 @@ Fast486StackPop(PFAST486_STATE State, } /* Increment ESP by 4 */ - State->GeneralRegs[FAST486_REG_ESP].Long += 4; + State->GeneralRegs[FAST486_REG_ESP].Long += sizeof(ULONG); /* Store the value in the result */ *Value = LongValue; @@ -358,6 +357,7 @@ Fast486StackPop(PFAST486_STATE State, else { /* 16-bit size */ + USHORT ShortValue; /* Check if SP is 0xFFFF */ if (State->GeneralRegs[FAST486_REG_ESP].LowWord == 0xFFFF) @@ -379,7 +379,7 @@ Fast486StackPop(PFAST486_STATE State, } /* Increment SP by 2 */ - State->GeneralRegs[FAST486_REG_ESP].LowWord += 2; + State->GeneralRegs[FAST486_REG_ESP].LowWord += sizeof(USHORT); /* Store the value in the result */ *Value = ShortValue;