Changeset 66848 in vbox for trunk/src

Timestamp:

May 9, 2017 1:04:57 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115309

Message:

VMM: use RT_LO/HI_U32 at certain places

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/EMAll.cpp (modified) (3 diffs)
• VMMAll/IEMAllCImpl.cpp.h (modified) (2 diffs)
• VMMR0/HMSVMR0.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (3 diffs)
• VMMR3/VMM.cpp (modified) (1 diff)
• VMMR3/VMMTests.cpp (modified) (1 diff)
• VMMRC/TRPMRCHandlers.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -1317 +1317 @@
 
     /* Same behaviour in 32 & 64 bits mode */
-    pRegFrame->rax = (uint32_t)uTicks;
-    pRegFrame->rdx = (uTicks >> 32ULL);
+    pRegFrame->rax = RT_LO_U32(uTicks);
+    pRegFrame->rdx = RT_HI_U32(uTicks);
 #ifdef VBOX_COMPARE_IEM_AND_EM
     g_fIgnoreRaxRdx = true;
@@ -1353 +1353 @@
 
     /* Same behaviour in 32 & 64 bits mode */
-    pCtx->rax = (uint32_t)uTicks;
-    pCtx->rdx = (uTicks >> 32ULL);
+    pCtx->rax = RT_LO_U32(uTicks);
+    pCtx->rdx = RT_HI_U32(uTicks);
 #ifdef VBOX_COMPARE_IEM_AND_EM
     g_fIgnoreRaxRdx = true;
@@ -1580 +1580 @@
         return VERR_EM_INTERPRETER;
     }
-    pRegFrame->rax = (uint32_t) uValue;
-    pRegFrame->rdx = (uint32_t)(uValue >> 32);
+    pRegFrame->rax = RT_LO_U32(uValue);
+    pRegFrame->rdx = RT_HI_U32(uValue);
     LogFlow(("EMInterpretRdmsr %s (%x) -> %RX64\n", emMSRtoString(pRegFrame->ecx), pRegFrame->ecx, uValue));
     return VINF_SUCCESS;

trunk/src/VBox/VMM/VMMAll/IEMAllCImpl.cpp.h

@@ -5779 +5779 @@
      */
     uint64_t uTicks = TMCpuTickGet(pVCpu);
-    pCtx->rax = (uint32_t)uTicks;
-    pCtx->rdx = uTicks >> 32;
+    pCtx->rax = RT_LO_U32(uTicks);
+    pCtx->rdx = RT_HI_U32(uTicks);
 #ifdef IEM_VERIFICATION_MODE_FULL
     pVCpu->iem.s.fIgnoreRaxRdx = true;
@@ -5827 +5827 @@
 
         uint64_t uTicks = TMCpuTickGet(pVCpu);
-        pCtx->rax = (uint32_t)uTicks;
-        pCtx->rdx = uTicks >> 32;
+        pCtx->rax = RT_LO_U32(uTicks);
+        pCtx->rdx = RT_HI_U32(uTicks);
 #ifdef IEM_VERIFICATION_MODE_FULL
         pVCpu->iem.s.fIgnoreRaxRdx = true;

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

