Changeset 95397 in vbox for trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Timestamp:

Jun 27, 2022 5:49:40 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151994

Message:

ValKit/bs3kit,bs3-cpu-instr-3: 128 and 256 bit wide vxorps, alignment checks. bugref:9898

Location:

trunk/src/VBox/ValidationKit/bootsectors/bs3kit

Files:

• Makefile.kmk (modified) (1 diff)
• bs3-cmn-ExtCtxGetXmm.c (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-ExtCtxGetYmm.c ) (2 diffs)
• bs3-cmn-ExtCtxSetXmm.c (copied) (copied from trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-ExtCtxSetYmm.c ) (2 diffs)
• bs3-cmn-ExtCtxSetYmm.c (modified) (3 diffs)
• bs3kit-autostubs.kmk (modified) (2 diffs)
• bs3kit-mangling-code-define.h (modified) (2 diffs)
• bs3kit-mangling-code-undef.h (modified) (2 diffs)
• bs3kit.h (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/Makefile.kmk

@@ -151 +151 @@
        bs3-cmn-ExtCtxGetMm.c \
        bs3-cmn-ExtCtxSetMm.c \
+       bs3-cmn-ExtCtxGetXmm.c \
+       bs3-cmn-ExtCtxSetXmm.c \
        bs3-cmn-ExtCtxGetYmm.c \
        bs3-cmn-ExtCtxSetYmm.c \

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-ExtCtxGetXmm.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * BS3Kit - Bs3ExtCtxGetYmm
+ * BS3Kit - Bs3ExtCtxGetXmm
  */
 
@@ -32 +32 @@
 
 
-#undef Bs3ExtCtxGetYmm
-BS3_CMN_DEF(PRTUINT256U, Bs3ExtCtxGetYmm,(PCBS3EXTCTX pExtCtx, uint8_t iReg, PRTUINT256U pValue))
+#undef Bs3ExtCtxGetXmm
+BS3_CMN_DEF(PRTUINT128U, Bs3ExtCtxGetXmm,(PCBS3EXTCTX pExtCtx, uint8_t iReg, PRTUINT128U pValue))
 {
-    pValue->au128[0].au64[0] = 0;
-    pValue->au128[0].au64[1] = 0;
-    pValue->au128[1].au64[0] = 0;
-    pValue->au128[1].au64[1] = 0;
-
+    AssertCompileMembersAtSameOffset(BS3EXTCTX, Ctx.x87.aXMM, BS3EXTCTX, Ctx.x.x87.aXMM);
     switch (pExtCtx->enmMethod)
     {
         case BS3EXTCTXMETHOD_FXSAVE:
+        case BS3EXTCTXMETHOD_XSAVE:
             if (iReg < RT_ELEMENTS(pExtCtx->Ctx.x87.aXMM))
-                pValue->au128[0] = pExtCtx->Ctx.x87.aXMM[iReg].uXmm;
-            break;
-
-        case BS3EXTCTXMETHOD_XSAVE:
-            if (iReg < RT_ELEMENTS(pExtCtx->Ctx.x.x87.aXMM))
             {
-                pValue->au128[0] = pExtCtx->Ctx.x87.aXMM[iReg].uXmm;
-                if (pExtCtx->fXcr0Nominal & XSAVE_C_YMM)
-                    pValue->au128[1] = pExtCtx->Ctx.x.u.YmmHi.aYmmHi[iReg].uXmm;
+                pValue->u = pExtCtx->Ctx.x87.aXMM[iReg].xmm;
+                return pValue;
             }
             break;
     }
+
+    pValue->au64[0] = 0;
+    pValue->au64[1] = 0;
     return pValue;
 }

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-ExtCtxSetXmm.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * BS3Kit - Bs3ExtCtxSetYmm
+ * BS3Kit - Bs3ExtCtxSetXmm
  */
 
@@ -32 +32 @@
 
 
-#undef Bs3ExtCtxSetYmm
-BS3_CMN_DEF(bool, Bs3ExtCtxSetYmm,(PBS3EXTCTX pExtCtx, uint8_t iReg, PCRTUINT256U pValue, bool f128Bit))
+#undef Bs3ExtCtxSetXmm
+BS3_CMN_DEF(bool, Bs3ExtCtxSetXmm,(PBS3EXTCTX pExtCtx, uint8_t iReg, PCRTUINT128U pValue))
 {
+    AssertCompileMembersAtSameOffset(BS3EXTCTX, Ctx.x87.aXMM, BS3EXTCTX, Ctx.x.x87.aXMM);
     switch (pExtCtx->enmMethod)
     {
         case BS3EXTCTXMETHOD_FXSAVE:
+        case BS3EXTCTXMETHOD_XSAVE:
             if (iReg < RT_ELEMENTS(pExtCtx->Ctx.x87.aXMM))
             {
-                pExtCtx->Ctx.x87.aXMM[iReg].uXmm = pValue->au128[0];
-                return true;
-            }
-            break;
-
-        case BS3EXTCTXMETHOD_XSAVE:
-            if (iReg < RT_ELEMENTS(pExtCtx->Ctx.x.x87.aXMM))
-            {
-                pExtCtx->Ctx.x87.aXMM[iReg].uXmm = pValue->au128[0];
-                if ((pExtCtx->fXcr0Nominal & XSAVE_C_YMM) && !f128Bit)
-                    pExtCtx->Ctx.x.u.YmmHi.aYmmHi[iReg].uXmm = pValue->au128[1];
+                pExtCtx->Ctx.x87.aXMM[iReg].xmm = pValue->u;
                 return true;
             }

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3-cmn-ExtCtxSetYmm.c

@@ -33 +33 @@
 
 #undef Bs3ExtCtxSetYmm
-BS3_CMN_DEF(bool, Bs3ExtCtxSetYmm,(PBS3EXTCTX pExtCtx, uint8_t iReg, PCRTUINT256U pValue, bool f128Bit))
+BS3_CMN_DEF(bool, Bs3ExtCtxSetYmm,(PBS3EXTCTX pExtCtx, uint8_t iReg, PCRTUINT256U pValue, uint8_t cbValue))
 {
+    BS3_ASSERT(cbValue == 16 || cbValue == 32);
     switch (pExtCtx->enmMethod)
     {
@@ -40 +41 @@
             if (iReg < RT_ELEMENTS(pExtCtx->Ctx.x87.aXMM))
             {
-                pExtCtx->Ctx.x87.aXMM[iReg].uXmm = pValue->au128[0];
+                pExtCtx->Ctx.x87.aXMM[iReg].uXmm = pValue->DQWords.dqw0;
                 return true;
             }
@@ -48 +49 @@
             if (iReg < RT_ELEMENTS(pExtCtx->Ctx.x.x87.aXMM))
             {
-                pExtCtx->Ctx.x87.aXMM[iReg].uXmm = pValue->au128[0];
-                if ((pExtCtx->fXcr0Nominal & XSAVE_C_YMM) && !f128Bit)
-                    pExtCtx->Ctx.x.u.YmmHi.aYmmHi[iReg].uXmm = pValue->au128[1];
+                pExtCtx->Ctx.x87.aXMM[iReg].uXmm = pValue->DQWords.dqw0;
+                if (pExtCtx->fXcr0Nominal & XSAVE_C_YMM)
+                {
+                    if (cbValue >= 32)
+                        pExtCtx->Ctx.x.u.YmmHi.aYmmHi[iReg].uXmm = pValue->DQWords.dqw1;
+                    else
+                    {
+                        pExtCtx->Ctx.x.u.YmmHi.aYmmHi[iReg].au64[0] = 0;
+                        pExtCtx->Ctx.x.u.YmmHi.aYmmHi[iReg].au64[1] = 0;
+                    }
+                    /** @todo zero high ZMM part. */
+                }
                 return true;
             }

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-autostubs.kmk

@@ -38 +38 @@
 $(call BS3KIT_FN_GEN_CMN_FARSTUB,bs3kit-common-16,Bs3RegCtxSaveEx,8)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetMm)
+$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetXmm)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxSetYmm)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TestCheckExtCtx)
@@ -63 +64 @@
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxInit)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3TrapSetHandler)
+$(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetXmm)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3ExtCtxGetYmm)
 $(call BS3KIT_FN_GEN_CMN_NEARSTUB,bs3kit-common-16,Bs3Printf)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-define.h

