Changeset 518 in vbox for trunk/src/VBox

Timestamp:

Feb 1, 2007 6:46:18 PM (18 years ago)

Author:

vboxsync

Message:

64-bit alignment in CSAM.

Location:

trunk/src/VBox/VMM

Files:

• PATM/CSAMInternal.h (modified) (3 diffs)
• testcase/tstVMStructGC.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PATM/CSAMInternal.h

@@ -144 +144 @@
      * See CSAM2VM(). */
     RTINT               offVM;
+#if HC_ARCH_BITS == 64
+    RTINT               Alignment0;     /**< Align pPageTree correctly. */
+#endif
 
     HCPTRTYPE(PAVLPVNODECORE) pPageTree;
@@ -162 +165 @@
     struct
     {
-        PSSMHANDLE      pSSM;
+        HCPTRTYPE(PSSMHANDLE) pSSM;
         uint32_t        cPageRecords;
         uint32_t        cPatchPageRecords;
@@ -177 +180 @@
     /* Set when the IDT gates have been checked for the first time. */
     bool                fGatesChecked;
+    bool                Alignment1[2]; /**< Align the stats on an 8-byte boundrary. */
 
     STAMCOUNTER         StatNrTraps;

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

@@ -58 +58 @@
 #include "REMInternal.h"
 #include "HWACCMInternal.h"
-#ifdef VBOX_WITH_PATM
-# include "PATMInternal.h"
-#endif
+#include "PATMInternal.h"
 #include "VMMInternal.h"
 #include "DBGFInternal.h"
 #include "STAMInternal.h"
-#ifdef VBOX_WITH_CSAM
-# include "CSAMInternal.h"
-#endif
+#include "CSAMInternal.h"
 #include "EMInternal.h"
 #include "REMInternal.h"
-#ifdef VBOX_WITH_RRM
-# include "RRMInternal.h"
-#endif
 #include <VBox/vm.h>
 #include <VBox/param.h>
@@ -367 +360 @@
     GEN_CHECK_OFF(PGMPOOLPAGE, cPresent);
     GEN_CHECK_OFF(PGMPOOLPAGE, iFirstPresent);
-#endif 
+#endif
 #ifdef PGMPOOL_WITH_MONITORING
     GEN_CHECK_OFF(PGMPOOLPAGE, cModifications);
@@ -424 +417 @@
     GEN_CHECK_OFF(PGMPOOL, StatAlloc);
     GEN_CHECK_OFF(PGMPOOL, StatClearAll);
-#endif 
+#endif
     GEN_CHECK_OFF(PGMPOOL, HCPhysTree);
     GEN_CHECK_OFF(PGMPOOL, aPages);
@@ -578 +571 @@
     GEN_CHECK_OFF(RTCRITSECT, Strict.uEnterId);
 
+
+    GEN_CHECK_SIZE(CSAM);
+    GEN_CHECK_OFF(CSAM, offVM);
+    GEN_CHECK_OFF(CSAM, pPageTree);
+    GEN_CHECK_OFF(CSAM, aDangerousInstr);
+    GEN_CHECK_OFF(CSAM, aDangerousInstr[1]);
+    GEN_CHECK_OFF(CSAM, aDangerousInstr[CSAM_MAX_DANGR_INSTR - 1]);
+    GEN_CHECK_OFF(CSAM, cDangerousInstr);
+    GEN_CHECK_OFF(CSAM, iDangerousInstr);
+    GEN_CHECK_OFF(CSAM, pPDBitmapGC);
+    GEN_CHECK_OFF(CSAM, pPDHCBitmapGC);
+    GEN_CHECK_OFF(CSAM, pPDBitmapHC);
+    GEN_CHECK_OFF(CSAM, pPDGCBitmapHC);
+    GEN_CHECK_OFF(CSAM, savedstate);
+    GEN_CHECK_OFF(CSAM, savedstate.pSSM);
+    GEN_CHECK_OFF(CSAM, savedstate.cPageRecords);
+    GEN_CHECK_OFF(CSAM, savedstate.cPatchPageRecords);
+    GEN_CHECK_OFF(CSAM, cDirtyPages);
+    GEN_CHECK_OFF(CSAM, pvDirtyBasePage);
+    GEN_CHECK_OFF(CSAM, pvDirtyBasePage[1]);
+    GEN_CHECK_OFF(CSAM, pvDirtyBasePage[CSAM_MAX_DIRTY_PAGES - 1]);
+    GEN_CHECK_OFF(CSAM, pvDirtyFaultPage);
+    GEN_CHECK_OFF(CSAM, pvDirtyFaultPage[1]);
+    GEN_CHECK_OFF(CSAM, pvDirtyFaultPage[CSAM_MAX_DIRTY_PAGES - 1]);
+    GEN_CHECK_OFF(CSAM, fScanningStarted);
+    GEN_CHECK_OFF(CSAM, fGatesChecked);
+    GEN_CHECK_OFF(CSAM, StatNrTraps);
+    GEN_CHECK_OFF(CSAM, StatNrPages);
+
+    //GEN_CHECK_SIZE(PATM);
+
     return 0;
 }