Changeset 81 for trunk/include/k/kLdr.h

Timestamp:

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

Author:

bird

Message:

kLdr: some refactoring and fixes.

File:

• trunk/include/k/kLdr.h (modified) (4 diffs)

trunk/include/k/kLdr.h

@@ -637 +637 @@
 int     kLdrModMap(PKLDRMOD pMod);
 int     kLdrModUnmap(PKLDRMOD pMod);
-int     kLdrModAllocTLS(PKLDRMOD pMod);
-void    kLdrModFreeTLS(PKLDRMOD pMod);
 int     kLdrModReload(PKLDRMOD pMod);
 int     kLdrModFixupMapping(PKLDRMOD pMod, PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
-int     kLdrModCallInit(PKLDRMOD pMod, KUPTR uHandle);
-int     kLdrModCallTerm(PKLDRMOD pMod, KUPTR uHandle);
-int     kLdrModCallThread(PKLDRMOD pMod, KUPTR uHandle, unsigned fAttachingOrDetaching);
 /** @} */
 
@@ -652 +647 @@
 int     kLdrModRelocateBits(PKLDRMOD pMod, void *pvBits, KLDRADDR NewBaseAddress, KLDRADDR OldBaseAddress,
                             PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
+/** @} */
+
+/** @name Operations on both internally and externally managed mappings.
+ * @{ */
+/** Special pvMapping value to pass to kLdrModAllocTLS,
+ * kLdrModFreeTLS, kLdrModCallInit, kLdrModCallTerm, and kLdrModCallThread that
+ * specifies the internal mapping (kLdrModMap). */
+#define KLDRMOD_INT_MAP    ((void *)~(KUPTR)0)
+int     kLdrModAllocTLS(PKLDRMOD pMod, void *pvMapping);
+void    kLdrModFreeTLS(PKLDRMOD pMod, void *pvMapping);
+int     kLdrModCallInit(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle);
+int     kLdrModCallTerm(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle);
+int     kLdrModCallThread(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle, unsigned fAttachingOrDetaching);
 /** @} */
 
@@ -726 +734 @@
     int (* pfnUnmap)(PKLDRMOD pMod);
     /** @copydoc kLdrModAllocTLS */
-    int (* pfnAllocTLS)(PKLDRMOD pMod);
+    int (* pfnAllocTLS)(PKLDRMOD pMod, void *pvMapping);
     /** @copydoc kLdrModFreeTLS */
-    void (*pfnFreeTLS)(PKLDRMOD pMod);
+    void (*pfnFreeTLS)(PKLDRMOD pMod, void *pvMapping);
     /** @copydoc kLdrModReload */
     int (* pfnReload)(PKLDRMOD pMod);
@@ -734 +742 @@
     int (* pfnFixupMapping)(PKLDRMOD pMod, PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
     /** @copydoc kLdrModCallInit */
-    int (* pfnCallInit)(PKLDRMOD pMod, KUPTR uHandle);
+    int (* pfnCallInit)(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle);
     /** @copydoc kLdrModCallTerm */
-    int (* pfnCallTerm)(PKLDRMOD pMod, KUPTR uHandle);
+    int (* pfnCallTerm)(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle);
     /** @copydoc kLdrModCallThread */
-    int (* pfnCallThread)(PKLDRMOD pMod, KUPTR uHandle, unsigned fAttachingOrDetaching);
+    int (* pfnCallThread)(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle, unsigned fAttachingOrDetaching);
     /** @copydoc kLdrModSize */
     KLDRADDR (* pfnSize)(PKLDRMOD pMod);