Changeset 62440 in vbox for trunk

Timestamp:

Jul 22, 2016 1:14:01 PM (8 years ago)

Author:

vboxsync

Message:

VMM: More MSC level 4 warning fixes.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/CPUMAllRegs.cpp (modified) (1 diff)
• VMMAll/CPUMStack.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• VMMRC/CPUMRC.cpp (modified) (2 diffs)

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

@@ -46 +46 @@
 
 /** Disable stack frame pointer generation here. */
-#if defined(_MSC_VER) && !defined(DEBUG)
+#if defined(_MSC_VER) && !defined(DEBUG) && defined(RT_ARCH_X86)
 # pragma optimize("y", off)
 #endif

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

@@ -25 +25 @@
 #include <VBox/vmm/mm.h>
 
-/** Disable stack frame pointer generation here. */
-#if defined(_MSC_VER) && !defined(DEBUG)
-# pragma optimize("y", off)
-#endif
-
 
 VMMDECL(void) CPUMPushHyper(PVMCPU pVCpu, uint32_t u32)

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

@@ -5315 +5315 @@
     /** @todo replace with hmR0VmxEnterRootMode() and hmR0VmxLeaveRootMode(). */
     /* Make sure the VMX instructions don't cause #UD faults. */
-    SUPR0ChangeCR4(X86_CR4_VMXE, ~0);
+    SUPR0ChangeCR4(X86_CR4_VMXE, RTCCUINTREG_MAX);
 
     /* Re-enter VMX Root Mode */

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

@@ -88 +88 @@
 DECLASM(void) CPUMRCAssertPreExecutionSanity(PVM pVM)
 {
+#ifdef VBOX_STRICT
     /*
      * Check some important assumptions before resuming guest execution.
@@ -107 +108 @@
     AssertMsg(CPUMIsGuestInRawMode(pVCpu),           ("cs:eip=%04x:%08x ss:esp=%04x:%08x cpl=%u raw/efl=%#x/%#x%s\n", pCtx->cs.Sel, pCtx->eip, pCtx->ss.Sel, pCtx->esp, uRawCpl, u32EFlags, pCtx->eflags.u, fPatch ? " patch" : ""));
     //Log2(("cs:eip=%04x:%08x ss:esp=%04x:%08x cpl=%u raw/efl=%#x/%#x%s\n", pCtx->cs.Sel, pCtx->eip, pCtx->ss.Sel, pCtx->esp, uRawCpl, u32EFlags, pCtx->eflags.u, fPatch ? " patch" : ""));
+#endif
 }