Changeset 13193

Timestamp:

10/13/08 08:30:04 (3 months ago)

Author:

vboxsync

Message:

uint64_t conversion fix

Files:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (1 diff)

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

@@ -2642 +2642 @@
-        return VERR_EM_INTERPRETER; /* not supported */
-
-(uint64_t)pRegFrame->eax | ((uint64_t)pRegFrame->edx << 32ULL
+RT_MAKE_U64(pRegFrame->eax, pRegFrame->edx
-    Log(("EMInterpretWrmsr %s (%x) val=%VX64\n", emMSRtoString(pRegFrame->ecx), pRegFrame->ecx, val));
-    switch (pRegFrame->ecx)

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

@@ -2282 +2282 @@
-        AssertRC(rc);
-#else
+        uint32_t val_hi;
-        rc = VMXReadVMCS(VMX_VMCS_EXIT_PHYS_ADDR_FULL, &val);
-        AssertRC(rc);
-GCPhys = val
-rc = VMXReadVMCS(VMX_VMCS_EXIT_PHYS_ADDR_HIGH, &val
-|= (val << 32ULL);      
+rc = VMXReadVMCS(VMX_VMCS_EXIT_PHYS_ADDR_HIGH, &val_hi)
+AssertRC(rc
+= RT_MAKE_U64(val, val_hi);
-#endif
-