Changeset 686 in vbox for trunk

Timestamp:

Feb 6, 2007 5:04:10 AM (18 years ago)

Author:

vboxsync

Message:

Alignment fixes for windows. (structure packing is a strange thing business)

Location:

trunk

Files:

• include/VBox/vm.h (modified) (1 diff)
• src/VBox/VMM/EMInternal.h (modified) (2 diffs)
• src/VBox/VMM/PGMInternal.h (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -508 +508 @@
         struct VMINT    s;
 #endif
-        char        padding[640];       /* multiple of 32 */
+        char        padding[672];       /* multiple of 32 */
     } vm;
 

trunk/src/VBox/VMM/EMInternal.h

@@ -257 +257 @@
         /** Padding used in the other rings.
          * This must be larger than jmp_buf on any supported platform. */
-        char                achPaddingFatalLongJump[HC_ARCH_BITS == 32 ? 176 : 208];
+        char                achPaddingFatalLongJump[HC_ARCH_BITS == 32 ? 176 : 256];
 #ifdef IN_RING3
         /** Long buffer jump for fatal VM errors.
@@ -308 +308 @@
     HCPTRTYPE(PAVLPVNODECORE) pCliStatTree;
     STAMCOUNTER             StatTotalClis;
+#if 0
     /** 64-bit Visual C++ rounds the struct size up to 16 byte. */
     uint64_t                padding1;
+#endif
 
 } EM;

trunk/src/VBox/VMM/PGMInternal.h

@@ -643 +643 @@
     /** AVL node code with the (HC) physical address of this page. */
     AVLOHCPHYSNODECORE  Core;
-#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32 && defined(IN_GC)
+#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32 && defined(IN_GC) && !defined(_MSC_VER) /** @todo figure out this one. */
     uint32_t            Alignment0; /**< Alignment. */
 #endif 

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -84 +84 @@
     GEN_CHECK_SIZE(CPUMCTXCORE);
     GEN_CHECK_SIZE(STAMRATIOU32);
+    GEN_CHECK_SIZE(AVLOHCPHYSNODECORE);
+    GEN_CHECK_SIZE(AVLOGCPHYSNODECORE);
+    GEN_CHECK_SIZE(AVLROGCPHYSNODECORE);
+    GEN_CHECK_SIZE(AVLOGCPTRNODECORE);
+    GEN_CHECK_SIZE(AVLROGCPTRNODECORE);
+    GEN_CHECK_SIZE(AVLOIOPORTNODECORE);
+    GEN_CHECK_SIZE(AVLROIOPORTNODECORE);
 
     GEN_CHECK_SIZE(DBGF);