Changeset 161 in vbox

Timestamp:

Jan 18, 2007 6:25:45 PM (18 years ago)

Author:

vboxsync

Message:

64-bit: structure alignment.

Location:

trunk

Files:

• include/VBox/pdm.h (modified) (1 diff)
• include/VBox/vm.h (modified) (4 diffs)
• src/VBox/VMM/EMInternal.h (modified) (1 diff)
• src/VBox/VMM/MMInternal.h (modified) (1 diff)
• src/VBox/VMM/PDMInternal.h (modified) (1 diff)
• src/VBox/VMM/PGMInternal.h (modified) (3 diffs)
• src/VBox/VMM/REMInternal.h (modified) (6 diffs)
• src/VBox/VMM/SELMInternal.h (modified) (1 diff)
• src/VBox/VMM/TMInternal.h (modified) (1 diff)
• src/VBox/VMM/VMM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMInternal.h (modified) (4 diffs)
• src/VBox/VMM/VMMInternal.mac (modified) (1 diff)
• src/VBox/VMM/testcase/Makefile (modified) (1 diff)
• src/VBox/VMM/testcase/tstHelp.h (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp (modified) (1 diff)
• src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStructSize.cpp (modified) (4 diffs)

trunk/include/VBox/pdm.h

@@ -5404 +5404 @@
      * call PDMR3QueryDevice(). */
     PDMIBASE                    IBase;
+#if HC_ARCH_BITS == 32
     /* padding to make achInstanceData aligned at 16 byte boundrary. */
-    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 2 : 1];
+    uint32_t                    au32Padding[HC_ARCH_BITS == 32 ? 2 : 0];
+#endif 
     /** Device instance data. The size of this area is defined
      * in the PDMDEVREG::cbInstanceData field. */

trunk/include/VBox/vm.h

@@ -317 +317 @@
 
 
+    /* padding to make gnuc put the StatQemuToGC where msc does. */
 #if HC_ARCH_BITS == 32
-    /* padding to make gnuc put the StatQemuToGC where msc does. */
     uint32_t            padding0;
 #endif
@@ -347 +347 @@
 
     /* padding - the unions must be aligned on 32 bytes boundraries. */
-#if HC_ARCH_BITS == 32
-    char                padding[16];
-#endif
+    uint32_t            padding[HC_ARCH_BITS == 32 ? 4 : 6];
 
     /** CPUM part. */
@@ -357 +355 @@
         struct CPUM s;
 #endif
-        char        padding[3424];      /* multiple of 32 */
+        char        padding[HC_ARCH_BITS == 32 ? 3424 : 3552];      /* multiple of 32 */
     } cpum;
 
@@ -483 +481 @@
         struct DBGF s;
 #endif
-        char        padding[1888];      /* multiple of 32 */
+        char        padding[HC_ARCH_BITS == 32 ? 1888 : 1920];      /* multiple of 32 */
     } dbgf;
 

trunk/src/VBox/VMM/EMInternal.h

@@ -255 +255 @@
         /** Padding used in the other rings.
          * This must be larger than jmp_buf on any supported platform. */
-        char                achPaddingFatalLongJump[176];
+        char                achPaddingFatalLongJump[HC_ARCH_BITS == 32 ? 176 : 208];
 #ifdef IN_RING3
         /** Long buffer jump for fatal VM errors.

trunk/src/VBox/VMM/MMInternal.h

@@ -589 +589 @@
     /** Set if PGM has been initialized and we can safely call PGMR3Map(). */
     bool                        fPGMInitialized;
-#if GC_ARCH_BITS == 64
+#if GC_ARCH_BITS == 64 || HC_ARCH_BITS == 64
     uint32_t                    u32Padding1; /**< alignment padding. */
 #endif

trunk/src/VBox/VMM/PDMInternal.h

@@ -254 +254 @@
     /** @copydoc PDMPICREG::pfnGetInterruptHC */
     DECLGCCALLBACKMEMBER(int, pfnGetInterruptGC,(PPDMDEVINS pDevIns));
+#if GC_ARCH_BITS == 32
+    RTGCPTR                         GCPtrPadding; /**< Alignment padding. */
+#endif
 } PDMPIC;
 

trunk/src/VBox/VMM/PGMInternal.h

