Changeset 2851

Timestamp:

Nov 2, 2006, 4:21:54 AM (19 years ago)

Author:

bird

Message:

kLdrMod done.

Location:

trunk/kLdr

Files:

• kLdr.h (modified) (4 diffs)
• kLdrHlp.h (modified) (1 diff)
• kLdrMod.c (modified) (24 diffs)

trunk/kLdr/kLdr.h

@@ -532 +532 @@
 
 
-/**
- * Loader module.
+/** Pointer to a module interpreter method table. */
+typedef struct KLDRMODOPS *PKLDRMODOPS;
+/** Pointer to const module interpreter methods table. */
+typedef const struct KLDRMODOPS *PCKLDRMODOPS;
+
+/**
+ * Module interpreter instance.
+ * All members are read only unless you're kLdrMod or the module interpreter.
  */
 typedef struct KLDRMOD
@@ -560 +566 @@
     /** The number of segments in the module. */
     uint32_t            cSegments;
+
+
+
     /** The module data. */
     void               *pvData;
@@ -565 +574 @@
     KLDRSEG             aSegments[1];
 } KLDRMOD, *PKLDRMOD, **PPKLDRMOD;
+
+
+
 
 
@@ -712 +724 @@
                             PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 /** @} */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 

trunk/kLdr/kLdrHlp.h

@@ -221 +221 @@
     } while (0)
 
+
+
+
+
+
+
+
+
+
 /** @} */
 

trunk/kLdr/kLdrMod.c

@@ -39 +39 @@
 # include "kLdrModELF64.h"
 #endif
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -115 +172 @@
 
     /*
-     * Use the magic to select the appropriate image interpreter.
+     * Use the magic to select the appropriate image interpreter.
      */
     if (u.u16 == IMAGE_DOS_SIGNATURE)
-        return KLDR_ERR_MZ_NOT_SUPPORTED;
+        r KLDR_ERR_MZ_NOT_SUPPORTED;
     else if (u.u16 == IMAGE_NE_SIGNATURE)
-        return KLDR_ERR_NE_NOT_SUPPORTED;
+        r KLDR_ERR_NE_NOT_SUPPORTED;
     else if (u.u16 == IMAGE_LX_SIGNATURE)
-        return KLDR_ERR_LX_NOT_SUPPORTED;
+        r KLDR_ERR_LX_NOT_SUPPORTED;
     else if (u.u16 == IMAGE_LE_SIGNATURE)
-        return KLDR_ERR_LE_NOT_SUPPORTED;
+        r KLDR_ERR_LE_NOT_SUPPORTED;
     else if (u.u32 == IMAGE_NT_SIGNATURE)
-        return KLDR_ERR_PE_NOT_SUPPORTED;
+        r KLDR_ERR_PE_NOT_SUPPORTED;
     else if (u.u32 == IMAGE_ELF_SIGNATURE)
-        return KLDR_ERR_ELF_NOT_SUPPORTED;
-    return KLDR_ERR_UNKNOWN_FORMAT;
+        rc = KLDR_ERR_ELF_NOT_SUPPORTED;
+    else
+        rc = KLDR_ERR_UNKNOWN_FORMAT;
+
+    /*
+     * If no head on hit, let each interpreter have a go.
+     */
+    if (rc)
+    {
+        PCKLDRMODOPS pOps;
+        for (pOps = g_pModInterpreterHead; pOps; pOps = pOps->pNext)
+        {
+            int rc2 = pOps->pfnCreate(pOps, pRdr, offHdr, ppMod);
+            if (!rc2)
+                return rc;
+        }
+        *ppMod = NULL;
+    }
+    return rc;
 }
 
@@ -162 +236 @@
  * before closing the module.
  *
- * @returns 0 on success,
+ * @returns 0 on success, non-zero on failure. The module instance state
+ *          is unknown on failure, it's best not to touch it.
  * @param   pMod    The module.
  */
 int     kLdrModClose(PKLDRMOD pMod)
 {
-    //pMod->
-    return -1;
-}
-
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnDestroy(pMod);
+}
 
 
@@ -194 +268 @@
                            const char *pszSymbol, PKLDRADDR puValue, uint32_t *pfKind)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    if (!puValue && !pfKind)
+        return KLDR_ERR_INVALID_PARAMETER;
+    if (puValue)
+        *puValue = 0;
+    if (pfKind)
+        *pfKind = 0;
+    return pMod->pOps->pfnDestroy(pMod);
 }
 
@@ -215 +296 @@
                            PFNKLDRMODENUMSYMS pfnCallback, void *pvUser)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    KLDRHLP_VALIDATE_FLAGS(fFlags, KLDRMOD_ENUM_SYMS_FLAGS_ALL);
