Changeset 73097 in vbox for trunk/src/VBox/VMM/VMMR3/CPUM.cpp

Timestamp:

Jul 12, 2018 9:06:33 PM (6 years ago)

Author:

vboxsync

Message:

*: Made RT_UOFFSETOF, RT_OFFSETOF, RT_UOFFSETOF_ADD and RT_OFFSETOF_ADD work like builtin_offsetof() and require compile time resolvable requests, adding RT_UOFFSETOF_DYN for the dynamic questions that can only be answered at runtime.

File:

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

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

@@ -932 +932 @@
 
     /* Calculate the offset from CPUM to CPUMCPU for the first CPU. */
-    pVM->cpum.s.offCPUMCPU0 = RT_OFFSETOF(VM, aCpus[0].cpum) - RT_OFFSETOF(VM, cpum);
+    pVM->cpum.s.offCPUMCPU0 = RT_UOFFSETOF(VM, aCpus[0].cpum) - RT_UOFFSETOF(VM, cpum);
     Assert((uintptr_t)&pVM->cpum + pVM->cpum.s.offCPUMCPU0 == (uintptr_t)&pVM->aCpus[0].cpum);
 
@@ -941 +941 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
-        pVCpu->cpum.s.offCPUM = RT_OFFSETOF(VM, aCpus[i].cpum) - RT_OFFSETOF(VM, cpum);
+        pVCpu->cpum.s.offCPUM = RT_UOFFSETOF_DYN(VM, aCpus[i].cpum) - RT_UOFFSETOF(VM, cpum);
         Assert((uintptr_t)&pVCpu->cpum - pVCpu->cpum.s.offCPUM == (uintptr_t)&pVM->cpum);
     }
@@ -1190 +1190 @@
     AssertCompile(RTASSERT_OFFSET_OF(CPUMCTX, pXStateR0) < RTASSERT_OFFSET_OF(CPUMCTX, pXStateR3));
     AssertCompile(RTASSERT_OFFSET_OF(CPUMCTX, pXStateR0) < RTASSERT_OFFSET_OF(CPUMCTX, pXStateRC));
-    memset(pCtx, 0, RT_OFFSETOF(CPUMCTX, pXStateR0));
+    memset(pCtx, 0, RT_UOFFSETOF(CPUMCTX, pXStateR0));
 
     pVCpu->cpum.s.fUseFlags         = fUseFlags;
@@ -1264 +1264 @@
 
     pCtx->aXcr[0]                   = XSAVE_C_X87;
-    if (pVM->cpum.s.HostFeatures.cbMaxExtendedState >= RT_OFFSETOF(X86XSAVEAREA, Hdr))
+    if (pVM->cpum.s.HostFeatures.cbMaxExtendedState >= RT_UOFFSETOF(X86XSAVEAREA, Hdr))
     {
         /* The entire FXSAVE state needs loading when we switch to XSAVE/XRSTOR
@@ -2181 +2181 @@
                     if (pFpuCtx->au32RsrvdRest[i])
                         pHlp->pfnPrintf(pHlp, "%sRsrvdRest[%u]=%RX32 (offset=%#x)\n",
-                                        pszPrefix, i, pFpuCtx->au32RsrvdRest[i], RT_OFFSETOF(X86FXSTATE, au32RsrvdRest[i]) );
+                                        pszPrefix, i, pFpuCtx->au32RsrvdRest[i], RT_UOFFSETOF_DYN(X86FXSTATE, au32RsrvdRest[i]) );
             }