Changeset 43055 in vbox

Timestamp:

Aug 28, 2012 11:50:20 PM (13 years ago)

Author:

vboxsync

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

80390

Message:

VBoxTpG.cpp: Fix for 32-bit mac KEXTs.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/bldprogs/VBoxTpG.cpp (modified) (11 diffs)

trunk/Config.kmk

@@ -2979 +2979 @@
 
 TEMPLATE_VBoxR0_USES               += dtrace
+TEMPLATE_VBoxR0_DTRACE_HDR_FLAGS    = --ring-0-context-agnostic
+TEMPLATE_VBoxR0_DTRACE_OBJ_FLAGS    = --ring-0-context-agnostic
 ifdef VBOX_WITH_DTRACE_R0
  TEMPLATE_VBoxR0_DTRACETOOL         = VBoxTpG

trunk/src/bldprogs/VBoxTpG.cpp

@@ -144 +144 @@
 static uint32_t             g_fTypeContext              = VTG_TYPE_CTX_R0;
 static const char          *g_pszContextDefine          = "IN_RING0";
+static const char          *g_pszContextDefine2         = NULL;
 static bool                 g_fApplyCpp                 = false;
 static uint32_t             g_cVerbosity                = 0;
@@ -297 +298 @@
     apszArgs[iArg++] = g_pszAssemblerDefOpt;
     apszArgs[iArg++] = g_pszContextDefine;
+    if (g_pszContextDefine2)
+    {
+        apszArgs[iArg++] = g_pszAssemblerDefOpt;
+        apszArgs[iArg++] = g_pszContextDefine2;
+    }
     if (g_szAssemblerOsDef[0])
     {
@@ -310 +316 @@
     apszArgs[iArg++] = pszTempAsm;
     apszArgs[iArg]   = NULL;
+    Assert(iArg <= RT_ELEMENTS(apszArgs));
 
     if (g_cVerbosity > 1)
@@ -458 +465 @@
                     "  NAME(%%1):\n"
                     " %%endmacro\n"
-                    " ; Section order hack!\n"
-                    " ; With the ld64-97.17 linker there was a problem with it determin the section\n"
-                    " ; order based on symbol references. The references to the start and end of the\n"
-                    " ; __VTGPrLc section forced it in front of __VTGObj.\n"
-                    " extern section$start$__VTG$__VTGObj\n"
-                    " extern section$end$__VTG$__VTGObj\n"
-                    " [section __VTG __VTGObj        align=1024]\n"
+                    "  %%ifdef IN_RING3\n"
+                    "   %%define VTG_NEW_MACHO_LINKER\n"
+                    "  %%elif ARCH_BITS == 64\n"
+                    "   %%define VTG_NEW_MACHO_LINKER\n"
+                    "  %%elifdef IN_RING0_AGNOSTIC\n"
+                    "   %%define VTG_NEW_MACHO_LINKER\n"
+                    "  %%endif\n"
+                    " %%ifdef VTG_NEW_MACHO_LINKER\n"
+                    "  ; Section order hack!\n"
+                    "  ; With the ld64-97.17 linker there was a problem with it determining the section\n"
+                    "  ; order based on symbol references. The references to the start and end of the\n"
+                    "  ; __VTGPrLc section forced it in front of __VTGObj, we want __VTGObj first.\n"
+                    "  extern section$start$__VTG$__VTGObj\n"
+                    "  extern section$end$__VTG$__VTGObj\n"
+                    " %%else\n"
+                    "  ; Creating 32-bit kext of the type MH_OBJECT. No fancy section end/start symbols handy.\n"
+                    "  [section __VTG __VTGObj        align=16]\n"
+                    "VTG_GLOBAL g_aVTGObj_LinkerPleaseNoticeMe, data\n"
+                    "  [section __VTG __VTGPrLc.Begin align=16]\n"
+                    "VTG_GLOBAL g_aVTGPrLc, data\n"
+                    "  [section __VTG __VTGPrLc align=16]\n"
+                    "VTG_GLOBAL g_aVTGPrLc_LinkerPleaseNoticeMe, data\n"
+                    "  [section __VTG __VTGPrLc.End   align=16]\n"
+                    "VTG_GLOBAL g_aVTGPrLc_End, data\n"
+                    " %%endif\n"
+                    " [section __VTG __VTGObj]\n"
                     "\n"
                     "%%elifdef ASM_FORMAT_PE\n"
@@ -518 +544 @@
                     "    dd          0\n"
                     "    dd          0\n"
-                    "%%ifdef ASM_FORMAT_MACHO ; Apple has a real decent linker!\n"
-                    "extern section$start$__VTG$__VTGPrLc\n"
+                    "%%ifdef VTG_NEW_MACHO_LINKER\n"
+                    " extern section$start$__VTG$__VTGPrLc\n"
                     "    RTCCPTR_DEF section$start$__VTG$__VTGPrLc\n"
                     " %%if ARCH_BITS == 32\n"
                     "    dd          0\n"
                     " %%endif\n"
-                    "extern section$end$__VTG$__VTGPrLc\n"
+                    " extern section$end$__VTG$__VTGPrLc\n"
                     "    RTCCPTR_DEF section$end$__VTG$__VTGPrLc\n"
                     " %%if ARCH_BITS == 32\n"
@@ -547 +573 @@
     ScmStreamPrintf(pStrm,
                     "    dd 0%08xh, 0%08xh, 0%08xh, 0%08xh\n"
-                    "%%ifdef ASM_FORMAT_MACHO\n"
+                    "%%ifdef VTG_NEW_MACHO_LINKER\n"
                     "    RTCCPTR_DEF section$start$__VTG$__VTGObj\n"
                     " %%if ARCH_BITS == 32\n"
@@ -2178 +2204 @@
         kVBoxTpGOpt_RawModeContext,
         kVBoxTpGOpt_Ring0Context,
+        kVBoxTpGOpt_Ring0ContextAgnostic,
         kVBoxTpGOpt_Ring3Context,
         kVBoxTpGOpt_End
@@ -2208 +2235 @@
         { "--raw-mode-context",                 kVBoxTpGOpt_RawModeContext,             RTGETOPT_REQ_NOTHING },
         { "--ring-0-context",                   kVBoxTpGOpt_Ring0Context,               RTGETOPT_REQ_NOTHING },
+        { "--ring-0-context-agnostic",          kVBoxTpGOpt_Ring0ContextAgnostic,       RTGETOPT_REQ_NOTHING },
         { "--ring-3-context",                   kVBoxTpGOpt_Ring3Context,               RTGETOPT_REQ_NOTHING },
         /** @todo We're missing a bunch of assembler options! */
@@ -2365 +2393 @@
                 g_fTypeContext = VTG_TYPE_CTX_RC;
                 g_pszContextDefine = "IN_RC";
+                g_pszContextDefine2 = NULL;
                 break;
 
@@ -2370 +2399 @@
                 g_fTypeContext = VTG_TYPE_CTX_R0;
                 g_pszContextDefine = "IN_RING0";
+                g_pszContextDefine2 = NULL;
+                break;
+
+            case kVBoxTpGOpt_Ring0ContextAgnostic:
+                g_fTypeContext = VTG_TYPE_CTX_R0;
+                g_pszContextDefine = "IN_RING0_AGNOSTIC";
+                g_pszContextDefine2 = "IN_RING0";
                 break;
 
@@ -2375 +2411 @@
                 g_fTypeContext = VTG_TYPE_CTX_R3;
                 g_pszContextDefine = "IN_RING3";
+                g_pszContextDefine2 = NULL;
                 break;