Changeset 58996 in vbox

Timestamp:

Dec 4, 2015 5:05:11 PM (9 years ago)

Author:

vboxsync

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

104524

Message:

CPUM: dtrace library fixes.

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (4 diffs)
• src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• src/VBox/VMM/dtrace/lib/vbox-types.d (modified) (1 diff)
• src/VBox/VMM/include/CPUMInternal.h (modified) (3 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -300 +300 @@
     uint32_t    fFlags;
 } CPUMCPUIDLEAF;
+#ifndef VBOX_FOR_DTRACE_LIB
 AssertCompileSize(CPUMCPUIDLEAF, 32);
+#endif
 /** Pointer to a CPUID leaf. */
 typedef CPUMCPUIDLEAF *PCPUMCPUIDLEAF;
@@ -883 +885 @@
 #endif
 } CPUMMSRRANGE;
-#ifdef VBOX_WITH_STATISTICS
+#ifndef VBOX_FOR_DTRACE_LIB
+# ifdef VBOX_WITH_STATISTICS
 AssertCompileSize(CPUMMSRRANGE, 128);
-#else
+# else
 AssertCompileSize(CPUMMSRRANGE, 96);
+# endif
 #endif
 /** Pointer to an MSR range. */
@@ -1011 +1015 @@
 
 
+#ifndef VBOX_FOR_DTRACE_LIB
 
 /** @name Guest Register Getters.
@@ -1479 +1484 @@
 #endif /* IN_RING0 */
 
+#endif /* !VBOX_FOR_DTRACE_LIB */
 /** @} */
 RT_C_DECLS_END

trunk/src/VBox/VMM/Makefile.kmk

@@ -682 +682 @@
         $(VMMLibDTrace_0_OUTDIR)/vm.d \
         $(VMMLibDTrace_0_OUTDIR)/cpumctx.d \
+        $(VMMLibDTrace_0_OUTDIR)/cpum.d \
         $(VMMLibDTrace_0_OUTDIR)/CPUMInternal.d \
         $(VMMLibDTrace_0_OUTDIR)/x86.d \
@@ -717 +718 @@
  $(evalcall2 def_vmm_lib_dtrace_preprocess,vm.d,$(PATH_ROOT)/include/VBox/vmm/vm.h)
  $(evalcall2 def_vmm_lib_dtrace_preprocess,cpumctx.d,$(PATH_ROOT)/include/VBox/vmm/cpumctx.h)
+ $(evalcall2 def_vmm_lib_dtrace_preprocess,cpum.d,$(PATH_ROOT)/include/VBox/vmm/cpum.h)
  $(evalcall2 def_vmm_lib_dtrace_preprocess,CPUMInternal.d,$(PATH_SUB_CURRENT)/include/CPUMInternal.h)
  $(evalcall2 def_vmm_lib_dtrace_preprocess,x86.d,$(PATH_ROOT)/include/iprt/x86.h)

trunk/src/VBox/VMM/dtrace/lib/vbox-types.d

@@ -48 +48 @@
 typedef struct SUPDRVSESSION   *PSUPDRVSESSION;
 typedef struct UVM             *PUVM;
-typedef uint32_t                CPUMCPUVENDOR;
 typedef struct CPUMCTXCORE     *PCPUMCTXCORE;
 

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

@@ -27 +27 @@
 # pragma D depends_on library x86.d
 # pragma D depends_on library cpumctx.d
+# pragma D depends_on library cpum.d
 
 /* Some fudging. */
-typedef uint32_t CPUMMICROARCH;
-typedef uint32_t CPUMUNKNOWNCPUID;
-typedef struct CPUMCPUIDLEAF *PCPUMCPUIDLEAF;
-typedef struct CPUMMSRRANGE  *PCPUMMSRRANGE;
 typedef uint64_t STAMCOUNTER;
 #endif
@@ -360 +357 @@
     uint64_t                    fXStateMask;
 } CPUMHOSTCTX;
+#ifndef VBOX_FOR_DTRACE_LIB
 AssertCompileSizeAlignment(CPUMHOSTCTX, 64);
+#endif
 /** Pointer to the saved host CPU state. */
 typedef CPUMHOSTCTX *PCPUMHOSTCTX;
@@ -427 +426 @@
     /** @} */
 } CPUM;
+#ifndef VBOX_FOR_DTRACE_LIB
 AssertCompileMemberOffset(CPUM, HostFeatures, 64);
 AssertCompileMemberOffset(CPUM, GuestFeatures, 96);
+#endif
 /** Pointer to the CPUM instance data residing in the shared VM structure. */
 typedef CPUM *PCPUM;