Changeset 81 for trunk/kLdr/kLdrModNative.c

Timestamp:

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

Author:

bird

Message:

kLdr: some refactoring and fixes.

File:

• trunk/kLdr/kLdrModNative.c (modified) (9 diffs)

trunk/kLdr/kLdrModNative.c

@@ -145 +145 @@
 static KI32 kldrModNativeNumberOfImports(PKLDRMOD pMod, const void *pvBits);
 
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+extern KLDRMODOPS g_kLdrModNativeOps;
+
 
 
@@ -157 +162 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModNativeCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+static int kldrModNativeCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KU32 fFlags, KCPUARCH enmCpuArch,
+                               KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     int rc = kLdrModOpenNative(kRdrName(pRdr), ppMod);
@@ -510 +516 @@
      * We're done.
      */
+    pMod->u32Magic = KLDRMOD_MAGIC;
+    pMod->pOps = &g_kLdrModNativeOps;
     *ppMod = pMod;
     return 0;
@@ -943 +951 @@
 
         rc = pfnCallback(pMod, iDbgInfo,
-                         enmDbgInfoType, pDbgDir->MajorVersion, pDbgDir->MinorVersion,
+                         enmDbgInfoType, pDbgDir->MajorVersion, pDbgDir->MinorVersion, NULL /*pszPartNm*/,
                          pDbgDir->PointerToRawData ? pDbgDir->PointerToRawData : -1,
                          pDbgDir->AddressOfRawData ? pDbgDir->AddressOfRawData : NIL_KLDRADDR,
                          pDbgDir->SizeOfData,
-                         NULL,
-                         pvUser);
+                         NULL /*pszExtFile*/, pvUser);
         if (rc)
             break;
@@ -1016 +1023 @@
 
 /** @copydoc kLdrModAllocTLS */
-static int kldrModNativeAllocTLS(PKLDRMOD pMod)
+static int kldrModNativeAllocTLS(PKLDRMOD pMod, void *pvMapping)
 {
     return 0;
@@ -1023 +1030 @@
 
 /** @copydoc kLdrModFreeTLS */
-static void kldrModNativeFreeTLS(PKLDRMOD pMod)
+static void kldrModNativeFreeTLS(PKLDRMOD pMod, void *pvMapping)
 {
 }
@@ -1043 +1050 @@
 
 /** @copydoc kLdrModCallInit */
-static int kldrModNativeCallInit(PKLDRMOD pMod, KUPTR uHandle)
+static int kldrModNativeCallInit(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle)
 {
     return 0;
@@ -1050 +1057 @@
 
 /** @copydoc kLdrModCallTerm */
-static int kldrModNativeCallTerm(PKLDRMOD pMod, KUPTR uHandle)
+static int kldrModNativeCallTerm(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle)
 {
     return 0;
@@ -1057 +1064 @@
 
 /** @copydoc kLdrModCallThread */
-static int kldrModNativeCallThread(PKLDRMOD pMod, KUPTR uHandle, unsigned fAttachingOrDetaching)
+static int kldrModNativeCallThread(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle, unsigned fAttachingOrDetaching)
 {
     return 0;