@@ -449 +449 @@
 #endif
     /** Array of cached physical addresses for the monitored ranged.  */
-    PGMPHYS2VIRTHANDLER                aPhysToVirt[1];
+    PGMPHYS2VIRTHANDLER                 aPhysToVirt[HC_ARCH_BITS == 32 ? 1 : 2];
 } PGMVIRTHANDLER;
 /** Pointer to a virtual page access handler structure. */
@@ -1243 +1243 @@
     DECLGCCALLBACKMEMBER(int,  pfnGCShwSetPDEByIndex,(PVM pVM, uint32_t iPD, X86PDEPAE Pde));
     DECLGCCALLBACKMEMBER(int,  pfnGCShwModifyPDEByIndex,(PVM pVM, uint32_t iPD, uint64_t fFlags, uint64_t fMask));
+#if GC_ARCH_BITS == 32 && HC_ARCH_BITS == 64
+    RTGCPTR                    alignment0; /**< structure size alignment. */
+#endif 
 
     DECLR0CALLBACKMEMBER(int,  pfnR0ShwGetPage,(PVM pVM, RTGCUINTPTR GCPtr, uint64_t *pfFlags, PRTHCPHYS pHCPhys));
@@ -1313 +1316 @@
     DECLGCCALLBACKMEMBER(int,       pfnGCBthVerifyAccessSyncPage,(PVM pVM, RTGCUINTPTR GCPtrPage, unsigned fFlags, unsigned uError));
     DECLGCCALLBACKMEMBER(unsigned,  pfnGCBthAssertCR3,(PVM pVM, uint32_t cr3, uint32_t cr4, RTGCUINTPTR GCPtr, RTGCUINTPTR cb));
+#if GC_ARCH_BITS == 32 && HC_ARCH_BITS == 64
+    RTGCPTR                         alignment2; /**< structure size alignment. */
+#endif 
     /** @} */
 

trunk/src/VBox/VMM/REMInternal.h

@@ -116 +116 @@
 {
     RTHCUINTPTR pChunk1;
+    RTHCUINTPTR pChunk2;
     RTGCPHYS    GCPhys1;
-    RTHCUINTPTR pChunk2;
     RTGCPHYS    GCPhys2;
 } REMCHUNKINFO, *PREMCHUNKINFO;
@@ -129 +129 @@
 typedef struct REMPHYSREGISTRATION
 {
+    RTHCUINTPTR     HCVirt;
     RTGCPHYS        GCPhys;
-    RTHCUINTPTR     HCVirt;
     RTUINT          cb;
 } REMPHYSREGISTRATION, *PREMPHYSREGISTRATION;
@@ -177 +177 @@
      * These instructions are replayed when entering REM. */
     RTGCPTR                 aGCPtrInvalidatedPages[48];
-
     /** The number of recorded handler notifications. */
     RTUINT volatile         cHandlerNotifications;
+    RTUINT                  padding0; /**< Padding. */
     /** Array of recorded handler noticications.
      * These are replayed when entering REM. */
@@ -185 +185 @@
 
     /** Pointer to an array of hc virt to gc phys records. */
-    PREMCHUNKINFO           paHCVirtToGCPhys;
+    HCPTRTYPE(PREMCHUNKINFO) paHCVirtToGCPhys;
     /** Pointer to a GC Phys to HC Virt lookup table. */
-    RTHCUINTPTR            *paGCPhysToHCVirt;
-
-    /** Number of external RAM and ROM registrations (excluding guest RAM) */
+    HCPTRTYPE(PRTHCUINTPTR) paGCPhysToHCVirt;
+
+    /** Array of external RAM and ROM registrations (excluding guest RAM). */
+    REMPHYSREGISTRATION     aPhysReg[REM_MAX_PHYS_REGISTRATIONS];
+    /** Number of external RAM and ROM registrations (excluding guest RAM). */
     RTUINT                  cPhysRegistrations;
-    REMPHYSREGISTRATION     aPhysReg[REM_MAX_PHYS_REGISTRATIONS];
 
     /** MMIO memory type.
@@ -213 +214 @@
 
     /** Padding for MS / GC alignment difference. */
-    //uint32_t                u32Padding;
+    uint32_t                u32Padding;
     /** Time spent in QEMU. */
     STAMPROFILEADV          StatsInQEMU;
