Changeset 55456 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Apr 27, 2015 3:16:01 PM (10 years ago)

Author:

vboxsync

Message:

CPUM: Dump supported extra state in the verbose edition of 'cpumguest' and 'cpumhyper' - fixes.

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -1649 +1649 @@
             if (pCtx->fXStateMask & XSAVE_C_YMM)
             {
-                PCX86XSAVEYMMHI pYmmHiCtx = (PCX86XSAVEYMMHI)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_YMM]);
+                PCX86XSAVEYMMHI pYmmHiCtx;
+                pYmmHiCtx = (PCX86XSAVEYMMHI)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_YMM_BIT]);
                 if (!(pCtx->fXStateMask & XSAVE_C_ZMM_HI256))
                     for (unsigned i = 0; i < RT_ELEMENTS(pFpuCtx->aXMM); i++)
@@ -1665 +1666 @@
                 {
                     PCX86XSAVEZMMHI256 pZmmHi256;
-                    pZmmHi256 = (PCX86XSAVEZMMHI256)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_ZMM_HI256]);
+                    pZmmHi256 = (PCX86XSAVEZMMHI256)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_ZMM_HI256_BIT]);
                     for (unsigned i = 0; i < RT_ELEMENTS(pFpuCtx->aXMM); i++)
                         pHlp->pfnPrintf(pHlp,
@@ -1688 +1689 @@
 
                     PCX86XSAVEZMM16HI pZmm16Hi;
-                    pZmm16Hi = (PCX86XSAVEZMM16HI)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_ZMM_16HI]);
+                    pZmm16Hi = (PCX86XSAVEZMM16HI)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_ZMM_16HI_BIT]);
                     for (unsigned i = 0; i < RT_ELEMENTS(pZmm16Hi->aRegs); i++)
                         pHlp->pfnPrintf(pHlp,
@@ -1726 +1727 @@
             {
                 PCX86XSAVEOPMASK pOpMask;
-                pOpMask = (PCX86XSAVEOPMASK)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_OPMASK]);
+                pOpMask = (PCX86XSAVEOPMASK)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_OPMASK_BIT]);
                 for (unsigned i = 0; i < RT_ELEMENTS(pOpMask->aKRegs); i += 4)
                     pHlp->pfnPrintf(pHlp, "%sK%u=%016RX64  %sK%u=%016RX64  %sK%u=%016RX64  %sK%u=%016RX64\n",
@@ -1738 +1739 @@
             {
                 PCX86XSAVEBNDREGS pBndRegs;
-                pBndRegs = (PCX86XSAVEBNDREGS)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_BNDREGS]);
+                pBndRegs = (PCX86XSAVEBNDREGS)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_BNDREGS_BIT]);
                 for (unsigned i = 0; i < RT_ELEMENTS(pBndRegs->aRegs); i += 2)
                     pHlp->pfnPrintf(pHlp, "%sBNDREG%u=%016RX64/%016RX64  %sBNDREG%u=%016RX64/%016RX64\n",
@@ -1748 +1749 @@
             {
                 PCX86XSAVEBNDCFG pBndCfg;
-                pBndCfg = (PCX86XSAVEBNDCFG)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_BNDCSR]);
+                pBndCfg = (PCX86XSAVEBNDCFG)((uint8_t *)pCtx->CTX_SUFF(pXState) + pCtx->aoffXState[XSAVE_C_BNDCSR_BIT]);
                 pHlp->pfnPrintf(pHlp, "%sBNDCFG.CONFIG=%016RX64 %sBNDCFG.STATUS=%016RX64\n",
                                 pszPrefix, pBndCfg->fConfig, pszPrefix, pBndCfg->fStatus);