Changeset 47636 in vbox

Timestamp:

Aug 9, 2013 1:09:54 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Build fix.

File:

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

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

@@ -7488 +7488 @@
          * 64-bit checks.
          */
+# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
         if (HMVMX_IS_64BIT_HOST_MODE())
         {
@@ -7520 +7521 @@
             HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(u64Val), VMX_IGS_SYSENTER_EIP_NOT_CANONICAL);
         }
+#endif
 
         /*
@@ -7676 +7678 @@
             }
             /* 64-bit capable CPUs. */
+# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
             if (HMVMX_IS_64BIT_HOST_MODE())
             {
@@ -7683 +7686 @@
                 HMVMX_CHECK_BREAK((pCtx->es.Attr.u & X86DESCATTR_UNUSABLE) || !(pCtx->es.u64Base >> 32), VMX_IGS_LONGMODE_ES_BASE_INVALID);
             }
+#endif
         }
         else if (   CPUMIsGuestInV86ModeEx(pCtx)
@@ -7728 +7732 @@
             HMVMX_CHECK_BREAK(u32GSAttr == 0xf3, VMX_IGS_V86_GS_ATTR_INVALID);
             /* 64-bit capable CPUs. */
+# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
             if (HMVMX_IS_64BIT_HOST_MODE())
             {
@@ -7735 +7740 @@
                 HMVMX_CHECK_BREAK((pCtx->es.Attr.u & X86DESCATTR_UNUSABLE) || !(pCtx->es.u64Base >> 32), VMX_IGS_LONGMODE_ES_BASE_INVALID);
             }
+#endif
         }
 
@@ -7740 +7746 @@
          * GDTR and IDTR.
          */
+# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
         if (HMVMX_IS_64BIT_HOST_MODE())
         {
@@ -7750 +7757 @@
             HMVMX_CHECK_BREAK(HMVMX_IS_CANONICAL(u64Val), VMX_IGS_IDTR_BASE_NOT_CANONICAL);
         }
+#endif
 
         rc = VMXReadVmcs32(VMX_VMCS32_GUEST_GDTR_LIMIT, &u32Val);
@@ -7763 +7771 @@
          */
         uint32_t u32EFlags;
+# if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
         if (HMVMX_IS_64BIT_HOST_MODE())
         {
@@ -7771 +7780 @@
                 || !pCtx->cs.Attr.n.u1Long )
             {
-                HMVMX_CHECK_BREAK(!(u64Val & 0xffffffff00000000), VMX_IGS_LONGMODE_RIP_INVALID);
+                HMVMX_CHECK_BREAK(!(u64Val & UINT64_C(0xffffffff00000000)), VMX_IGS_LONGMODE_RIP_INVALID);
             }
             /** @todo If the processor supports N < 64 linear-address bits, bits 63:N
@@ -7786 +7795 @@
         }
         else
+#endif
         {
             rc = VMXReadVmcs32(VMX_VMCS_GUEST_RFLAGS, &u32EFlags);