Changeset 67943 in vbox

Timestamp:

Jul 12, 2017 5:12:51 PM (8 years ago)

Author:

vboxsync

Message:

cpum.h: Fixes crash, follow up fixes to r116929

File:

• trunk/include/VBox/vmm/cpum.h (modified) (7 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -1326 +1326 @@
 DECLINLINE(bool) CPUMIsGuestSvmCtrlInterceptSet(PCCPUMCTX pCtx, uint64_t fIntercept)
 {
-    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-    return RT_BOOL(pVmcbCtrl->u64InterceptCtrl & fIntercept);
+    PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
+    return pVmcb && (pVmcb->ctrl.u64InterceptCtrl & fIntercept);
 }
 
@@ -1340 +1340 @@
 DECLINLINE(bool) CPUMIsGuestSvmReadCRxInterceptSet(PCCPUMCTX pCtx, uint8_t uCr)
 {
-    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-    return RT_BOOL(pVmcbCtrl->u16InterceptRdCRx & (1 << uCr));
+    PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
+    return pVmcb && (pVmcb->ctrl.u16InterceptRdCRx & (1 << uCr));
 }
 
@@ -1354 +1354 @@
 DECLINLINE(bool) CPUMIsGuestSvmWriteCRxInterceptSet(PCCPUMCTX pCtx, uint8_t uCr)
 {
-    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-    return RT_BOOL(pVmcbCtrl->u16InterceptWrCRx & (1 << uCr));
+    PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
+    return pVmcb && (pVmcb->ctrl.u16InterceptWrCRx & (1 << uCr));
 }
 
@@ -1368 +1368 @@
 DECLINLINE(bool) CPUMIsGuestSvmReadDRxInterceptSet(PCCPUMCTX pCtx, uint8_t uDr)
 {
-    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-    return RT_BOOL(pVmcbCtrl->u16InterceptRdDRx & (1 << uDr));
+    PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
+    return pVmcb && (pVmcb->ctrl.u16InterceptRdDRx & (1 << uDr));
 }
 
@@ -1382 +1382 @@
 DECLINLINE(bool) CPUMIsGuestSvmWriteDRxInterceptSet(PCCPUMCTX pCtx, uint8_t uDr)
 {
-    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-    return RT_BOOL(pVmcbCtrl->u16InterceptWrDRx & (1 << uDr));
+    PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
+    return pVmcb && (pVmcb->ctrl.u16InterceptWrDRx & (1 << uDr));
 }
 
@@ -1397 +1397 @@
 {
     Assert(uVector < 32);
-    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-    return RT_BOOL(pVmcbCtrl->u32InterceptXcpt & (UINT32_C(1) << uVector));
+    PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
+    return pVmcb && (pVmcb->ctrl.u32InterceptXcpt & (UINT32_C(1) << uVector));
 }
 #endif /* !IN_RC */
@@ -1415 +1415 @@
      */
 #ifndef IN_RC
-    PCSVMVMCBCTRL pVmcbCtrl = &pCtx->hwvirt.svm.CTX_SUFF(pVmcb)->ctrl;
-    return RT_BOOL(pVmcbCtrl && (pVmcbCtrl->u64InterceptCtrl & SVM_CTRL_INTERCEPT_VMRUN));
+    PCSVMVMCB pVmcb = pCtx->hwvirt.svm.CTX_SUFF(pVmcb);
+    return pVmcb && (pVmcb->ctrl.u64InterceptCtrl & SVM_CTRL_INTERCEPT_VMRUN);
 #else
     RT_NOREF(pCtx);