[ros-diffs] [aandrejevic] 60342: [SOFT386] Implement the AAM and AAD instructions.

Author: aandrejevic
Date: Mon Sep 23 16:03:23 2013
New Revision: 60342

URL: http://svn.reactos.org/svn/reactos?rev=60342&view=rev
Log:
[SOFT386]
Implement the AAM and AAD instructions.


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

Modified: branches/ntvdm/lib/soft386/opcodes.c
URL:
http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev…
==============================================================================
--- branches/ntvdm/lib/soft386/opcodes.c	[iso-8859-1] (original)
+++ branches/ntvdm/lib/soft386/opcodes.c	[iso-8859-1] Mon Sep 23 16:03:23 2013
@@ -4525,18 +4525,72 @@
 
 SOFT386_OPCODE_HANDLER(Soft386OpcodeAam)
 {
-    // TODO: NOT IMPLEMENTED
-    UNIMPLEMENTED;
-
-    return FALSE;
+    UCHAR Base;
+    UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte;
+
+    if (State->PrefixFlags & SOFT386_PREFIX_LOCK)
+    {
+        /* Invalid prefix */
+        Soft386Exception(State, SOFT386_EXCEPTION_UD);
+        return FALSE;
+    }
+
+    /* Fetch the base */
+    if (!Soft386FetchByte(State, &Base))
+    {
+        /* Exception occurred */
+        return FALSE;
+    }
+
+    /* Check if the base is zero */
+    if (Base == 0)
+    {
+        /* Divide error */
+        Soft386Exception(State, SOFT386_EXCEPTION_DE);
+        return FALSE;
+    }
+
+    /* Adjust */
+    State->GeneralRegs[SOFT386_REG_EAX].HighByte = Value / Base;
+    State->GeneralRegs[SOFT386_REG_EAX].LowByte = Value %= Base;
+
+    /* Update flags */
+    State->Flags.Zf = (Value == 0) ? TRUE : FALSE;
+    State->Flags.Sf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE;
+    State->Flags.Pf = Soft386CalculateParity(Value);
+
+    return TRUE;
 }
 
 SOFT386_OPCODE_HANDLER(Soft386OpcodeAad)
 {
-    // TODO: NOT IMPLEMENTED
-    UNIMPLEMENTED;
-
-    return FALSE;
+    UCHAR Base;
+    UCHAR Value = State->GeneralRegs[SOFT386_REG_EAX].LowByte;
+
+    if (State->PrefixFlags & SOFT386_PREFIX_LOCK)
+    {
+        /* Invalid prefix */
+        Soft386Exception(State, SOFT386_EXCEPTION_UD);
+        return FALSE;
+    }
+
+    /* Fetch the base */
+    if (!Soft386FetchByte(State, &Base))
+    {
+        /* Exception occurred */
+        return FALSE;
+    }
+
+    /* Adjust */
+    Value += State->GeneralRegs[SOFT386_REG_EAX].HighByte * Base;
+    State->GeneralRegs[SOFT386_REG_EAX].LowByte = Value;
+
+    /* Update flags */
+    State->Flags.Zf = (Value == 0) ? TRUE : FALSE;
+    State->Flags.Sf = (Value & SIGN_FLAG_BYTE) ? TRUE : FALSE;
+    State->Flags.Pf = Soft386CalculateParity(Value);
+
+    return TRUE;
 }
 
 SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat)