Changeset 24799 in vbox for trunk

Timestamp:

Nov 19, 2009 3:52:31 PM (15 years ago)

Author:

vboxsync

Message:

PGM/darwin: Fixed SMP in non-release builds.

Location:

trunk

Files:

• include/VBox/vm.h (modified) (1 diff)
• src/VBox/VMM/PGMInternal.h (modified) (3 diffs)
• src/VBox/VMM/testcase/Makefile.kmk (modified) (2 diffs)

trunk/include/VBox/vm.h

@@ -211 +211 @@
         struct PGMCPU       s;
 #endif
-        uint8_t             padding[28*1024];   /* multiple of 4096 */
+        uint8_t             padding[32*1024];   /* multiple of 4096 */
     } pgm;
 

trunk/src/VBox/VMM/PGMInternal.h

@@ -1564 +1564 @@
     /** The index of the current CPU, only valid if the set is open. */
     int32_t                     iCpu;
-#if HC_ARCH_BITS == 64
     uint32_t                    alignment;
-#endif
     /** The entries. */
     PGMMAPSETENTRY              aEntries[64];
@@ -1574 +1572 @@
     uint8_t                     aiHashTable[128];
 } PGMMAPSET;
+AssertCompileSizeAlignment(PGMMAPSET, 8);
 /** Pointer to the mapping cache set. */
 typedef PGMMAPSET *PPGMMAPSET;
@@ -2972 +2971 @@
     /** The guest's page directory pointer table, R0 pointer. */
     R0PTRTYPE(PX86PML4)             pGstAmd64Pml4R0;
+#else
+    RTR0PTR                         alignment6b; /**< alignment equalizer. */
 #endif
     /** @} */

trunk/src/VBox/VMM/testcase/Makefile.kmk

@@ -98 +98 @@
 tstVMStructGC_TEMPLATE  = VBOXGCEXE
 tstVMStructGC_DEFS      = IN_VMM_RC IN_DIS IN_RT_RC IN_RT_GC
+tstVMStructGC_DEFS.darwin.x86 = \
+        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_RC \
+        VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_RC
 ifdef VBOX_WITH_R0_LOGGING
 tstVMStructGC_DEFS     += VBOX_WITH_R0_LOGGING
@@ -106 +109 @@
 tstVMStructSize_TEMPLATE= VBOXR3AUTOTST
 tstVMStructSize_DEFS    = IN_VMM_R3 IN_DIS
+tstVMStructSize_DEFS.darwin.x86 = \
+        VBOX_WITH_2X_4GB_ADDR_SPACE   VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R3 \
+        VBOX_WITH_HYBRID_32BIT_KERNEL VBOX_WITH_HYBRID_32BIT_KERNEL_IN_R3
 tstVMStructSize_INCS    = $(VBOX_PATH_VMM_SRC) $(VBOX_PATH_VMM_SRC)/PATM $(VBOX_VMM_TESTCASE_OUT_DIR)
 tstVMStructSize_SOURCES = tstVMStructSize.cpp