Changeset 37566 in vbox

Timestamp:

Jun 20, 2011 11:42:13 PM (13 years ago)

Author:

vboxsync

Message:

more testing, bugfixing and docs.

Location:

trunk/src/VBox/Runtime

Files:

• r0drv/darwin/mach_kernel-r0drv-darwin.cpp (modified) (6 diffs)
• testcase/tstRTDarwinMachKernel.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/darwin/mach_kernel-r0drv-darwin.cpp

@@ -26 +26 @@
 
 
+#define RTMEM_WRAP_TO_EF_APIS
 /*******************************************************************************
 *   Header Files                                                               *
@@ -173 +174 @@
     RTMemFree(pKernel->pachStrTab);
     pKernel->pachStrTab = NULL;
+
     RTMemFree(pKernel->paSyms);
     pKernel->paSyms = NULL;
@@ -192 +194 @@
     RTMemFree(pKernel->pLoadCmds);
     pKernel->pLoadCmds = NULL;
-    RT_ZERO(pKernel->apSections);
+    memset((void *)&pKernel->apSections[0], 0, sizeof(pKernel->apSections[0]) * MACHO_MAX_SECT);
 }
 
@@ -230 +232 @@
 
 
+/* Rainy day: Find the right headers for these symbols ... if there are any. */
 extern "C" void ev_try_lock(void);
 extern "C" void OSMalloc(void);
 extern "C" void OSlibkernInit(void);
-extern "C" int osrelease;
-extern "C" int ostype;
+extern "C" int  osrelease;
+extern "C" int  ostype;
 extern "C" void kdp_set_interface(void);
 
+
+/**
+ * Check the symbol table against symbols we known symbols. 
+ *  
+ * This is done to detect whether the on disk image and the in 
+ * memory images matches.  Mismatches could stem from user 
+ * replacing the default kernel image on disk.
+ *  
+ * @returns IPRT status code.
+ * @param   pKernel             The internal scratch data.
+ */
 static int rtR0DarwinMachKernelCheckStandardSymbols(PRTR0DARWINKERNEL pKernel)
 {
@@ -804 +818 @@
 
 
+/**
+ * Opens symbol table of the mach_kernel. 
+ *  
+ * @returns IPRT status code.
+ * @param   pszMachKernel   The path to the mach_kernel image.
+ * @param   ppHandle        Where to return a handle on success. 
+ *                          Call rtR0DarwinMachKernelClose on it
+ *                          when done.
+ */
 static int rtR0DarwinMachKernelOpen(const char *pszMachKernel, PRTR0DARWINKERNEL *ppHandle)
 {
+    *ppHandle = NULL;
     PRTR0DARWINKERNEL pKernel = (PRTR0DARWINKERNEL)RTMemAllocZ(sizeof(*pKernel));
     if (!pKernel)
@@ -822 +846 @@
 
     rtR0DarwinMachKernelLoadDone(pKernel);
-    if (RT_FAILURE(rc))
+    if (RT_SUCCESS(rc))
+        *ppHandle = pKernel;
+    else
         rtR0DarwinMachKernelClose(pKernel);
     return rc;

trunk/src/VBox/Runtime/testcase/tstRTDarwinMachKernel.cpp

@@ -39 +39 @@
     PRTR0DARWINKERNEL pKernel;
     RTTESTI_CHECK_RC_RETV(rtR0DarwinMachKernelOpen(pszMachKernel, &pKernel), VINF_SUCCESS);
+    static const char * const s_apszSyms[] =
+    {
+        "ast_pending",
+        "i386_signal_cpu",
+        "i386_cpu_IPI",
+        "dtrace_register",
+        "dtrace_suspend",
+    };
+    for (unsigned i = 0; i < RT_ELEMENTS(s_apszSyms); i++)
+    {
+        uintptr_t uPtr = rtR0DarwinMachKernelLookup(pKernel, s_apszSyms[i]);
+        RTTestIPrintf(RTTESTLVL_ALWAYS, "%p %s\n", uPtr, s_apszSyms[i]);
+        RTTESTI_CHECK(uPtr != 0);
+    }
+    rtR0DarwinMachKernelClose(pKernel);
 }