[aandrejevic] 60688: [SOFT386] Implement the far absolute indirect JMP/CALL instructions in group 0xFF.

Author: aandrejevic
Date: Wed Oct 16 03:14:12 2013
New Revision: 60688

URL: http://svn.reactos.org/svn/reactos?rev=60688&view=rev
Log:
[SOFT386]
Implement the far absolute indirect JMP/CALL instructions in group 0xFF.

Modified:
    branches/ntvdm/lib/soft386/opgroups.c

Modified: branches/ntvdm/lib/soft386/opgroups.c
URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?rev...
==============================================================================
--- branches/ntvdm/lib/soft386/opgroups.c	[iso-8859-1] (original)
+++ branches/ntvdm/lib/soft386/opgroups.c	[iso-8859-1] Wed Oct 16 03:14:12 2013
@@ -1508,8 +1508,90 @@
             /* Set the EIP to the address */
             State->InstPtr.Long = Value;
         }
+        else if (ModRegRm.Register == 3)
+        {
+            USHORT Selector;
+            INT Segment = SOFT386_REG_DS;
+
+            /* Check for the segment override */
+            if (State->PrefixFlags & SOFT386_PREFIX_SEG)
+            {
+                /* Use the override segment instead */
+                Segment = State->SegmentOverride;
+            }
+
+            /* Read the selector */
+            if (!Soft386ReadMemory(State,
+                                   Segment,
+                                   ModRegRm.MemoryAddress + sizeof(ULONG),
+                                   FALSE,
+                                   &Selector,
+                                   sizeof(USHORT)))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Push the current value of CS */
+            if (!Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_CS].Selector))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Push the current value of EIP */
+            if (!Soft386StackPush(State, State->InstPtr.Long))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Load the new code segment */
+            if (!Soft386LoadSegment(State, SOFT386_REG_CS, Selector))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Set the EIP to the address */
+            State->InstPtr.Long = Value;
+        }
         else if (ModRegRm.Register == 4)
         {
+            /* Set the EIP to the address */
+            State->InstPtr.Long = Value;
+        }
+        else if (ModRegRm.Register == 5)
+        {
+            USHORT Selector;
+            INT Segment = SOFT386_REG_DS;
+
+            /* Check for the segment override */
+            if (State->PrefixFlags & SOFT386_PREFIX_SEG)
+            {
+                /* Use the override segment instead */
+                Segment = State->SegmentOverride;
+            }
+
+            /* Read the selector */
+            if (!Soft386ReadMemory(State,
+                                   Segment,
+                                   ModRegRm.MemoryAddress + sizeof(ULONG),
+                                   FALSE,
+                                   &Selector,
+                                   sizeof(USHORT)))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Load the new code segment */
+            if (!Soft386LoadSegment(State, SOFT386_REG_CS, Selector))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
             /* Set the EIP to the address */
             State->InstPtr.Long = Value;
         }
@@ -1569,15 +1651,104 @@
             /* Set the IP to the address */
             State->InstPtr.LowWord = Value;
         }
-        else if (ModRegRm.Register == 4)
-        {
+        else if (ModRegRm.Register == 3)
+        {
+            USHORT Selector;
+            INT Segment = SOFT386_REG_DS;
+
+            /* Check for the segment override */
+            if (State->PrefixFlags & SOFT386_PREFIX_SEG)
+            {
+                /* Use the override segment instead */
+                Segment = State->SegmentOverride;
+            }
+
+            /* Read the selector */
+            if (!Soft386ReadMemory(State,
+                                   Segment,
+                                   ModRegRm.MemoryAddress + sizeof(USHORT),
+                                   FALSE,
+                                   &Selector,
+                                   sizeof(USHORT)))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Push the current value of CS */
+            if (!Soft386StackPush(State, State->SegmentRegs[SOFT386_REG_CS].Selector))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Push the current value of IP */
+            if (!Soft386StackPush(State, State->InstPtr.LowWord))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Load the new code segment */
+            if (!Soft386LoadSegment(State, SOFT386_REG_CS, Selector))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
             /* Set the IP to the address */
             State->InstPtr.LowWord = Value;
+
+        }
+        else if (ModRegRm.Register == 4)
+        {
+            /* Set the IP to the address */
+            State->InstPtr.LowWord = Value;
+        }
+        else if (ModRegRm.Register == 5)
+        {
+            USHORT Selector;
+            INT Segment = SOFT386_REG_DS;
+
+            /* Check for the segment override */
+            if (State->PrefixFlags & SOFT386_PREFIX_SEG)
+            {
+                /* Use the override segment instead */
+                Segment = State->SegmentOverride;
+            }
+
+            /* Read the selector */
+            if (!Soft386ReadMemory(State,
+                                   Segment,
+                                   ModRegRm.MemoryAddress + sizeof(USHORT),
+                                   FALSE,
+                                   &Selector,
+                                   sizeof(USHORT)))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Load the new code segment */
+            if (!Soft386LoadSegment(State, SOFT386_REG_CS, Selector))
+            {
+                /* Exception occurred */
+                return FALSE;
+            }
+
+            /* Set the IP to the address */
+            State->InstPtr.LowWord = Value;
         }
         else if (ModRegRm.Register == 6)
         {
             /* Push the value on to the stack */
             return Soft386StackPush(State, Value);
+        }
+        else
+        {
+            /* Invalid */
+            Soft386Exception(State, SOFT386_EXCEPTION_UD);
+            return FALSE;
         }

if (ModRegRm.Register <= 1)
@@ -1595,14 +1766,6 @@
         }
     }

-    if ((ModRegRm.Register == 3)
-        || (ModRegRm.Register == 5)
-        || (ModRegRm.Register == 7))
-    {
-        UNIMPLEMENTED;
-        return FALSE; // NOT IMPLEMENTED
-    }
-    
     return TRUE;
 }