Changeset 2848 for trunk/kLdr/kLdrDyldMod.c

Timestamp:

Nov 2, 2006, 1:08:16 AM (19 years ago)

Author:

bird

Message:

stubbed all the interpreter entry points.

File:

• trunk/kLdr/kLdrDyldMod.c (modified) (8 diffs)

trunk/kLdr/kLdrDyldMod.c

@@ -704 +704 @@
      * Query number of prerequiste modules and allocate the array.
      */
-    cPrereqs = kLdrModNumberOfImports(pMod->pMod);
+    cPrereqs = kLdrModNumberOfImports(pMod->pMod, NULL);
     kldrHlpAssert(cPrereqs >= 0);
     if (pMod->cPrereqs != cPrereqs)
@@ -726 +726 @@
 
         KLDRDYLDMOD_ASSERT(pMod->papPrereqs[i] == NULL);
-        rc = kLdrModGetImport(pMod->pMod, i, s_szPrereq, sizeof(s_szPrereq));
+        rc = kLdrModGetImport(pMod->pMod, NULL, i, s_szPrereq, sizeof(s_szPrereq));
         if (rc)
             break;
@@ -993 +993 @@
     if (!g_fkLdrDyldDoneMainStack)
     {
-        rc = kLdrModGetStackInfo(pMod->pMod, &StackInfo);
+        rc = kLdrModGetStackInfo(pMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP, &StackInfo);
         if (!rc)
         {
@@ -1003 +1003 @@
 
             /* needs allocating? */
-            if (    StackInfo.uLinkAddress == ~(uintmax_t)0
+            if (    StackInfo.LinkAddress == NIL_KLDRADDR
                 ||  StackInfo.cbStack < cbDefOverride)
             {
@@ -1019 +1019 @@
             else
             {
-                KLDRDYLDMOD_ASSERT(StackInfo.uLoadAddress != ~(uintmax_t)0);
+                KLDRDYLDMOD_ASSERT(StackInfo.Address != NIL_KLDRADDR);
                 KLDRDYLDMOD_ASSERT(StackInfo.cbStack > 0);
 
                 g_fkLdrDyldMainStackAllocated = 0;
-                g_pvkLdrDyldMainStack = (void *)(uintptr_t)StackInfo.uLoadAddress;
-                KLDRDYLDMOD_ASSERT((uintptr_t)g_pvkLdrDyldMainStack == StackInfo.uLoadAddress);
+                g_pvkLdrDyldMainStack = (void *)(uintptr_t)StackInfo.Address;
+                KLDRDYLDMOD_ASSERT((uintptr_t)g_pvkLdrDyldMainStack == StackInfo.Address);
 
                 g_cbkLdrDyldMainStack = (size_t)StackInfo.cbStack;
@@ -1056 +1056 @@
 {
     int         rc;
-    uintmax_t   uValue;
+    KLDRADDR    MainEPAddress;
     void       *pvStack;
     size_t      cbStack;
     KLDRDYLDMOD_ASSERT(pMod->fExecutable);
 
-    rc = kLdrModQueryMainEntrypoint(pMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP, &uValue);
+    rc = kLdrModQueryMainEntrypoint(pMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP, &MainEPAddress);
     if (rc)
         return rc;
@@ -1067 +1067 @@
     if (rc)
         return rc;
-    return kldrDyldOSStartExe((uintptr_t)uValue, pvStack, cbStack);
+    return kldrDyldOSStartExe((uintptr_t)MainEPAddress, pvStack, cbStack);
 }
 
@@ -1125 +1125 @@
 {
     int         rc;
-    uintmax_t   uValue = 0;
+    KLDRADDR    uValue = 0;
     uint32_t    fKind = 0;
 
     rc = kLdrModQuerySymbol(pMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
-                            pszSymbolName ? pszSymbolName : (const char *)uSymbolOrdinal, &uValue, pfKind);
+                            uSymbolOrdinal, pszSymbolName, &uValue, &fKind);
     if (!rc)
     {