Changeset 55469 in vbox

Timestamp:

Apr 28, 2015 12:27:43 AM (10 years ago)

Author:

vboxsync

Message:

cpumctx.h: Fixes.

File:

• trunk/include/VBox/vmm/cpumctx.h (modified) (1 diff)

trunk/include/VBox/vmm/cpumctx.h

@@ -432 +432 @@
  *
  */
-#if defined(VBOX_STRICT) && defined(RT_COMPILER_SUPPORTS_LAMDA)
+#if defined(VBOX_STRICT) && defined(RT_COMPILER_SUPPORTS_LAMBDA)
 # define CPUMCTX_XSAVE_C_PTR(a_pCtx, a_iCompBit, a_PtrType) \
-    ([](PCCPUMCTX pCtx) -> a_PtrType \
+    ([](PCCPUMCTX a_pLambdaCtx) -> a_PtrType \
     { \
         AssertCompile((a_iCompBit) < 64U); \
-        AssertMsg((pCtx)->fXStateMask & RT_BIT_64(a_iCompBit), (#a_iCompBit "\n")); \
-        AssertMsg((pCtx)->aoffXState[(a_iCompBit)] != UINT16_MAX, (#a_iCompBit "\n")); \
-        return (a_PtrType)((uint8_t *)(pCtx)->CTX_SUFF(pXState) + pCtx->aoffXState[(a_iCompBit)]); \
+        AssertMsg(a_pLambdaCtx->fXStateMask & RT_BIT_64(a_iCompBit), (#a_iCompBit "\n")); \
+        AssertMsg(a_pLambdaCtx->aoffXState[(a_iCompBit)] != UINT16_MAX, (#a_iCompBit "\n")); \
+        return (a_PtrType)((uint8_t *)a_pLambdaCtx->CTX_SUFF(pXState) + a_pLambdaCtx->aoffXState[(a_iCompBit)]); \
     }(a_pCtx))
 #elif defined(VBOX_STRICT) && defined(__GNUC__)
 # define CPUMCTX_XSAVE_C_PTR(a_pCtx, a_iCompBit, a_PtrType) \
-    __extension__ ({ \
-                        AssertCompile((a_iCompBit) < 64U); \
-                        AssertMsg((a_pCtx)->fXStateMask & RT_BIT_64(a_iCompBit), (#a_iCompBit "\n")); \
-                        AssertMsg((a_pCtx)->aoffXState[(a_iCompBit)] != UINT16_MAX, (#a_iCompBit "\n")); \
-                        (a_PtrType)((uint8_t *)(a_pCtx)->CTX_SUFF(pXState) + pCtx->aoffXState[(a_iCompBit)]); \
-                   })
+    __extension__ (\
+    { \
+        AssertCompile((a_iCompBit) < 64U); \
+        AssertMsg((a_pCtx)->fXStateMask & RT_BIT_64(a_iCompBit), (#a_iCompBit "\n")); \
+        AssertMsg((a_pCtx)->aoffXState[(a_iCompBit)] != UINT16_MAX, (#a_iCompBit "\n")); \
+        (a_PtrType)((uint8_t *)(a_pCtx)->CTX_SUFF(pXState) + (a_pCtx)->aoffXState[(a_iCompBit)]); \
+    })
 #else
 # define CPUMCTX_XSAVE_C_PTR(a_pCtx, a_iCompBit, a_PtrType) \
-    ((a_PtrType)((uint8_t *)(a_pCtx)->CTX_SUFF(pXState) + pCtx->aoffXState[(a_iCompBit)]))
+    ((a_PtrType)((uint8_t *)(a_pCtx)->CTX_SUFF(pXState) + (a_pCtx)->aoffXState[(a_iCompBit)]))
 #endif