@@ -37 +37 @@
 #define Bs3ExtCtxGetMxCsr BS3_CMN_MANGLER(Bs3ExtCtxGetMxCsr)
 #define Bs3ExtCtxGetSize BS3_CMN_MANGLER(Bs3ExtCtxGetSize)
+#define Bs3ExtCtxGetXmm BS3_CMN_MANGLER(Bs3ExtCtxGetXmm)
 #define Bs3ExtCtxGetYmm BS3_CMN_MANGLER(Bs3ExtCtxGetYmm)
 #define Bs3ExtCtxInit BS3_CMN_MANGLER(Bs3ExtCtxInit)
@@ -43 +44 @@
 #define Bs3ExtCtxSetMm BS3_CMN_MANGLER(Bs3ExtCtxSetMm)
 #define Bs3ExtCtxSetMxCsr BS3_CMN_MANGLER(Bs3ExtCtxSetMxCsr)
+#define Bs3ExtCtxSetXmm BS3_CMN_MANGLER(Bs3ExtCtxSetXmm)
 #define Bs3ExtCtxSetYmm BS3_CMN_MANGLER(Bs3ExtCtxSetYmm)
 #define Bs3GetCpuVendor BS3_CMN_MANGLER(Bs3GetCpuVendor)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit-mangling-code-undef.h

