Changeset 14176 in vbox

Timestamp:

Nov 13, 2008 1:35:36 PM (16 years ago)

Author:

vboxsync

Message:

sigh.

File:

• trunk/src/VBox/VMM/VMMInternal.h (modified) (4 diffs)

trunk/src/VBox/VMM/VMMInternal.h

@@ -197 +197 @@
     /** Array of offsets to the different switchers within the core code. */
     RTUINT                      aoffSwitchers[VMMSWITCHER_MAX];
-
-    /** Host to guest switcher entry point. */
-    R0PTRTYPE(PFNVMMSWITCHERHC) pfnHostToGuestR0;
-    /** Guest to host switcher entry point. */
-    RCPTRTYPE(PFNVMMSWITCHERRC) pfnGuestToHostRC;
-    /** Call Trampoline. See vmmGCCallTrampoline(). */
-    RTRCPTR                     pfnCallTrampolineRC;
-
+    uint32_t                    u32Padding0; /**< Alignment padding. */
+
+    /** The last RC/R0 return code. */
+    RTINT                       iLastGZRc;
     /** Resume Guest Execution. See CPUMGCResumeGuest(). */
     RTRCPTR                     pfnCPUMRCResumeGuest;
     /** Resume Guest Execution in V86 mode. See CPUMGCResumeGuestV86(). */
     RTRCPTR                     pfnCPUMRCResumeGuestV86;
-    /** The last RC/R0 return code. */
-    RTINT                       iLastGZRc;
+    /** Call Trampoline. See vmmGCCallTrampoline(). */
+    RTRCPTR                     pfnCallTrampolineRC;
+    /** Guest to host switcher entry point. */
+    RCPTRTYPE(PFNVMMSWITCHERRC) pfnGuestToHostRC;
+    /** Host to guest switcher entry point. */
+    R0PTRTYPE(PFNVMMSWITCHERHC) pfnHostToGuestR0;
     /** @}  */
 
@@ -221 +221 @@
     /** Pointer to the bottom of the stack - needed for doing relocations. */
     RCPTRTYPE(uint8_t *)        pbEMTStackBottomRC;
-#if HC_ARCH_BITS == 32
-    uint32_t                    u32Padding0; /**< Alignment padding. */
-#endif
 
     /** @name Logging
@@ -242 +239 @@
      * This is NULL if logging is disabled. */
     R0PTRTYPE(PVMMR0LOGGER)     pR0LoggerR0;
-#ifdef VBOX_WITH_RC_RELEASE_LOGGING
     /** Pointer to the GC release logger instance - R3 Ptr. */
     R3PTRTYPE(PRTLOGGERRC)      pRCRelLoggerR3;
@@ -250 +246 @@
      * This may differ from cbRCLogger. */
     uint32_t                    cbRCRelLogger;
-#else  /* !VBOX_WITH_RC_RELEASE_LOGGING */
-    RTR3PTR                     pR3Padding0; /**< Alignment padding. */
-#endif /* !VBOX_WITH_RC_RELEASE_LOGGING */
     /** @} */