[ros-diffs] [aandrejevic] 60935: [FAST486] Implement the LSS instruction. Fix a bug in LFS and LGS.

Author: aandrejevic
Date: Mon Nov 11 03:14:18 2013
New Revision: 60935

URL: http://svn.reactos.org/svn/reactos?rev=60935&view=rev
Log:
[FAST486]
Implement the LSS instruction.
Fix a bug in LFS and LGS.


Modified:
    branches/ntvdm/lib/fast486/extraops.c
    branches/ntvdm/lib/fast486/extraops.h

Modified: branches/ntvdm/lib/fast486/extraops.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re…
==============================================================================
--- branches/ntvdm/lib/fast486/extraops.c	[iso-8859-1] (original)
+++ branches/ntvdm/lib/fast486/extraops.c	[iso-8859-1] Mon Nov 11 03:14:18 2013
@@ -215,7 +215,7 @@
     Fast486ExtOpcodeImul,
     Fast486ExtOpcodeCmpXchgByte,
     Fast486ExtOpcodeCmpXchg,
-    NULL, // TODO: OPCODE 0xB2 NOT IMPLEMENTED
+    Fast486ExtOpcodeLss,
     Fast486ExtOpcodeBtr,
     Fast486ExtOpcodeLfsLgs,
     Fast486ExtOpcodeLfsLgs,
@@ -1102,6 +1102,74 @@
     return TRUE;
 }
 
+FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLss)
+{
+    UCHAR FarPointer[6];
+    BOOLEAN OperandSize, AddressSize;
+    FAST486_MOD_REG_RM ModRegRm;
+
+    /* Make sure this is the right instruction */
+    ASSERT(Opcode == 0xB2);
+
+    OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size;
+
+    TOGGLE_OPSIZE(OperandSize);
+    TOGGLE_ADSIZE(AddressSize);
+
+    /* Get the operands */
+    if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm))
+    {
+        /* Exception occurred */
+        return FALSE;
+    }
+
+    if (!ModRegRm.Memory)
+    {
+        /* Invalid */
+        Fast486Exception(State, FAST486_EXCEPTION_UD);
+        return FALSE;
+    }
+
+    if (!Fast486ReadMemory(State,
+                           (State->PrefixFlags & FAST486_PREFIX_SEG)
+                           ? State->SegmentOverride : FAST486_REG_DS,
+                           ModRegRm.MemoryAddress,
+                           FALSE,
+                           FarPointer,
+                           OperandSize ? 6 : 4))
+    {
+        /* Exception occurred */
+        return FALSE;
+    }
+
+    if (OperandSize)
+    {
+        ULONG Offset = *((PULONG)FarPointer);
+        USHORT Segment = *((PUSHORT)&FarPointer[sizeof(ULONG)]);
+
+        /* Set the register to the offset */
+        State->GeneralRegs[ModRegRm.Register].Long = Offset;
+
+        /* Load the segment */
+        return Fast486LoadSegment(State,
+                                  FAST486_REG_SS,
+                                  Segment);
+    }
+    else
+    {
+        USHORT Offset = *((PUSHORT)FarPointer);
+        USHORT Segment = *((PUSHORT)&FarPointer[sizeof(USHORT)]);
+
+        /* Set the register to the offset */
+        State->GeneralRegs[ModRegRm.Register].LowWord = Offset;
+
+        /* Load the segment */
+        return Fast486LoadSegment(State,
+                                  FAST486_REG_SS,
+                                  Segment);
+    }
+}
+
 FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBtr)
 {
     BOOLEAN OperandSize, AddressSize;
@@ -1204,6 +1272,7 @@
 
     OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size;
 
+    TOGGLE_OPSIZE(OperandSize);
     TOGGLE_ADSIZE(AddressSize);
 
     /* Get the operands */

Modified: branches/ntvdm/lib/fast486/extraops.h
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re…
==============================================================================
--- branches/ntvdm/lib/fast486/extraops.h	[iso-8859-1] (original)
+++ branches/ntvdm/lib/fast486/extraops.h	[iso-8859-1] Mon Nov 11 03:14:18 2013
@@ -42,6 +42,7 @@
 FAST486_OPCODE_HANDLER(Fast486ExtOpcodeImul);
 FAST486_OPCODE_HANDLER(Fast486ExtOpcodeCmpXchgByte);
 FAST486_OPCODE_HANDLER(Fast486ExtOpcodeCmpXchg);
+FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLss);
 FAST486_OPCODE_HANDLER(Fast486ExtOpcodeBtr);
 FAST486_OPCODE_HANDLER(Fast486ExtOpcodeLfsLgs);
 FAST486_OPCODE_HANDLER(Fast486ExtOpcodeMovzxByte);