Changeset 41247 in vbox for trunk/src

Timestamp:

May 10, 2012 8:07:11 PM (13 years ago)

Author:

vboxsync

Message:

More dtrace library stuff. On 64-bit solaris dtrace can now grok the library files (point it to them using the -L parameter).

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• VMMR3/EM.cpp (modified) (1 diff)
• dtrace/lib/amd64/vbox-arch-types.d (moved) (moved from trunk/src/VBox/VMM/dtrace/lib/amd64/types.d ) (1 diff)
• dtrace/lib/vbox-types.d (moved) (moved from trunk/src/VBox/VMM/dtrace/lib/types.d ) (1 diff)
• dtrace/lib/x86/vbox-arch-types.d (moved) (moved from trunk/src/VBox/VMM/dtrace/lib/x86/types.d )

trunk/src/VBox/VMM/Makefile.kmk

@@ -562 +562 @@
 
 
-ifndef VBOX_ONLY_EXTPACKS
- if  defined(VBOX_WITH_DTRACE_R3) \
-  || defined(VBOX_WITH_DTRACE_R0) \
-  || defined(VBOX_WITH_DTRACE_RC)
+if !defined(VBOX_ONLY_EXTPACKS) \
+ && (   defined(VBOX_WITH_DTRACE_R3) \
+     || defined(VBOX_WITH_DTRACE_R0) \
+     || defined(VBOX_WITH_DTRACE_RC))
  #
  # Install the dtrace library files.
  #
  INSTALLS += VMMLibDTrace
- VMMLibDTrace_INST    = $(VBOX_INST_DTRACE_LIB)
+ VMMLibDTrace_INST    = $(VBOX_INST_DTRACE_LIB)$(KBUILD_TARGET_ARCH)/
  VMMLibDTrace_SOURCES = \
-        dtrace/lib/types.d \
-        dtrace/lib/$(KBUILD_TARGET_ARCH)/types.d=>$(KBUILD_TARGET_ARCH)/types.d \
-        $(VMMLibDTrace_0_OUTDIR)/vm.d=>$(KBUILD_TARGET_ARCH)/vm.d \
-        $(VMMLibDTrace_0_OUTDIR)/cpumctx.d=>$(KBUILD_TARGET_ARCH)/cpumctx.d \
+        dtrace/lib/vbox-types.d \
+        dtrace/lib/$(KBUILD_TARGET_ARCH)/vbox-arch-types.d \
+        $(VMMLibDTrace_0_OUTDIR)/vm.d \
+        $(VMMLibDTrace_0_OUTDIR)/cpumctx.d \
+        $(VMMLibDTrace_0_OUTDIR)/x86.d \
 
 
@@ -589 +590 @@
                 -D RT_C_DECLS_BEGIN= \
                 -D RT_C_DECLS_END= \
+                -D 'RCPTRTYPE(a_Type)=RTRCPTR' \
+                -D 'R3PTRTYPE(a_Type)=RTR3PTR' \
+                -D 'R0PTRTYPE(a_Type)=a_Type' \
+                -D 'AssertCompile(a_Expr)=' \
+                -D 'AssertCompileSize(a_Stuct, a_Size)=' \
                 $$(addprefix -D ,$$(DEFS) $$(DEFS.$$(KBUILD_TARGET)) $$(DEFS.$(KBUILD_TARGET_ARCH))) $$< $$@
  endef
  $(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)
-
- endif
+ $(evalcall2 def_vmm_lib_dtrace_preprocess,x86.d,$(PATH_ROOT)/include/iprt/x86.h)
+
 endif
 

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -2117 +2117 @@
             if (enmOldState != enmNewState)
             {
-                VBOXVMM_EM_STATE_CHANGED(pVCpu, enmOldState, enmNewState, rc);
+                VBOXVMM_EM_STATE_CHANGED((PVMCPU)VM_R0_ADDR(pVM, pVCpu), enmOldState, enmNewState, rc);
 
                 /* Clear MWait flags. */

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

@@ -30 +30 @@
 typedef uint64_t    RTHCPTR;
 
+
+
+typedef union RTFLOAT80U
+{
+    uint16_t    au16[5];
+} RTFLOAT80U;
+
+typedef union RTFLOAT80U2
+{
+    uint16_t    au16[5];
+} RTFLOAT80U2;
+
+typedef struct uint128_t
+{
+    uint64_t    au64[2];
+} uint128_t;
+
+

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

@@ -30 +30 @@
  * These are taken from a variation of VBox and IPRT headers.
  */
+#pragma D depends_on library vbox-arch-types.d
 
-typedef uint32_t        VMCPUID;
-typedef uint32_t        RTCPUID;
-typedef struct UVMCPU  *PUVMCPU;
-typedef uintptr_t       PVMR3;
-typedef uint32_t        PVMRC;
-typedef struct VM      *PVMR0;
-typedef uintptr_t       RTNATIVETHREAD;
+typedef uint16_t                RTSEL;
+typedef uint32_t                RTRCPTR;
+typedef uintptr_t               RTNATIVETHREAD;
+typedef struct RTTHREADINT     *RTTHREAD;
+typedef struct RTTRACEBUFINT   *RTTRACEBUF;
+
+
+typedef uint32_t                VMSTATE;
+typedef uint32_t                VMCPUID;
+typedef uint32_t                RTCPUID;
+typedef struct UVMCPU          *PUVMCPU;
+typedef uintptr_t               PVMR3;
+typedef uint32_t                PVMRC;
+typedef struct VM              *PVMR0;
+typedef struct SUPDRVSESSION   *PSUPDRVSESSION;
+typedef struct UVM             *PUVM;
+typedef struct VBOXGDTR
+{
+    uint16_t    cb;
+    uint16_t    au16Addr[4];
+} VBOXGDTR, VBOXIDTR;
 
 typedef struct STAMPROFILEADV