Changeset 53630 in vbox for trunk

Timestamp:

Jan 1, 2015 11:41:26 PM (10 years ago)

Author:

vboxsync

Message:

dtrace library fixes/hacks.

Location:

trunk

Files:

• include/VBox/vmm/vm.h (modified) (1 diff)
• include/iprt/x86.h (modified) (3 diffs)
• src/VBox/VMM/include/CPUMInternal.h (modified) (3 diffs)

trunk/include/VBox/vmm/vm.h

@@ -235 +235 @@
 
     /** Align the following members on page boundary. */
-    //uint8_t                 abAlignment2[64];
+    /*uint8_t                 abAlignment2[64];*/
 
     /** PGM part. */

trunk/include/iprt/x86.h

@@ -945 +945 @@
 #define X86_DR7_RW_ALL_MASKS                UINT32_C(0x33330000)
 
+#ifndef VBOX_FOR_DTRACE_LIB
 /** Checks if there are any I/O breakpoint types configured in the RW
  * registers.  Does NOT check if these are enabled, sorry. */
-#define X86_DR7_ANY_RW_IO(uDR7) \
+# define X86_DR7_ANY_RW_IO(uDR7) \
     (   (    UINT32_C(0x22220000) & (uDR7) ) /* any candidates? */ \
      && ( ( (UINT32_C(0x22220000) & (uDR7) ) >> 1 )  &  ~(uDR7) ) )
@@ -959 +960 @@
 AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C(0x00030000)) == 0);
 AssertCompile(X86_DR7_ANY_RW_IO(UINT32_C(0x00040000)) == 0);
+#endif /* !VBOX_FOR_DTRACE_LIB */
 
 /** @name Length values.
@@ -2373 +2375 @@
  *  forget to update x86.mac if you change this! */
 #define X86_FXSTATE_RSVD_32BIT_MAGIC    0x32b3232b
+#ifndef VBOX_FOR_DTRACE_LIB
 AssertCompileSize(X86FXSTATE, 512);
 AssertCompileMemberOffset(X86FXSTATE, au32RsrvdForSoftware, X86_OFF_FXSTATE_RSVD);
+#endif
 
 /** @name FPU status word flags.

trunk/src/VBox/VMM/include/CPUMInternal.h

@@ -27 +27 @@
 # pragma D depends_on library x86.d
 # pragma D depends_on library cpumctx.d
+
+/* Some fudging. */
+typedef uint32_t CPUMMICROARCH;
+typedef uint32_t CPUMUKNOWNCPUID;
+typedef struct CPUMCPUIDLEAF *PCPUMCPUIDLEAF;
+typedef struct CPUMMSRRANGE  *PCPUMMSRRANGE;
+typedef uint64_t STAMCOUNTER;
 #endif
 
@@ -128 +135 @@
     uint8_t         uStepping;
     /** The microarchitecture. */
+#ifndef VBOX_FOR_DTRACE_LIB
     CPUMMICROARCH   enmMicroarch;
+#else
+    uint32_t        enmMicroarch;
+#endif
     /** The maximum physical address with of the CPU. */
     uint8_t         cMaxPhysAddrWidth;
@@ -181 +192 @@
     uint64_t        auPadding[2];
 } CPUMFEATURES;
+#ifndef VBOX_FOR_DTRACE_LIB
 AssertCompileSize(CPUMFEATURES, 32);
+#endif
 /** Pointer to a CPU feature structure. */
 typedef CPUMFEATURES *PCPUMFEATURES;