Changeset 40857 in vbox

Timestamp:

Apr 10, 2012 6:52:33 PM (12 years ago)

Author:

vboxsync

Message:

Make VBoxTpG work on 64-bit darwin. (Still need to check 32-bit.)

Location:

trunk

Files:

• include/VBox/VBoxTpG.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/Makefile.kmk (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp (modified) (6 diffs)
• src/bldprogs/VBoxTpG.cpp (modified) (9 diffs)

trunk/include/VBox/VBoxTpG.h

@@ -72 +72 @@
 # ifdef __GNUC__
 #  define VTG_DECL_VTGPROBELOC(a_VarName) \
-    static VTGPROBELOC __attribute__((section(VTG_LOC_SECT))) a_VarName
+    static VTGPROBELOC __attribute__((section(VTG_LOC_SEG "," VTG_LOC_SECT ",regular")/*, aligned(16)*/)) a_VarName
 # else
 #  error "Unsupported Darwin compiler!"

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -303 +303 @@
  VBoxDrv_SOURCES.darwin   = darwin/SUPDrv-darwin.cpp
  VBoxDrv_SOURCES.solaris  = \
-        solaris/SUPDrv-solaris.c 
+        solaris/SUPDrv-solaris.c
  VBoxDrv_SOURCES.win      = \
         win/SUPDrv-win.cpp \
@@ -316 +316 @@
   VBoxDrv_SOURCES        += \
         SUPDrv-dtrace.cpp
+  VBoxDrv_DTRACE_OBJ_FLAGS = -v -v -v
+  SUPDrv-dtrace.cpp_DEFS.darwin += VBOX_PATH_MACOSX_DTRACE_H=\"$(VBOX_PATH_MACOSX_SDK)/usr/include/sys/dtrace.h\"
  endif
  ifn1of ($(KBUILD_TARGET), linux freebsd)

trunk/src/VBox/HostDrivers/Support/SUPDrv-dtrace.cpp

@@ -39 +39 @@
 #include <iprt/ctype.h>
 #include <iprt/mem.h>
-
-#ifdef RT_OS_DARWIN /** @todo figure this! */
-# include "/Developer/SDKs/MacOSX10.6.sdk/usr/include/sys/dtrace.h"
+#include <iprt/errno.h>
+#ifdef RT_OS_DARWIN
+# include <iprt/dbg.h>
+#endif
+
+#ifdef RT_OS_DARWIN
+# include VBOX_PATH_MACOSX_DTRACE_H
 #else
 # include <sys/dtrace.h>
@@ -112 +116 @@
 #ifdef RT_OS_DARWIN
 /** @name DTrace kernel interface used on Darwin
- * @{ */ 
-static void        (* dtrace_probe)(dtrace_id_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
-static dtrace_id_t (* dtrace_probe_create)(dtrace_provider_id_t, const char *, const char *, const char *, int, void *);
-static dtrace_id_t (* dtrace_probe_lookup)(dtrace_provider_id_t, const char *, const char *, const char *);
-static int         (* dtrace_register)(const char *, const dtrace_pattr_t *, uint32_t, /*cred_t*/ void *, 
-                                       const dtrace_pops_t *, void *, dtrace_provider_id_t *);
-static void        (* dtrace_invalidate)(dtrace_provider_id_t);
-static int         (* dtrace_unregister)(dtrace_provider_id_t);
+ * @{ */
+static void        (* g_pfnDTraceProbeFire)(dtrace_id_t, uint64_t, uint64_t, uint64_t, uint64_t, uint64_t);
+static dtrace_id_t (* g_pfnDTraceProbeCreate)(dtrace_provider_id_t, const char *, const char *, const char *, int, void *);
+static dtrace_id_t (* g_pfnDTraceProbeLookup)(dtrace_provider_id_t, const char *, const char *, const char *);
+static int         (* g_pfnDTraceProviderRegister)(const char *, const dtrace_pattr_t *, uint32_t, /*cred_t*/ void *,
+                                                   const dtrace_pops_t *, void *, dtrace_provider_id_t *);
+static void        (* g_pfnDTraceProviderInvalidate)(dtrace_provider_id_t);
+static int         (* g_pfnDTraceProviderUnregister)(dtrace_provider_id_t);
+
+#define dtrace_probe            g_pfnDTraceProbeFire
+#define dtrace_probe_create     g_pfnDTraceProbeCreate
+#define dtrace_probe_lookup     g_pfnDTraceProbeLookup
+#define dtrace_register         g_pfnDTraceProviderRegister
+#define dtrace_invalidate       g_pfnDTraceProviderInvalidate
+#define dtrace_unregister       g_pfnDTraceProviderUnregister
+
 /** @} */
 #endif
@@ -358 +370 @@
 
 /**
- * @callback_method_impl{dtrace_pops_t,dtps_getargval} 
- *  
- *  
- * We just cook our own stuff here, using a stack marker for finding the 
- * required information.  That's more reliable than subjecting oneself to the 
- * solaris bugs and 32-bit apple peculiarities. 
- *  
- *  
+ * @callback_method_impl{dtrace_pops_t,dtps_getargval}
+ *
+ *
+ * We just cook our own stuff here, using a stack marker for finding the
+ * required information.  That's more reliable than subjecting oneself to the
+ * solaris bugs and 32-bit apple peculiarities.
+ *
+ *
  * @remarks Solaris Bug
- *  
- * dtrace_getarg on AMD64 has a different opinion about how to use the cFrames 
- * argument than dtrace_caller() and/or dtrace_getpcstack(), at least when the 
- * probe is fired by dtrace_probe() the way we do. 
- * 
+ *
+ * dtrace_getarg on AMD64 has a different opinion about how to use the cFrames
+ * argument than dtrace_caller() and/or dtrace_getpcstack(), at least when the
+ * probe is fired by dtrace_probe() the way we do.
+ *
  * Setting aframes to 1 when calling dtrace_probe_create gives me the right
  * arguments, but the wrong 'caller'.  Since I cannot do anything about
  * 'caller', the only solution is this hack.
- * 
+ *
  * Not sure why the  Solaris guys hasn't seen this issue before, but maybe there
- * isn't anyone using the default argument getter path for ring-0 dtrace_probe() 
- * calls, SDT surely isn't. 
- * 
+ * isn't anyone using the default argument getter path for ring-0 dtrace_probe()
+ * calls, SDT surely isn't.
+ *
  * @todo File a solaris bug on dtrace_probe() + dtrace_getarg().
- *  
- *  
- * @remarks 32-bit XNU (Apple) 
- *  
- * The dtrace_probe arguments are 64-bit unsigned integers instead of uintptr_t, 
- * so we need to make an extra call. 
- *  
+ *
+ *
+ * @remarks 32-bit XNU (Apple)
+ *
+ * The dtrace_probe arguments are 64-bit unsigned integers instead of uintptr_t,
+ * so we need to make an extra call.
+ *
  */
 static uint64_t supdrvDtPOps_GetArgVal(void *pvProv, dtrace_id_t idProbe, void *pvProbe,
@@ -488 +500 @@
  * interface_method_impl{SUPDRVTRACERREG,pfnTracerOpen}
  */
-static DECLCALLBACK(int) supdrvDtTOps_TracerOpen(PCSUPDRVTRACERREG pThis, PSUPDRVSESSION pSession, uint32_t uCookie, 
+static DECLCALLBACK(int) supdrvDtTOps_TracerOpen(PCSUPDRVTRACERREG pThis, PSUPDRVSESSION pSession, uint32_t uCookie,
                                                  uintptr_t uArg, uintptr_t *puSessionData)
 {
@@ -653 +665 @@
         PFNRT      *ppfn;
     } s_aDTraceFunctions[] =
-    {   
+    {
         { "dtrace_probe",        (PFNRT*)&dtrace_probe        },
         { "dtrace_probe_create", (PFNRT*)&dtrace_probe_create },
@@ -663 +675 @@
     for (unsigned i = 0; i < RT_ELEMENTS(s_aDTraceFunctions); i++)
     {
-        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, s_aDTraceFunctions[i].pszName, 
+        rc = RTR0DbgKrnlInfoQuerySymbol(hKrnlInfo, NULL, s_aDTraceFunctions[i].pszName,
                                         (void **)s_aDTraceFunctions[i].ppfn);
         if (RT_FAILURE(rc))

trunk/src/bldprogs/VBoxTpG.cpp

@@ -136 +136 @@
 static const char           g_szAssemblerFmtVal32[]     = "macho32";
 static const char           g_szAssemblerFmtVal64[]     = "macho64";
+static const char           g_szAssemblerOsDef[]        = "RT_OS_DARWIN";
 #elif defined(RT_OS_OS2)
 static const char          *pszAssembler                = "nasm.exe";
@@ -141 +142 @@
 static const char           g_szAssemblerFmtVal32[]     = "obj";
 static const char           g_szAssemblerFmtVal64[]     = "elf64";
+static const char           g_szAssemblerOsDef[]        = "RT_OS_OS2";
 #elif defined(RT_OS_WINDOWS)
 static const char          *g_pszAssembler              = "yasm.exe";
@@ -146 +148 @@
 static const char           g_szAssemblerFmtVal32[]     = "win32";
 static const char           g_szAssemblerFmtVal64[]     = "win64";
+static const char           g_szAssemblerOsDef[]        = "RT_OS_WINDOWS";
 #else
 static const char          *g_pszAssembler              = "yasm";
@@ -151 +154 @@
 static const char           g_szAssemblerFmtVal32[]     = "elf32";
 static const char           g_szAssemblerFmtVal64[]     = "elf64";
+# ifdef RT_OS_FREEBSD
+static const char           g_szAssemblerOsDef[]        = "RT_OS_FREEBSD";
+# elif  defined(RT_OS_NETBSD)
+static const char           g_szAssemblerOsDef[]        = "RT_OS_NETBSD";
+# elif  defined(RT_OS_OPENBSD)
+static const char           g_szAssemblerOsDef[]        = "RT_OS_OPENBSD";
+# elif  defined(RT_OS_LINUX)
+static const char           g_szAssemblerOsDef[]        = "RT_OS_LINUX";
+# elif  defined(RT_OS_SOLARIS)
+static const char           g_szAssemblerOsDef[]        = "RT_OS_SOLARIS";
+# else
+#  error "Port me!"
+# endif
 #endif
 static const char          *g_pszAssemblerFmtVal        = RT_CONCAT(g_szAssemblerFmtVal, ARCH_BITS);
@@ -253 +269 @@
     else
         apszArgs[iArg++] = "RT_ARCH_AMD64";
+    if (g_szAssemblerOsDef[0])
+    {
+        apszArgs[iArg++] = g_pszAssemblerDefOpt;
+        apszArgs[iArg++] = g_szAssemblerOsDef;
+    }
     apszArgs[iArg++] = g_pszAssemblerIncOpt;
     apszArgs[iArg++] = g_pszAssemblerIncVal;
@@ -452 +473 @@
                     "  NAME(%%1):\n"
                     " %%endmacro\n"
-                    " ;[section VTG Obj align=4096]\n"
-                    " [section .data]\n"
+                    " [section __VTG __VTGObj        align=64]\n"
                     "\n"
                     "%%elifdef ASM_FORMAT_PE\n"
@@ -502 +522 @@
                     "    RTCCPTR_DEF NAME(g_aVTGArgLists)\n"
                     "    RTCCPTR_DEF NAME(g_aVTGArgLists_End)      - NAME(g_aVTGArgLists)\n"
+                    "%%ifdef ASM_FORMAT_MACHO ; Apple has a real decent linker!\n"
+                    "extern section$start$__VTG$__VTGPrLc\n"
+                    "    RTCCPTR_DEF section$start$__VTG$__VTGPrLc\n"
+                    "extern section$end$__VTG$__VTGPrLc\n"
+                    "    RTCCPTR_DEF section$end$__VTG$__VTGPrLc\n"
+                    "%%else\n"
                     "    RTCCPTR_DEF NAME(g_aVTGPrLc)\n"
                     "    RTCCPTR_DEF NAME(g_aVTGPrLc_End) ; cross section/segment size not possible\n"
+                    "%%endif\n"
                     "    RTCCPTR_DEF 0\n"
                     "    RTCCPTR_DEF 0\n"
@@ -642 +669 @@
                             "    dd %6u  ; name\n"
                             "    dd %6u  ; Argument list offset\n"
-                            "    dw g_fVTGProbeEnabled_%s_%s - g_afVTGProbeEnabled\n"
+                            "    dw NAME(g_fVTGProbeEnabled_%s_%s) - NAME(g_afVTGProbeEnabled)\n"
                             "    dw %6u  ; provider index\n"
                             "    dd 0       ; for the application\n"
@@ -1903 +1930 @@
         { "--probe-fn-name",                    kVBoxTpGOpt_ProbeFnName,                RTGETOPT_REQ_STRING  },
         { "--probe-fn-imported",                kVBoxTpGOpt_ProbeFnImported,            RTGETOPT_REQ_BOOL    },
+        /** @todo We're missing a bunch of assembler options! */
     };