Changeset 2893 for trunk/kLdr/kLdrModLX.c

Timestamp:

Dec 22, 2006, 7:01:38 PM (19 years ago)

Author:

bird

Message:

made it compile again.

File:

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

trunk/kLdr/kLdrModLX.c

@@ -118 +118 @@
 static int kldrModLXDoCreate(PKLDRRDR pRdr, off_t offNewHdr, PKLDRMODLX *ppModLX);
 static const uint8_t *kldrModLXDoNameTableLookupByOrdinal(const uint8_t *pbNameTable, int32_t cbNameTable, uint32_t iOrdinal);
-static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pszSymbol, uint32_t *piSymbol);
+static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, uint32_t cchSymbol, uint32_t *piSymbol);
 #if 0
 static const uint8_t *kldrModLXDoNameTableLookupByName(const uint8_t *pbNameTable, int32_t cbNameTable,
@@ -542 +542 @@
 /** @copydoc kLdrModQuerySymbol */
 static int kldrModLXQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t iSymbol,
-                                const char *pszSymbol, PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser,
-                                PKLDRADDR puValue, uint32_t *pfKind)
+                                const char *pchSymbol, size_t cchSymbol, const char *pszVersion,
+                                PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, uint32_t *pfKind)
 {
     PKLDRMODLX                  pModLX = (PKLDRMODLX)pMod->pvData;
@@ -560 +560 @@
      * Translate the symbol name into an ordinal.
      */
-    if (pszSymbol)
-    {
-        rc = kldrModLXDoNameLookup(pModLX, pszSymbol, &iSymbol);
+    if (pchSymbol)
+    {
+        rc = kldrModLXDoNameLookup(pModLX, pchSymbol, cchSymbol, &iSymbol);
         if (rc)
             return rc;
@@ -625 +625 @@
                     /* anyone actually using TYPEINFO will end up here. */
                     KLDRMODLX_ASSERT(!"Bad bundle type");
-                    break;
+                    return KLDR_ERR_LX_BAD_BUNDLE;
             }
 
@@ -664 +664 @@
  * @returns See kLdrModQuerySymbol.
  * @param   pModLX      The module to lookup the symbol in.
- * @param   pszSymbol   The symbol to lookup.
+ * @param   pchSymbol   The symbol to lookup.
+ * @param   cchSymbol   The symbol name length.
  * @param   piSymbol    Where to store the symbol ordinal.
  */
-static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pszSymbol, uint32_t *piSymbol)
+static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, uint32_t cchSymbol, uint32_t *piSymbol)
 {
 
@@ -774 +775 @@
     int rc;
     uint32_t iSymbol;
-    const char *pszSymbol;
+    const char *pchSymbol;
+    uint8_t cchSymbol;
 
     if (!pfnGetForwarder)
@@ -792 +794 @@
     {
         iSymbol = pEntry->e32_variant.e32_fwd.value;
-        pszSymbol = NULL;                   /* no symbol name. */
+        pchSymbol = NULL;                   /* no symbol name. */
+        cchSymbol = 0;
     }
     else
@@ -858 +861 @@
                 return KLDR_ERR_LX_BAD_FORWARDER;
 
-            pszSymbol = NULL;               /* no symbol name. */
+            pchSymbol = NULL;               /* no symbol name. */
+            cchSymbol = 0;
         }
         else
         {
-            /* Make a stack copy of the name that's zero terminated. */
-            char *pszCopy = kLdrHlpAllocA(*pbName + 1);
-            kLdrHlpMemCopy(pszCopy, pbName + 1, *pbName);
-            pszCopy[*pbName] = '\0';
-
-            pszSymbol = pszCopy;
+            pchSymbol = (char *)pbName + 1;
+            cchSymbol = *pbName;
             iSymbol = NIL_KLDRMOD_SYM_ORDINAL;
         }
@@ -875 +875 @@
      * Resolve the forwarder.
      */
-    rc = pfnGetForwarder(pModLX->pMod, pEntry->e32_variant.e32_fwd.modord - 1, iSymbol, pszSymbol, puValue, pfKind, pvUser);
+    rc = pfnGetForwarder(pModLX->pMod, pEntry->e32_variant.e32_fwd.modord - 1, iSymbol, pchSymbol, cchSymbol, NULL, puValue, pfKind, pvUser);
     if (!rc && pfKind)
         *pfKind |= KLDRSYMKIND_FORWARDER;
@@ -2004 +2004 @@
          * Iterate the page map pages.
          */
-        for (iPage = 0; !rc && iPage < pObj->o32_mapsize; iPage++, pbPage += OBJPAGELEN)
+        for (iPage = 0, rc = 0; !rc && iPage < pObj->o32_mapsize; iPage++, pbPage += OBJPAGELEN)
         {
             const uint8_t * const   pbFixupRecEnd = pModLX->pbFixupRecs + pModLX->paoffPageFixups[iPage + pObj->o32_pagemap];
@@ -2115 +2115 @@
 
                         /* resolve it. */
-                        rc = pfnGetImport(pMod, iModule, iSymbol, NULL, &uValue, &fKind, pvUser);
+                        rc = pfnGetImport(pMod, iModule, iSymbol, NULL, 0, NULL, &uValue, &fKind, pvUser);
                         if (rc)
                             return rc;
@@ -2129 +2129 @@
                         uint16_t offSymbol;
                         const uint8_t *pbSymbol;
-                        char szSymbol[260];
 
                         /* the module ordinal */
@@ -2166 +2165 @@
 
                         /* resolve it. */
-                        kLdrHlpMemCopy(szSymbol, pbSymbol + 1, *pbSymbol);
-                        szSymbol[*pbSymbol] = '\0';
-                        rc = pfnGetImport(pMod, iModule, NIL_KLDRMOD_SYM_ORDINAL, szSymbol, &uValue, &fKind, pvUser);
+                        rc = pfnGetImport(pMod, iModule, NIL_KLDRMOD_SYM_ORDINAL, (const char *)pbSymbol + 1, *pbSymbol, NULL,
+                                          &uValue, &fKind, pvUser);
                         if (rc)
                             return rc;
@@ -2263 +2261 @@
     kldrModLXGetStackInfo,
     kldrModLXQueryMainEntrypoint,
+    NULL /* fixme */,
+    NULL /* fixme */,
     kldrModLXEnumDbgInfo,
     kldrModLXHasDbgInfo,
@@ -2277 +2277 @@
     kldrModLXGetBits,
     kldrModLXRelocateBits,
+    NULL /* fixme: pfnMostlyDone */,
     42 /* the end */
 };