Changeset 81 for trunk/kLdr/kLdrModMachO.c

Timestamp:

Aug 19, 2016, 12:10:38 AM (9 years ago)

Author:

bird

Message:

kLdr: some refactoring and fixes.

File:

• trunk/kLdr/kLdrModMachO.c (modified) (6 diffs)

trunk/kLdr/kLdrModMachO.c

@@ -2491 +2491 @@
 
 /** @copydoc kLdrModAllocTLS */
-static int kldrModMachOAllocTLS(PKLDRMOD pMod)
+static int kldrModMachOAllocTLS(PKLDRMOD pMod, void *pvMapping)
 {
     PKLDRMODMACHO pModMachO = (PKLDRMODMACHO)pMod->pvData;
@@ -2498 +2498 @@
      * Mapped?
      */
-    if (!pModMachO->pvMapping)
+    if (   pvMapping == KLDRMOD_INT_MAP
+        && !pModMachO->pvMapping )
         return KLDR_ERR_NOT_MAPPED;
     return 0;
@@ -2505 +2506 @@
 
 /** @copydoc kLdrModFreeTLS */
-static void kldrModMachOFreeTLS(PKLDRMOD pMod)
+static void kldrModMachOFreeTLS(PKLDRMOD pMod, void *pvMapping)
 {
     K_NOREF(pMod);
+    K_NOREF(pvMapping);
 }
 
@@ -3455 +3457 @@
 
 /** @copydoc kLdrModCallInit */
-static int kldrModMachOCallInit(PKLDRMOD pMod, KUPTR uHandle)
+static int kldrModMachOCallInit(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle)
 {
     /* later */
     K_NOREF(pMod);
+    K_NOREF(pvMapping);
     K_NOREF(uHandle);
     return 0;
@@ -3465 +3468 @@
 
 /** @copydoc kLdrModCallTerm */
-static int kldrModMachOCallTerm(PKLDRMOD pMod, KUPTR uHandle)
+static int kldrModMachOCallTerm(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle)
 {
     /* later */
     K_NOREF(pMod);
+    K_NOREF(pvMapping);
     K_NOREF(uHandle);
     return 0;
@@ -3475 +3479 @@
 
 /** @copydoc kLdrModCallThread */
-static int kldrModMachOCallThread(PKLDRMOD pMod, KUPTR uHandle, unsigned fAttachingOrDetaching)
+static int kldrModMachOCallThread(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle, unsigned fAttachingOrDetaching)
 {
     /* Relevant for Mach-O? */
     K_NOREF(pMod);
+    K_NOREF(pvMapping);
     K_NOREF(uHandle);
     K_NOREF(fAttachingOrDetaching);