+    return pMod->pOps->pfnEnumSymbols(pMod, fFlags, pvBits, BaseAddress, pfnCallback, pvUser);
 }
 
@@ -234 +317 @@
 int     kLdrModGetImport(PKLDRMOD pMod, void *pvBits, uint32_t iImport, const char *pszName, size_t cchName)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnGetImport(pMod, pvBits, iImport, pszName, cchName);
 }
 
@@ -248 +332 @@
 int32_t kLdrModNumberOfImports(PKLDRMOD pMod, void *pvBits)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnNumberOfImports(pMod, pvBits);
 }
 
@@ -263 +348 @@
 int     kLdrModCanExecuteOn(PKLDRMOD pMod, void *pvBits, KLDRARCH enmArch, KLDRCPU enmCpu)
 {
-    //return KLDR_ERR_ARCH_CPU_NOT_COMPATIBLE;
-    return 0;
+    ;
+    return ;
 }
 
@@ -282 +367 @@
 int     kLdrModGetStackInfo(PKLDRMOD pMod, void *pvBits, KLDRADDR BaseAddress, PKLDRSTACKINFO pStackInfo)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnGetStackInfo(pMod, pvBits, BaseAddress, pStackInfo);
 }
 
@@ -303 +389 @@
 int     kLdrModQueryMainEntrypoint(PKLDRMOD pMod, void *pvBits, KLDRADDR BaseAddress, PKLDRADDR pMainEPAddress)
 {
-    return 1;
+    KLDRMOD_VALIDATE(pMod);
+    *pMainEPAddress = 0;
+    return pMod->pOps->pfnQueryMainEntrypoint(pMod, pvBits, BaseAddress, pMainEPAddress);
 }
 
@@ -320 +408 @@
 int     kLdrModEnumDbgInfo(PKLDRMOD pMod, void *pvBits, PFNKLDRENUMDBG pfnCallback, void *pvUser)
 {
-    return 0;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnEnumDbgInfo(pMod, pvBits, pfnCallback, pvUser);
 }
 
@@ -335 +424 @@
 int     kLdrModHasDbgInfo(PKLDRMOD pMod, void *pvBits)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnHasDbgInfo(pMod, pvBits);
 }
 
@@ -351 +441 @@
 int     kLdrModMap(PKLDRMOD pMod)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnMap(pMod);
 }
 
@@ -363 +454 @@
 int     kLdrModUnmap(PKLDRMOD pMod)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnUnmap(pMod);
 }
 
@@ -378 +470 @@
 int     kLdrModAllocTLS(PKLDRMOD pMod)
 {
-    return 0;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnAllocTLS(pMod);
 }
 
@@ -393 +486 @@
 void    kLdrModFreeTLS(PKLDRMOD pMod)
 {
+
+
 }
 
@@ -409 +504 @@
 int     kLdrModReload(PKLDRMOD pMod)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnReload(pMod);
 }
 
@@ -426 +522 @@
 int     kLdrModFixupMapping(PKLDRMOD pMod, PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnFixupMapping(pMod, pfnGetImport, pvUser);
 }
 
@@ -438 +535 @@
 int     kLdrModCallInit(PKLDRMOD pMod)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnCallInit(pMod);
 }
 
@@ -452 +550 @@
 int     kLdrModCallTerm(PKLDRMOD pMod)
 {
-    return 0;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnCallTerm(pMod);
 }
 
@@ -466 +565 @@
 int     kLdrModCallThread(PKLDRMOD pMod, unsigned fAttachingOrDetaching)
 {
-    return 0;
+    KLDRMOD_VALIDATE(pMod);
+    KLDRHLP_VALIDATE_FLAGS(fAttachingOrDetaching, 1);
+    return pMod->pOps->pfnCallThread(pMod, fAttachingOrDetaching);
 }
 
@@ -478 +579 @@
 size_t  kLdrModSize(PKLDRMOD pMod)
 {
-    return 0;
+    KLDRMOD_VALIDATE_EX(pMod, 0);
+    return pMod->pOps->pfnSize(pMod);
 }
 
@@ -498 +600 @@
 int     kLdrModGetBits(PKLDRMOD pMod, void *pvBits, KLDRADDR BaseAddress, PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser)
 {
-    return -1;
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnGetBits(pMod, pvBits, BaseAddress, pfnGetImport, pvUser);
 }
 
@@ -517 +620 @@
                             PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser)
 {
-    return -1;
-}
-
+    KLDRMOD_VALIDATE(pMod);
+    return pMod->pOps->pfnRelocateBits(pMod, pvBits, NewBaseAddress, OldBaseAddress, pfnGetImport, pvUser);
+}
+