@@ -223 +224 @@
     STAMPROFILE             StatsStateBack;
 
+#if HC_ARCH_BITS != 32
     /** Padding the CPUX86State structure to 32 byte. */
-    uint8_t                 abPadding[8];
+    uint32_t                abPadding[HC_ARCH_BITS == 32 ? 0 : 6];
+#endif
 
 #define REM_ENV_SIZE        (HC_ARCH_BITS == 32 ? 0x6440 : 0xb4a0)

trunk/src/VBox/VMM/SELMInternal.h

@@ -131 +131 @@
     /** Indicates whether the TSS stack selector & base address need to be refreshed.  */
     bool                    fSyncTSSRing0Stack;
+    /** alignment . */
+    RTUINT                  uPadding2;
 
     /** SELMR3UpdateFromCPUM() profiling. */

trunk/src/VBox/VMM/TMInternal.h

@@ -183 +183 @@
     /** Pointer to the VM the timer belongs to - GC Ptr. */
     PVMGC                   pVMGC;
+#if HC_ARCH_BITS == 64 && GC_ARCH_BITS == 32
+    RTGCPTR                 padding0; /**< pad structure to multiple of 8 bytes. */
+#endif
 } TMTIMER;
 

trunk/src/VBox/VMM/VMM.cpp

@@ -388 +388 @@
         {
             /* Set HC and GC stack pointers to top of stack. */
-            pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack = pVM->vmm.s.pbHCStack;
+            pVM->vmm.s.CallHostR0JmpBuf.pvSavedStack = (RTR0PTR)pVM->vmm.s.pbHCStack;
             pVM->vmm.s.pbGCStack = MMHyperHC2GC(pVM, pVM->vmm.s.pbHCStack);
             pVM->vmm.s.pbGCStackBottom = pVM->vmm.s.pbGCStack + VMM_STACK_SIZE;

trunk/src/VBox/VMM/VMMInternal.h

@@ -109 +109 @@
     uint32_t    esp;
     uint32_t    eip;
+    uint32_t    u32Padding;
 #endif 
 #if HC_ARCH_BITS == 64
@@ -132 +133 @@
     /** Pointer to the buffer used to save the stack.
      * This is assumed to be 8KB. */
-    void       *pvSavedStack;
+    RTR0PTR     pvSavedStack;
     /** Esp we we match against esp on resume to make sure the stack wasn't relocated. */
     RTHCUINTREG SpCheck;
@@ -234 +235 @@
     /** The EMT yield timer interval (milliseconds). */
     uint32_t                    cYieldEveryMillies;
+#if HC_ARCH_BITS == 32
+    uint32_t                    u32Padding0; /**< Alignment padding. */
+#endif
 
     /** @name CallHost
@@ -247 +251 @@
     /** @} */
 
-    /* on VC these members are qword aligned! */
-    //uint32_t                    u32Padding[1];
     /** Number of VMMR0_DO_RUN_GC calls. */
     STAMCOUNTER                 StatRunGC;

trunk/src/VBox/VMM/VMMInternal.mac

@@ -31 +31 @@
     .esp            resd 1
     .eip            resd 1
+    .u32Padding     resd 1
 
     ; additional state and stack info.

trunk/src/VBox/VMM/testcase/Makefile

@@ -46 +46 @@
 #
 ifeq ($(BUILD_TARGET),$(BUILD_PLATFORM))
- ifeq ($(filter-out x86.amd64 x86.x86, $(BUILD_TARGET_ARCH).$(BUILD_PLATFORM_ARCH)),)
+ ifeq ($(filter-out x86.x86 x86.amd64, $(BUILD_TARGET_ARCH).$(BUILD_PLATFORM_ARCH)),)
   OTHERS          += \
         $(PATH_TARGET)/tstAsmStructs.run \

trunk/src/VBox/VMM/testcase/tstHelp.h

@@ -120 +120 @@
     } while (0)
 
+/**
+ * Checks that a internal struct padding is big enough.
+ */
+#define CHECK_PADDING3(strct, member, pad_member) \
+    do \
+    { \
+        strct *p; \
+        if (sizeof(p->member) > sizeof(p->pad_member)) \
+        { \
+            printf("padding of %s::%s is too small, padding=%d struct=%d\n", #strct, #member, \
+                   (int)sizeof(p->pad_member), (int)sizeof(p->member)); \
+            rc++; \
+        } \
+    } while (0)
+
+
 #endif

