Changeset 11893 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 1, 2008 7:33:46 AM (16 years ago)

Author:

vboxsync

Message:

CPUMPushHyper correction for 64 bits guests

File:

• trunk/src/VBox/VMM/VMM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMM.cpp

@@ -689 +689 @@
         CPUMSetHyperESP(pVM, pVM->vmm.s.pbGCStackBottom); /* Clear the stack. */
         uint64_t u64TS = RTTimeProgramStartNanoTS();
-#if GC_ARCH_BITS == 32
         CPUMPushHyper(pVM, (uint32_t)(u64TS >> 32));    /* Param 3: The program startup TS - Hi. */
         CPUMPushHyper(pVM, (uint32_t)u64TS);            /* Param 3: The program startup TS - Lo. */
-#else /* 64-bit GC */
-        CPUMPushHyper(pVM, u64TS);                      /* Param 3: The program startup TS. */
-#endif
         CPUMPushHyper(pVM, VMMGetSvnRev());             /* Param 2: Version argument. */
         CPUMPushHyper(pVM, VMMGC_DO_VMMGC_INIT);        /* Param 1: Operation. */
@@ -1612 +1608 @@
     SSMR3PutGCPtr(pSSM, pVM->vmm.s.pbGCStackBottom);
     RTGCPTR GCPtrESP = CPUMGetHyperESP(pVM);
-    Assert(pVM->vmm.s.pbGCStackBottom - GCPtrESP <= VMM_STACK_SIZE);
+    AssertMsg(pVM->vmm.s.pbGCStackBottom - GCPtrESP <= VMM_STACK_SIZE, ("Bottom %VGv ESP=%VGv\n", pVM->vmm.s.pbGCStackBottom, GCPtrESP));
     SSMR3PutGCPtr(pSSM, GCPtrESP);
     SSMR3PutMem(pSSM, pVM->vmm.s.pbHCStack, VMM_STACK_SIZE);