Merge branch 'main' into new_ldr

Author: kynex7510

CMakeLists.txt

@@ -5,7 +5,7 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 project(dl)
 
-CPMAddPackage("gh:kynex7510/CTRL#b37a459")
+CPMAddPackage("gh:kynex7510/CTRL#3b5ed7e")
 
 set(DL_SOURCES
     Source/API.c

Include/dlfcn.h

@@ -32,7 +32,7 @@ typedef struct {
 
 #if defined(__cplusplus)
 extern "C" {
-#endif
+#endif // __cplusplus
 
 void* dlopen(const char* path, int flags);
 int dlclose(void* handle);
@@ -52,6 +52,6 @@ void ctrdlFreeInfo(CTRDLInfo* info);
 
 #if defined(__cplusplus)
 }
-#endif
+#endif // cplusplus
 
 #endif /* _CTRDL_DLFCN_H */

Source/Loader.c

@@ -12,7 +12,7 @@
 #ifdef CTRDL_RESERVED_CODE_PAGES
 u32 __ctrl_code_allocator_pages = CTRDL_RESERVED_CODE_PAGES;
 #else
-u32 __ctrl_code_allocator_pages = 128; // Default to 512kb.
+u32 __ctrl_code_allocator_pages = 256; // Default to 1MB.
 #endif // CTRDL_RESERVED_CODE_PAGES
 
 typedef struct {

Source/Relocs.c

@@ -1,6 +1,8 @@
 #include "Relocs.h"
 #include "Symbol.h"
 
+#include <string.h> // strcmp
+
 typedef struct {
     CTRDLHandle* handle;
     CTRDLElf* elf;
@@ -23,6 +25,7 @@ static u32 ctrdl_resolveSymbol(const RelContext* ctx, Elf32_Word index, bool* is
         return 0;
     }
 
+    u32 symBase = 0;
     const Elf32_Sym* symEntry = &ctx->elf->symEntries[index];
     const char* name = &ctx->elf->stringTable[symEntry->st_name];
     *isWeak = ELF32_ST_BIND(symEntry->st_info) == STB_WEAK;
@@ -47,20 +50,40 @@ static u32 ctrdl_resolveSymbol(const RelContext* ctx, Elf32_Word index, bool* is
         CTRDLHandle* h = ctrdl_unsafeGetHandleByIndex(i);
         if (h->flags & RTLD_GLOBAL) {
             sym = ctrdl_symNameLookupSingle(h, name);
-            if (sym)
+            if (sym) {
+                symBase = h->base;
                 break;
+            }
         }
     }
 
     ctrdl_releaseHandleMtx();
 
+    if (!sym) {
+        // Look into ourselves.
+        if (ctx->elf->numSymChains) {
+            const Elf32_Word hash = ctrdl_getELFSymNameHash(name);
+            size_t chainIndex = ctx->elf->symBuckets[hash % ctx->elf->numSymBuckets];
+
+            while (chainIndex != STN_UNDEF) {
+                const Elf32_Sym* candidate = &ctx->elf->symEntries[chainIndex];
+                if (!strcmp(&ctx->elf->stringTable[candidate->st_name], name)) {
+                    sym = candidate;
+                    symBase = ctx->handle->base;
+                    break;
+                }
+
+                chainIndex = ctx->elf->symChains[chainIndex];
+            }
+        }
+    }
+
     if (!sym) {
         // Look into dependencies.
-        // TODO: sym info for current module is not setup; do we need to look into ourselves?
-        sym = ctrdl_symNameLookupLoadOrder(ctx->handle, name);
+        sym = ctrdl_symNameLookupLoadOrder(ctx->handle, name, &symBase);
     }
 
-    return sym ? (ctx->handle->base + sym->st_value) : 0;
+    return sym ? (symBase + sym->st_value) : 0;
 }
 
 static bool ctrdl_handleSingleReloc(RelContext* ctx, RelEntry* entry) {

Source/Symbol.c

@@ -64,7 +64,7 @@ const Elf32_Sym* ctrdl_symNameLookupSingle(CTRDLHandle* handle, const char* name
     return found;
 }
 
-const Elf32_Sym* ctrdl_symNameLookupLoadOrder(CTRDLHandle* handle, const char* name) {
+const Elf32_Sym* ctrdl_symNameLookupLoadOrder(CTRDLHandle* handle, const char* name, u32* modBase) {
     const Elf32_Sym* found = NULL;
 
     if (handle) {
@@ -73,10 +73,12 @@ const Elf32_Sym* ctrdl_symNameLookupLoadOrder(CTRDLHandle* handle, const char* n
         found = ctrdl_symNameLookupSingle(handle, name);
         if (!found) {
             for (size_t i = 0; i < CTRDL_MAX_DEPS; ++i) {
-                found = ctrdl_symNameLookupLoadOrder(handle->deps[i], name);
+                found = ctrdl_symNameLookupLoadOrder(handle->deps[i], name, modBase);
                 if (found)
                     break;
             }
+        } else if (modBase) {
+            *modBase = handle->base;
         }
 
         ctrdl_unlockHandle(handle);

Source/Symbol.h

@@ -4,7 +4,7 @@
 #include "Handle.h"
 
 const Elf32_Sym* ctrdl_symNameLookupSingle(CTRDLHandle* handle, const char* name);
-const Elf32_Sym* ctrdl_symNameLookupLoadOrder(CTRDLHandle* handle, const char* name);
+const Elf32_Sym* ctrdl_symNameLookupLoadOrder(CTRDLHandle* handle, const char* name, u32* modBase);
 const Elf32_Sym* ctrdl_symNameLookupDepOrder(CTRDLHandle* handle, const char* name);
 const Elf32_Sym* ctrdl_symValueLookupSingle(CTRDLHandle* handle, Elf32_Word value);