@@ -37 +37 @@
 #undef Bs3ExtCtxGetMxCsr
 #undef Bs3ExtCtxGetSize
+#undef Bs3ExtCtxGetXmm
 #undef Bs3ExtCtxGetYmm
 #undef Bs3ExtCtxInit
@@ -43 +44 @@
 #undef Bs3ExtCtxSetMm
 #undef Bs3ExtCtxSetMxCsr
+#undef Bs3ExtCtxSetXmm
 #undef Bs3ExtCtxSetYmm
 #undef Bs3GetCpuVendor

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -2916 +2916 @@
 
 /**
+ * Gets the value of XMM register number @a iReg from @a pExtCtx.
+ *
+ * @returns pValue
+ * @param   pExtCtx         The extended CPU context.
+ * @param   iReg            The register to get.
+ * @param   pValue          Where to return the value. Zeroed if the state
+ *                          doesn't support SSE or if @a iReg is invalid.
+ */
+BS3_CMN_PROTO_STUB(PRTUINT128U, Bs3ExtCtxGetXmm,(PCBS3EXTCTX pExtCtx, uint8_t iReg, PRTUINT128U pValue));
+
+/**
+ * Sets the value of XMM register number @a iReg in @a pExtCtx to @a pValue.
+ *
+ * @returns True if set, false if not set (not supported by state format or
+ *          invalid iReg).
+ * @param   pExtCtx         The extended CPU context.
+ * @param   iReg            The register to set.
+ * @param   pValue          The new register value.
+ */
+BS3_CMN_PROTO_STUB(bool, Bs3ExtCtxSetXmm,(PBS3EXTCTX pExtCtx, uint8_t iReg, PCRTUINT128U pValue));
+
+/**
  * Gets the value of YMM register number @a iReg from @a pExtCtx.
  *
@@ -2935 +2957 @@
  * @param   iReg            The register to set.
  * @param   pValue          The new register value.
- * @param   f128Bit         A little peculiarity grown from mixing SSE and AVX
- *                          tests:  When set to true only the lower 128 bits of
- *                          the YMM register will be set. The upper bits are
- *                          untouched.  When false, the whole 256-bits value
- *                          will be set.
- */
-BS3_CMN_PROTO_STUB(bool, Bs3ExtCtxSetYmm,(PBS3EXTCTX pExtCtx, uint8_t iReg, PCRTUINT256U pValue, bool f128Bit));
+ * @param   cbValue         Number of bytes to take from @a pValue, either 16 or
+ *                          32. If 16, the high part will be zeroed when present
+ *                          in the state.
+ */
+BS3_CMN_PROTO_STUB(bool, Bs3ExtCtxSetYmm,(PBS3EXTCTX pExtCtx, uint8_t iReg, PCRTUINT256U pValue, uint8_t cbValue));