trunk/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp

@@ -94 +94 @@
     RTR3Init(false);
     RTPrintf("tstVMMR0CallHost-1: Testing...\n");
-    g_Jmp.pvSavedStack = &g_Stack[0];
+    g_Jmp.pvSavedStack = (RTR0PTR)&g_Stack[0];
 
     /*

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

@@ -357 +357 @@
 
     GEN_CHECK_SIZE(REM);
+    GEN_CHECK_OFF(REM, pCtx);
+    GEN_CHECK_OFF(REM, cCanExecuteRaw);
+    GEN_CHECK_OFF(REM, aGCPtrInvalidatedPages);
+    GEN_CHECK_OFF(REM, cHandlerNotifications);
+    GEN_CHECK_OFF(REM, aHandlerNotifications);
+    GEN_CHECK_OFF(REM, paHCVirtToGCPhys);
+    GEN_CHECK_OFF(REM, cPhysRegistrations);
+    GEN_CHECK_OFF(REM, aPhysReg);
+    GEN_CHECK_OFF(REM, rc);
+    GEN_CHECK_OFF(REM, StatsInQEMU);
+    GEN_CHECK_OFF(REM, Env);
 
     GEN_CHECK_SIZE(SELM);
@@ -469 +480 @@
     GEN_CHECK_OFF(VMM, cYieldResumeMillies);
     GEN_CHECK_OFF(VMM, cYieldEveryMillies);
+    GEN_CHECK_OFF(VMM, enmCallHostOperation);
+    GEN_CHECK_OFF(VMM, rcCallHost);
+    GEN_CHECK_OFF(VMM, u64CallHostArg);
+    GEN_CHECK_OFF(VMM, CallHostR0JmpBuf);
+    GEN_CHECK_OFF(VMM, CallHostR0JmpBuf.SpCheck);
+    GEN_CHECK_OFF(VMM, CallHostR0JmpBuf.SpResume);
     GEN_CHECK_OFF(VMM, StatRunGC);
+    GEN_CHECK_OFF(VMM, StatGCRetPGMLock);
 
     GEN_CHECK_SIZE(RTPINGPONG);

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

@@ -88 +88 @@
     do \
     { \
-        printf("%s::%s offset %d\n",  #strct, #member, RT_OFFSETOF(strct, member)); \
+        printf("%s::%s offset %d sizeof %d\n",  #strct, #member, (int)RT_OFFSETOF(strct, member), (int)RT_SIZEOFMEMB(strct, member)); \
     } while (0)
 
@@ -151 +151 @@
     CHECK_MEMBER_ALIGNMENT(VM, cpum.s.Hyper, 32);
     CHECK_MEMBER_ALIGNMENT(VM, vmm.s.CritSectVMLock, 8);
+    CHECK_MEMBER_ALIGNMENT(VM, vmm.s.CallHostR0JmpBuf, 8);
     CHECK_MEMBER_ALIGNMENT(VM, vmm.s.StatRunGC, 8);
     CHECK_MEMBER_ALIGNMENT(VM, StatTotalQemuToGC, 8);
@@ -189 +190 @@
     CHECK_MEMBER_ALIGNMENT(PGMPOOLPAGE, GCPhys, sizeof(RTGCPHYS));
 
+    /* misc */
+    CHECK_PADDING3(EM, u.FatalLongJump, u.achPaddingFatalLongJump);
+    CHECK_PADDING3(REMHANDLERNOTIFICATION, u.PhysicalRegister, u.padding);
+    CHECK_PADDING3(REMHANDLERNOTIFICATION, u.PhysicalDeregister, u.padding);
+    CHECK_PADDING3(REMHANDLERNOTIFICATION, u.PhysicalModify, u.padding);
+    CHECK_SIZE_ALIGNMENT(VMMR0JMPBUF, 8);
 #if 0
     PRINT_OFFSET(VM, fForcedActions);
@@ -194 +201 @@
     PRINT_OFFSET(VM, StatGCToQemu);
 #endif
+
 
     /*