Changeset 161 in vbox for trunk/src/VBox/VMM/testcase

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

17616

Message:

64-bit: structure alignment.

Location:

trunk/src/VBox/VMM/testcase

Files:

• Makefile (modified) (1 diff)
• tstHelp.h (modified) (1 diff)
• tstVMMR0CallHost-1.cpp (modified) (1 diff)
• tstVMStructGC.cpp (modified) (2 diffs)
• tstVMStructSize.cpp (modified) (4 diffs)

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
+
 
     /*