vbox的更動 67098 路徑 trunk/src/VBox/ValidationKit

時間撮記:

2017-5-25 下午10:16:27 (7 年 以前)

作者:

vboxsync

訊息:

bs3-cpu-generated-1: cleanups

檔案:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-generated-1-template.c (修改) (3 筆差異)

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

@@ -1616 +1616 @@
 
 
-static unsigned BS3_NEAR_CODE Bs3Cg1EncodeNext_MODRM_Wps_WO_Vps__OR__MODRM_Wpd_WO_Vpd(PBS3CG1STATE pThis, unsigned iEncoding)
-{
-    unsigned off;
-    if (iEncoding == 0)
-    {
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-        pThis->abCurInstr[off++] = X86_MODRM_MAKE(3, 1, 0);
-        pThis->aOperands[pThis->iRmOp ].idxField = BS3CG1DST_XMM0;
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_XMM1;
-    }
-    else if (iEncoding == 1)
-    {
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_XMM2;
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-        off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, 2 /*iReg*/, 16, 0, BS3CG1OPLOC_MEM_WO);
-    }
-    else if (iEncoding == 2)
-    {
-        pThis->aOperands[pThis->iRegOp].idxField = BS3CG1DST_XMM3;
-        off = Bs3Cg1InsertOpcodes(pThis, Bs3Cg1InsertReqPrefix(pThis, 0));
-        off = Bs3Cfg1EncodeMemMod0Disp(pThis, false, off, 3 /*iReg*/, 16, 1 /*cbMisalign*/, BS3CG1OPLOC_MEM_WO);
-        if (!Bs3Cg1XcptTypeIsUnaligned(pThis->enmXcptType))
-            pThis->bAlignmentXcpt = X86_XCPT_GP;
-    }
-    else
-        return 0;
-    pThis->cbCurInstr = off;
-    return iEncoding + 1;
-}
-
-
 static unsigned BS3_NEAR_CODE Bs3Cg1EncodeNext_MODRM_WqZxReg_WO_Vq(PBS3CG1STATE pThis, unsigned iEncoding)
 {
@@ -3657 +3626 @@
     switch (pThis->enmEncoding)
     {
-        case BS3CG1ENC_MODRM_Wps_WO_Vps:
-        case BS3CG1ENC_MODRM_Wpd_WO_Vpd:
-            return Bs3Cg1EncodeNext_MODRM_Wps_WO_Vps__OR__MODRM_Wpd_WO_Vpd(pThis, iEncoding);
         case BS3CG1ENC_MODRM_WqZxReg_WO_Vq:
             return Bs3Cg1EncodeNext_MODRM_WqZxReg_WO_Vq(pThis, iEncoding);
@@ -3884 +3850 @@
         case BS3CG1ENC_MODRM_Wps_WO_Vps:
         case BS3CG1ENC_MODRM_Wpd_WO_Vpd:
-            pThis->iRmOp             = 0;
-            pThis->iRegOp            = 1;
-            pThis->aOperands[0].cbOp = 16;
-            pThis->aOperands[1].cbOp = 16;
-            pThis->aOperands[0].enmLocation = BS3CG1OPLOC_CTX;
-            pThis->aOperands[1].enmLocation = BS3CG1OPLOC_CTX;
+            pThis->pfnEncoder                   = Bs3Cg1EncodeNext_MODRM_Vsomething_Wsomething_OR_ViceVersa;
+            pThis->iRmOp                        = 0;
+            pThis->iRegOp                       = 1;
+            pThis->aOperands[0].cbOp            = 16;
+            pThis->aOperands[1].cbOp            = 16;
+            pThis->aOperands[0].idxFieldBase    = BS3CG1DST_XMM0;
+            pThis->aOperands[1].idxFieldBase    = BS3CG1DST_XMM0;
+            pThis->aOperands[0].enmLocationReg  = BS3CG1OPLOC_CTX;
+            pThis->aOperands[0].enmLocationMem  = BS3CG1OPLOC_MEM_WO;
+            pThis->aOperands[1].enmLocation     = BS3CG1OPLOC_CTX;
             break;