Changeset 81 for trunk/kLdr/kLdrModLX.c

Timestamp:

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

Author:

bird

Message:

kLdr: some refactoring and fixes.

File:

• trunk/kLdr/kLdrModLX.c (modified) (12 diffs)

trunk/kLdr/kLdrModLX.c

@@ -128 +128 @@
 static void kLdrModLXMemCopyW(KU8 *pbDst, const KU8 *pbSrc, int cb);
 static int kldrModLXDoProtect(PKLDRMODLX pModLX, void *pvBits, unsigned fUnprotectOrProtect);
-static int kldrModLXDoCallDLL(PKLDRMODLX pModLX, unsigned uOp, KUPTR uHandle);
+static int kldrModLXDoCallDLL(PKLDRMODLX pModLX, void *pvMapping, unsigned uOp, KUPTR uHandle);
 static int kldrModLXDoForwarderQuery(PKLDRMODLX pModLX, const struct e32_entry *pEntry,
                                      PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, KU32 *pfKind);
@@ -1937 +1937 @@
 
 /** @copydoc kLdrModAllocTLS */
-static int kldrModLXAllocTLS(PKLDRMOD pMod)
+static int kldrModLXAllocTLS(PKLDRMOD pMod, void *pvMapping)
 {
     PKLDRMODLX  pModLX = (PKLDRMODLX)pMod->pvData;
 
     /* no tls, just do the error checking. */
-    if (!pModLX->pvMapping)
+    if (   pvMapping == KLDRMOD_INT_MAP
+        && pModLX->pvMapping)
         return KLDR_ERR_NOT_MAPPED;
     return 0;
@@ -1949 +1950 @@
 
 /** @copydoc kLdrModFreeTLS */
-static void kldrModLXFreeTLS(PKLDRMOD pMod)
+static void kldrModLXFreeTLS(PKLDRMOD pMod, void *pvMapping)
 {
     /* no tls. */
     K_NOREF(pMod);
+    K_NOREF(pvMapping);
 
 }
@@ -2027 +2029 @@
 
 /** @copydoc kLdrModCallInit */
-static int kldrModLXCallInit(PKLDRMOD pMod, KUPTR uHandle)
+static int kldrModLXCallInit(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle)
 {
     PKLDRMODLX pModLX = (PKLDRMODLX)pMod->pvData;
@@ -2035 +2037 @@
      * Mapped?
      */
-    if (!pModLX->pvMapping)
-        return KLDR_ERR_NOT_MAPPED;
+    if (pvMapping == KLDRMOD_INT_MAP)
+    {
+        pvMapping = pModLX->pvMapping;
+        if (!pvMapping)
+            return KLDR_ERR_NOT_MAPPED;
+    }
 
     /*
@@ -2042 +2048 @@
      */
     if ((pModLX->Hdr.e32_mflags & E32MODMASK) == E32MODDLL)
-        rc = kldrModLXDoCallDLL(pModLX, 0 /* attach */, uHandle);
+        rc = kldrModLXDoCallDLL(pModLX, pvMapping, 0 /* attach */, uHandle);
     else
         rc = 0;
@@ -2055 +2061 @@
  * @returns KLDR_ERR_MODULE_INIT_FAILED  or KLDR_ERR_THREAD_ATTACH_FAILED on failure.
  * @param   pModLX          The LX module interpreter instance.
+ * @param   pvMapping       The module mapping to use (resolved).
  * @param   uOp             The operation (DLL_*).
  * @param   uHandle         The module handle to present.
  */
-static int kldrModLXDoCallDLL(PKLDRMODLX pModLX, unsigned uOp, KUPTR uHandle)
+static int kldrModLXDoCallDLL(PKLDRMODLX pModLX, void *pvMapping, unsigned uOp, KUPTR uHandle)
 {
     int rc;
@@ -2072 +2079 @@
      * Invoke the entrypoint and convert the boolean result to a kLdr status code.
      */
-    rc = kldrModLXDoCall((KUPTR)pModLX->pvMapping
+    rc = kldrModLXDoCall((KUPTR)pvMapping
                          + (KUPTR)pModLX->pMod->aSegments[pModLX->Hdr.e32_startobj - 1].RVA
                          + pModLX->Hdr.e32_eip,
@@ -2150 +2157 @@
 
 /** @copydoc kLdrModCallTerm */
-static int kldrModLXCallTerm(PKLDRMOD pMod, KUPTR uHandle)
+static int kldrModLXCallTerm(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle)
 {
     PKLDRMODLX  pModLX = (PKLDRMODLX)pMod->pvData;
@@ -2157 +2164 @@
      * Mapped?
      */
-    if (!pModLX->pvMapping)
-        return KLDR_ERR_NOT_MAPPED;
+    if (pvMapping == KLDRMOD_INT_MAP)
+    {
+        pvMapping = pModLX->pvMapping;
+        if (!pvMapping)
+            return KLDR_ERR_NOT_MAPPED;
+    }
 
     /*
@@ -2164 +2175 @@
      */
     if ((pModLX->Hdr.e32_mflags & E32MODMASK) == E32MODDLL)
-        kldrModLXDoCallDLL(pModLX, 1 /* detach */, uHandle);
+        kldrModLXDoCallDLL(pModLX, pvMapping, 1 /* detach */, uHandle);
 
     return 0;
@@ -2171 +2182 @@
 
 /** @copydoc kLdrModCallThread */
-static int kldrModLXCallThread(PKLDRMOD pMod, KUPTR uHandle, unsigned fAttachingOrDetaching)
+static int kldrModLXCallThread(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle, unsigned fAttachingOrDetaching)
 {
     /* no thread attach/detach callout. */
     K_NOREF(pMod);
+    K_NOREF(pvMapping);
     K_NOREF(uHandle);
     K_NOREF(fAttachingOrDetaching);