Changeset 32055 in vbox for trunk/include/VBox

Timestamp:

Aug 27, 2010 3:25:54 PM (14 years ago)

Author:

vboxsync

Message:

Revert r65303 because it breaks Windows builds.

Location:

trunk/include/VBox

Files:

• vm.h (modified) (4 diffs)
• vm.mac (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -107 +107 @@
      * Only valid when in RC or HWACCMR0 with scheduling disabled. */
     RTCPUID volatile        idHostCpu;
-    /** State data for use by ad hoc profiling. */
-    uint32_t                uAdHoc;
-    /** Profiling samples for use by ad hoc profiling. */
-    STAMPROFILEADV          aStatAdHoc[8];
-
-#if HC_ARCH_BITS == 32
+
     /** Align the next bit on a 64-byte boundary and make sure it starts at the same
      *  offset in both 64-bit and 32-bit builds.
@@ -121 +116 @@
      *          following it (to grow into and align the struct size).
      *   */
-    uint8_t                 abAlignment1[HC_ARCH_BITS == 32 ? 20 : 0];
-#endif
+    uint8_t                 abAlignment1[HC_ARCH_BITS == 32 ? 24 : 4];
 
     /** CPUM part. */
@@ -207 +201 @@
 
     /** Align the following members on page boundrary. */
-    uint8_t                 abAlignment2[256];
+    uint8_t                 abAlignment2[576];
 
     /** PGM part. */
@@ -474 +468 @@
  * Checks if a force action flag is set for the given VCPU.
  *
- * @param   pVCpu   VMCPU Handle.
+ * @param   pVCpu     VMCPU Handle.
  * @param   fFlag   The flag to check.
  */
-#define VMCPU_FF_ISSET(pVCpu, fFlag)        (((pVCpu)->fLocalForcedActions & (fFlag)) == (fFlag))
+#define VMCPU_FF_ISSET(pVCpu, fFlag)  (((pVCpu)->fLocalForcedActions & (fFlag)) == (fFlag))
 
 /** @def VM_FF_ISPENDING

trunk/include/VBox/vm.mac

@@ -123 +123 @@
     .hNativeThreadR0        RTR0PTR_RES 1
     .idHostCpu              resd 1
-    .uAdHoc                 resd 1
-    .aStatAdHoc             resb STAMPROFILEADV_size * 8
 
     alignb 64