Changeset 67105 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

May 25, 2017 10:45:41 PM (8 years ago)

Author:

vboxsync

Message:

bs3-cpu-generated-1: cleanups

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c (modified) (4 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c

@@ -2099 +2099 @@
         case 1:
             off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-            off = Bs3Cfg1EncodeMemMod0DispWithRegFieldAndDefaultsMisaligned(pThis, off, 3 /*iReg*/, 1 /*cbMisalign*/);
-            break;
-        default:
-            return 0;
-    }
-    pThis->cbCurInstr = off;
-    return iEncoding + 1;
-}
-
-
-static unsigned BS3_NEAR_CODE Bs3Cg1EncodeNext_MODRM_MsomethingWO_Vsomething_OR_ViceVersa(PBS3CG1STATE pThis, unsigned iEncoding)
-{
-    unsigned off;
-    switch (iEncoding)
-    {
-        case 0:
-            off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-            off = Bs3Cfg1EncodeMemMod0DispWithRegFieldAndDefaults(pThis, off, 2 /*iReg*/);
-            break;
-        case 1:
-            off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
             off = Bs3Cfg1EncodeMemMod0DispWithRegFieldAndDefaultsMisaligned(pThis, off, 2 /*iReg*/, 1 /*cbMisalign*/ );
             if (!Bs3Cg1XcptTypeIsUnaligned(pThis->enmXcptType))
@@ -3790 +3769 @@
 
         case BS3CG1ENC_MODRM_Vdq_WO_Mdq:
-            pThis->pfnEncoder                   = Bs3Cg1EncodeNext_MODRM_MsomethingWO_Vsomething_OR_ViceVersa;
+            pThis->pfnEncoder                   = Bs3Cg1EncodeNext_MODRM_Msomething_Vsomething_OR_ViceVersa;
             pThis->iRegOp                       = 0;
             pThis->iRmOp                        = 1;
@@ -4008 +3987 @@
 
         case BS3CG1ENC_MODRM_Mdq_WO_Vdq:
-            pThis->pfnEncoder                   = Bs3Cg1EncodeNext_MODRM_MsomethingWO_Vsomething_OR_ViceVersa;
+            pThis->pfnEncoder                   = Bs3Cg1EncodeNext_MODRM_Msomething_Vsomething_OR_ViceVersa;
             pThis->iRmOp                        = 0;
             pThis->iRegOp                       = 1;
@@ -4045 +4024 @@
         case BS3CG1ENC_MODRM_Mps_WO_Vps:
         case BS3CG1ENC_MODRM_Mpd_WO_Vpd:
-            pThis->pfnEncoder                  = Bs3Cg1EncodeNext_MODRM_MsomethingWO_Vsomething_OR_ViceVersa;
+            pThis->pfnEncoder                  = Bs3Cg1EncodeNext_MODRM_Msomething_Vsomething_OR_ViceVersa;
             pThis->iRmOp                       = 0;
             pThis->iRegOp                      = 1;