Changeset 2818 in vbox

Timestamp:

May 23, 2007 3:27:30 PM (18 years ago)

Author:

vboxsync

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

21433

Message:

Corrections for 64 bits shifts.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWACCMR0.cpp (modified) (1 diff)
• HWVMXR0.cpp (modified) (1 diff)

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

@@ -418 +418 @@
 
 #if HC_ARCH_BITS == 64
-    uint64_t    u32Base =  Desc->Gen.u32BaseHigh3 << 32ULL | Desc->Gen.u8BaseHigh2 << 24ULL | Desc->Gen.u8BaseHigh1 << 16ULL | Desc->Gen.u16BaseLow;
+    uint64_t    u32Base =  ((uintptr_t)Desc->Gen.u32BaseHigh3 << 32ULL) | Desc->Gen.u8BaseHigh2 << 24ULL | Desc->Gen.u8BaseHigh1 << 16ULL | Desc->Gen.u16BaseLow;
 
     Log(("%s %04x - %VX64 %VX64 - base=%VX64 limit=%08x dpl=%d %s\n", pszMsg,

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

@@ -496 +496 @@
         pDesc  = &((PX86DESCHC)gdtr.pGdt)[SelTR >> X86_SEL_SHIFT_HC];
 #if HC_ARCH_BITS == 64
-        trBase = pDesc->Gen.u16BaseLow | (pDesc->Gen.u8BaseHigh1 << 16ULL) | (pDesc->Gen.u8BaseHigh2 << 24ULL) | pDesc->Gen.u32BaseHigh3 << 32ULL;
+        trBase = pDesc->Gen.u16BaseLow | (pDesc->Gen.u8BaseHigh1 << 16ULL) | (pDesc->Gen.u8BaseHigh2 << 24ULL) | ((uintptr_t)pDesc->Gen.u32BaseHigh3 << 32ULL);
 #else
         trBase = pDesc->Gen.u16BaseLow | (pDesc->Gen.u8BaseHigh1 << 16) | (pDesc->Gen.u8BaseHigh2 << 24);