@@ -984 +984 @@
 {
     uint32_t aParam[8];
-    aParam[0] = (uint32_t)(HCPhysVmcbHost);             /* Param 1: HCPhysVmcbHost - Lo. */
-    aParam[1] = (uint32_t)(HCPhysVmcbHost >> 32);       /* Param 1: HCPhysVmcbHost - Hi. */
-    aParam[2] = (uint32_t)(HCPhysVmcb);                 /* Param 2: HCPhysVmcb - Lo. */
-    aParam[3] = (uint32_t)(HCPhysVmcb >> 32);           /* Param 2: HCPhysVmcb - Hi. */
+    aParam[0] = RT_LO_U32(HCPhysVmcbHost);              /* Param 1: HCPhysVmcbHost - Lo. */
+    aParam[1] = RT_HI_U32(HCPhysVmcbHost);              /* Param 1: HCPhysVmcbHost - Hi. */
+    aParam[2] = RT_LO_U32(HCPhysVmcb);                  /* Param 2: HCPhysVmcb - Lo. */
+    aParam[3] = RT_HI_U32(HCPhysVmcb);                  /* Param 2: HCPhysVmcb - Hi. */
     aParam[4] = VM_RC_ADDR(pVM, pVM);
     aParam[5] = 0;

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

@@ -5399 +5399 @@
 
     uint32_t aParam[10];
-    aParam[0] = (uint32_t)(HCPhysCpuPage);                              /* Param 1: VMXON physical address - Lo. */
-    aParam[1] = (uint32_t)(HCPhysCpuPage >> 32);                        /* Param 1: VMXON physical address - Hi. */
-    aParam[2] = (uint32_t)(pVCpu->hm.s.vmx.HCPhysVmcs);                 /* Param 2: VMCS physical address - Lo. */
-    aParam[3] = (uint32_t)(pVCpu->hm.s.vmx.HCPhysVmcs >> 32);           /* Param 2: VMCS physical address - Hi. */
+    aParam[0] = RT_LO_U32(HCPhysCpuPage);                               /* Param 1: VMXON physical address - Lo. */
+    aParam[1] = RT_HI_U32(HCPhysCpuPage);                               /* Param 1: VMXON physical address - Hi. */
+    aParam[2] = RT_LO_U32(pVCpu->hm.s.vmx.HCPhysVmcs);                  /* Param 2: VMCS physical address - Lo. */
+    aParam[3] = RT_HI_U32(pVCpu->hm.s.vmx.HCPhysVmcs);                  /* Param 2: VMCS physical address - Hi. */
     aParam[4] = VM_RC_ADDR(pVM, &pVM->aCpus[pVCpu->idCpu].hm.s.vmx.VMCSCache);
     aParam[5] = 0;
@@ -5583 +5583 @@
         case VMX_VMCS64_HOST_PERF_GLOBAL_CTRL_FULL:
         {
-            rc  = VMXWriteVmcs32(idxField, u64Val);
-            rc |= VMXWriteVmcs32(idxField + 1, (uint32_t)(u64Val >> 32));
+            rc  = VMXWriteVmcs32(idxField,     RT_LO_U32(u64Val));
+            rc |= VMXWriteVmcs32(idxField + 1, RT_HI_U32(u64Val));
             break;
         }
@@ -5609 +5609 @@
         case VMX_VMCS_GUEST_SYSENTER_EIP:
         {
-            if (!(u64Val >> 32))
+            if (!(RT_HI_U32(u64Val)))
             {
                 /* If this field is 64-bit, VT-x will zero out the top bits. */
-                rc = VMXWriteVmcs32(idxField, (uint32_t)u64Val);
+                rc = VMXWriteVmcs32(idxField, RT_LO_U32(u64Val));
             }
             else

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

@@ -626 +626 @@
         CPUMSetHyperESP(pVCpu, pVCpu->vmm.s.pbEMTStackBottomRC); /* Clear the stack. */
         uint64_t u64TS = RTTimeProgramStartNanoTS();
-        CPUMPushHyper(pVCpu, (uint32_t)(u64TS >> 32));    /* Param 4: The program startup TS - Hi. */
-        CPUMPushHyper(pVCpu, (uint32_t)u64TS);            /* Param 4: The program startup TS - Lo. */
+        CPUMPushHyper(pVCpu, RT_HI_U32(u64TS));           /* Param 4: The program startup TS - Hi. */
+        CPUMPushHyper(pVCpu, RT_LO_U32(u64TS));           /* Param 4: The program startup TS - Lo. */
         CPUMPushHyper(pVCpu, vmmGetBuildType());          /* Param 3: Version argument. */
         CPUMPushHyper(pVCpu, VMMGetSvnRev());             /* Param 2: Version argument. */

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

@@ -113 +113 @@
                                      "    MVO(%#010llx, \"MSR\", UINT64_C(%#018llx)),\n", paResults[i].uMsr, paResults[i].uValue);
                     RTPrintf("%#010llx = %#010x`%08x\n", paResults[i].uMsr,
-                             (uint32_t)(paResults[i].uValue >> 32), (uint32_t)paResults[i].uValue);
+                             RT_HI_U32(paResults[i].uValue), RT_LO_U32(paResults[i].uValue));
                 }
                 cMsrsFound++;

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -1053 +1053 @@
 
     uint64_t uTicks = TMCpuTickGet(pVCpu);
-    pRegFrame->eax = uTicks;
-    pRegFrame->edx = uTicks >> 32;
+    pRegFrame->eax = RT_LO_U32(uTicks);
+    pRegFrame->edx = RT_HI_U32(uTicks);
     pRegFrame->eip += 2;
     TRPM_EXIT_DBG_HOOK(0xd);