Changeset 14174 in vbox

Timestamp:

Nov 13, 2008 1:23:56 PM (16 years ago)

Author:

vboxsync

Message:

VMM: another shot at it.

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMInternal.h (modified) (6 diffs)

trunk/src/VBox/VMM/PGMInternal.h

@@ -1236 +1236 @@
  */
 #define PGM_PAGER3MAPTLB_IDX(GCPhys)    ( ((GCPhys) >> PAGE_SHIFT) & (PGM_PAGER3MAPTLB_ENTRIES - 1) )
+
+
+/**
+ * Mapping cache usage set entry.
+ */
+typedef struct PGMMAPSETENTRY
+{
+    /** The mapping cache index. */
+    uint16_t                    iMap;
+    /** The number of references. */
+    uint16_t                    cRef;
+} PGMMAPSETENTRY;
+/** Pointer to a mapping cache usage set entry. */
+typedef PGMMAPSETENTRY *PPGMMAPSETENTRY;
+
+/**
+ * .
+ */
+typedef struct PGMMAPSET
+{
+
+};
 
 

trunk/src/VBox/VMM/VMMInternal.h

@@ -184 +184 @@
     /** Pointer to core code guest context mapping. */
     RTRCPTR                     pvCoreCodeRC;
+    RTRCPTR                     pRCPadding0; /**< Alignment padding */
 #ifdef VBOX_WITH_NMI
     /** The guest context address of the APIC (host) mapping. */
     RTRCPTR                     GCPtrApicBase;
-    RTRCPTR                     pGCPadding0; /**< Alignment padding */
+    RTRCPTR                     pRCPadding1; /**< Alignment padding */
 #endif
     /** The current switcher.
      * This will be set before the VMM is fully initialized. */
     VMMSWITCHER                 enmSwitcher;
+    /** Flag to disable the switcher permanently (VMX) (boolean) */
+    bool                        fSwitcherDisabled;
     /** Array of offsets to the different switchers within the core code. */
     RTUINT                      aoffSwitchers[VMMSWITCHER_MAX];
-    /** Flag to disable the switcher permanently (VMX) (boolean) */
-    bool                        fSwitcherDisabled;
-//#if HC_ARCH_BITS == 64
-    uint32_t                    u32PaddingMinus1; /**< Alignment padding. */
-//#endif
 
     /** Host to guest switcher entry point. */
@@ -213 +211 @@
     /** The last RC/R0 return code. */
     RTINT                       iLastGZRc;
-#if HC_ARCH_BITS == 64
-    uint32_t                    u32Padding0; /**< Alignment padding. */
-#endif
     /** @}  */
 
@@ -226 +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
@@ -238 +236 @@
      * This is NULL if logging is disabled. */
     R3PTRTYPE(PRTLOGGERRC)      pRCLoggerR3;
-#ifdef VBOX_WITH_RC_RELEASE_LOGGING
-    /** Size of the allocated release logger instance (pRCRelLoggerRC/pRCRelLoggerR3).
-     * This may differ from cbRCLogger. */
-    uint32_t                    cbRCRelLogger;
-    /** Pointer to the GC release logger instance - RC Ptr. */
-    RCPTRTYPE(PRTLOGGERRC)      pRCRelLoggerRC;
-    /** Pointer to the GC release logger instance - R3 Ptr. */
-    R3PTRTYPE(PRTLOGGERRC)      pRCRelLoggerR3;
-#endif /* VBOX_WITH_RC_RELEASE_LOGGING */
     /** Pointer to the R0 logger instance - R3 Ptr.
      * This is NULL if logging is disabled. */
@@ -253 +242 @@
      * This is NULL if logging is disabled. */
     R0PTRTYPE(PVMMR0LOGGER)     pR0LoggerR0;
-#if HC_ARCH_BITS == 32
-    uint32_t                    u32Padding1; /**< Alignment padding. */
-#endif
+#ifdef VBOX_WITH_RC_RELEASE_LOGGING
+    /** Pointer to the GC release logger instance - R3 Ptr. */
+    R3PTRTYPE(PRTLOGGERRC)      pRCRelLoggerR3;
+    /** Pointer to the GC release logger instance - RC Ptr. */
+    RCPTRTYPE(PRTLOGGERRC)      pRCRelLoggerRC;
+    /** Size of the allocated release logger instance (pRCRelLoggerRC/pRCRelLoggerR3).
+     * This may differ from cbRCLogger. */
+    uint32_t                    cbRCRelLogger;
+#else  /* !VBOX_WITH_RC_RELEASE_LOGGING */
+    RTR3PTR                     pR3Padding0; /**< Alignment padding. */
+#endif /* !VBOX_WITH_RC_RELEASE_LOGGING */
     /** @} */
 
@@ -270 +267 @@
     uint32_t                    cYieldEveryMillies;
 #if HC_ARCH_BITS == 32
-    uint32_t                    u32Padding0; /**< Alignment padding. */
+    RTR3PTR                     pR3Padding1; /**< Alignment padding. */
 #endif
     /** The timestamp of the previous yield. (nano) */