Changeset 15161 in vbox

Timestamp:

Dec 9, 2008 1:03:20 PM (16 years ago)

Author:

vboxsync

Message:

Backed out accidental commit 40567

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• EMAll.cpp (modified) (1 diff)
• HWACCMAll.cpp (modified) (1 diff)
• PGMAll.cpp (modified) (1 diff)

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

@@ -1901 +1901 @@
     /* Note: operates the same in 64 and non-64 bits mode. */
     CPUMGetGuestCpuId(pVM, iLeaf, &pRegFrame->eax, &pRegFrame->ebx, &pRegFrame->ecx, &pRegFrame->edx);
-    LogFlow(("Emulate: CPUID %x -> %08x %08x %08x %08x\n", iLeaf, pRegFrame->eax, pRegFrame->ebx, pRegFrame->ecx, pRegFrame->edx));
+    Log(("Emulate: CPUID %x -> %08x %08x %08x %08x\n", iLeaf, pRegFrame->eax, pRegFrame->ebx, pRegFrame->ecx, pRegFrame->edx));
     return VINF_SUCCESS;
 }

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

@@ -107 +107 @@
 
 #if HC_ARCH_BITS == 32 
-        if (CPUMIsGuestInLongMode(pVM))
+        if (CPUMIsGuestInLongModeEx(pCtx))
             enmShwPagingMode = PGMMODE_AMD64_NX;
         else

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

@@ -366 +366 @@
 VMMDECL(int)     PGMTrap0eHandler(PVM pVM, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPTR pvFault)
 {
-    Log(("PGMTrap0eHandler: uErr=%RGu pvFault=%RGv eip=%RGv\n", uErr, pvFault, (RTGCPTR)pRegFrame->rip));
+    LogFlow(("PGMTrap0eHandler: uErr=%RGu pvFault=%RGv eip=%RGv\n", uErr, pvFault, (RTGCPTR)pRegFrame->rip));
     STAM_PROFILE_START(&pVM->pgm.s.StatRZTrap0e, a);
     STAM_STATS({ pVM->pgm.s.CTX_SUFF(pStatTrap0eAttribution) = NULL; } );