Changeset 45908 in vbox for trunk/src/VBox/VMM

Timestamp:

May 6, 2013 12:59:37 PM (12 years ago)

Author:

vboxsync

Message:

Don't OR status codes together, just AssertRCReturn immediately. If two methods fails with different statuses, we'll be *very* confused. Also, for (human) analysis, return VINF_SUCCESS when you mean no informational statuses are used. int rc = VINF_SUCCESS; at the top and return rc; at the bottom *might* save an xor eax,eax; instruction in the slow path, but it makes it harder to read. (It also forces the compiler to remember the last rc value, which might not come without a cost on register starved 32-bit.)

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -4727 +4727 @@
 static int hmR0VmxSaveGuestCR0(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
-    int rc = VINF_SUCCESS;
     if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_CR0))
     {
         uint32_t uVal    = 0;
+        int rc = VMXReadVmcs32(VMX_VMCS_GUEST_CR0,            &uVal);
+        AssertRCReturn(rc, rc);
         uint32_t uShadow = 0;
-        rc  = VMXReadVmcs32(VMX_VMCS_GUEST_CR0,            &uVal);
-        rc |= VMXReadVmcs32(VMX_VMCS_CTRL_CR0_READ_SHADOW, &uShadow);
+        rc     = VMXReadVmcs32(VMX_VMCS_CTRL_CR0_READ_SHADOW, &uShadow);
         AssertRCReturn(rc, rc);
+
         uVal = (uShadow & pVCpu->hm.s.vmx.cr0_mask) | (uVal & ~pVCpu->hm.s.vmx.cr0_mask);
         CPUMSetGuestCR0(pVCpu, uVal);
         pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_CR0;
     }
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -4837 +4838 @@
 static int hmR0VmxSaveGuestRflags(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
-    int rc = VINF_SUCCESS;
     if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RFLAGS))
     {
         uint32_t uVal = 0;
-        rc = VMXReadVmcs32(VMX_VMCS_GUEST_RFLAGS, &uVal);
+        int rc = VMXReadVmcs32(VMX_VMCS_GUEST_RFLAGS, &uVal);
         AssertRCReturn(rc, rc);
         pMixedCtx->eflags.u32 = uVal;
@@ -4857 +4857 @@
         pVCpu->hm.s.vmx.fUpdatedGuestState |= HMVMX_UPDATED_GUEST_RFLAGS;
     }
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -5137 +5137 @@
  */
 DECLINLINE(int) hmR0VmxReadSegmentReg(PVMCPU pVCpu, uint32_t idxSel, uint32_t idxLimit, uint32_t idxBase, uint32_t idxAccess,
-                                    PCPUMSELREG pSelReg)
+                                      PCPUMSELREG pSelReg)
 {
     uint32_t u32Val = 0;
     int rc = VMXReadVmcs32(idxSel, &u32Val);
+    AssertRCReturn(rc, rc);
     pSelReg->Sel      = (uint16_t)u32Val;
     pSelReg->ValidSel = (uint16_t)u32Val;
     pSelReg->fFlags   = CPUMSELREG_FLAGS_VALID;
 
-    rc |= VMXReadVmcs32(idxLimit, &u32Val);
+    rc = VMXReadVmcs32(idxLimit, &u32Val);
+    AssertRCReturn(rc, rc);
     pSelReg->u32Limit = u32Val;
 
     RTGCUINTREG uGCVal = 0;
-    rc |= VMXReadVmcsGstNByIdxVal(idxBase, &uGCVal);
+    rc = VMXReadVmcsGstNByIdxVal(idxBase, &uGCVal);
+    AssertRCReturn(rc, rc);
     pSelReg->u64Base = uGCVal;
 
-    rc |= VMXReadVmcs32(idxAccess, &u32Val);
+    rc = VMXReadVmcs32(idxAccess, &u32Val);
+    AssertRCReturn(rc, rc);
     pSelReg->Attr.u = u32Val;
-    AssertRCReturn(rc, rc);
 
     /*
@@ -5168 +5171 @@
         pSelReg->Attr.u = HMVMX_SEL_UNUSABLE;
     }
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -5195 +5198 @@
 static int hmR0VmxSaveGuestSegmentRegs(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
 {
-    int rc = VINF_SUCCESS;
-
     /* Guest segment registers. */
     if (!(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_SEGMENT_REGS))
     {
-        rc  = hmR0VmxSaveGuestCR0(pVCpu, pMixedCtx);
-        rc |= VMXLOCAL_READ_SEG(CS, cs);
-        rc |= VMXLOCAL_READ_SEG(SS, ss);
-        rc |= VMXLOCAL_READ_SEG(DS, ds);
-        rc |= VMXLOCAL_READ_SEG(ES, es);
-        rc |= VMXLOCAL_READ_SEG(FS, fs);
-        rc |= VMXLOCAL_READ_SEG(GS, gs);
+        int rc = hmR0VmxSaveGuestCR0(pVCpu, pMixedCtx);
+        AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(CS, cs);
+        AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(SS, ss);
+        AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(DS, ds);
+        AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(ES, es);
+        AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(FS, fs);
+        AssertRCReturn(rc, rc);
+        rc = VMXLOCAL_READ_SEG(GS, gs);
         AssertRCReturn(rc, rc);
 
@@ -5222 +5229 @@
     }
 
-    return rc;
+    return VINF_SUCCESS;
 }
 
@@ -7629 +7636 @@
     /* EMInterpretRdmsr() requires CR0, Eflags and SS segment register. */
     int rc = hmR0VmxSaveGuestCR0(pVCpu, pMixedCtx);
-    rc    |= hmR0VmxSaveGuestRflags(pVCpu, pMixedCtx);
-    rc    |= hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
+    AssertRCReturn(rc, rc);
+    rc     = hmR0VmxSaveGuestRflags(pVCpu, pMixedCtx);
+    AssertRCReturn(rc, rc);
+    rc     = hmR0VmxSaveGuestSegmentRegs(pVCpu, pMixedCtx);
     AssertRCReturn(rc, rc);