X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Floadlib.c;h=2a0830302c923e33b1d1bda9717817d6b9e89070;hb=230612b2efeeb769f1d96193ec01b10bd36d9873;hp=53073019330baac99c440289cd7c442a2165743d;hpb=b806b8f55067584cb90fe20277235369a1111c66;p=tpg%2Facess2.git diff --git a/Usermode/Libraries/ld-acess.so_src/loadlib.c b/Usermode/Libraries/ld-acess.so_src/loadlib.c index 53073019..2a083030 100644 --- a/Usermode/Libraries/ld-acess.so_src/loadlib.c +++ b/Usermode/Libraries/ld-acess.so_src/loadlib.c @@ -4,6 +4,7 @@ */ #include "common.h" #include +#include #include #define DEBUG 0 @@ -14,25 +15,56 @@ # define DEBUGS(v...) #endif -// === PROTOTYPES === -void *IsFileLoaded(const char *file); +#define MAX_QUEUED_ENTRYPOINTS 8 // === IMPORTS === -extern const struct { - void *Value; - char *Name; -} caLocalExports[]; +extern const tLocalExport caLocalExports[]; extern const int ciNumLocalExports; extern char **gEnvP; extern char gLinkedBase[]; +// === TYPES === +typedef void tLibEntry(void *, int, char *[], char**); + +// === PROTOTYPES === +void *IsFileLoaded(const char *file); + // === GLOABLS === tLoadedLib gLoadedLibraries[MAX_LOADED_LIBRARIES]; char gsLoadedStrings[MAX_STRINGS_BYTES]; char *gsNextAvailString = gsLoadedStrings; +struct sQueuedEntry { + void *Base; + tLibEntry *Entry; +} gaQueuedEntrypoints[MAX_QUEUED_ENTRYPOINTS]; + int giNumQueuedEntrypoints; //tLoadLib *gpLoadedLibraries = NULL; // === CODE === +void ldacess_DumpLoadedLibraries(void) +{ + for( int i = 0; i < MAX_LOADED_LIBRARIES; i ++ ) + { + const tLoadedLib* ll = &gLoadedLibraries[i]; + if(ll->Base == 0) break; // Last entry has Base set to NULL + _SysDebug("%p: %s", ll->Base, ll->Name); + } +} + +/** + * \brief Call queued up entry points (after relocations completed) + */ +void CallQueuedEntrypoints(char **EnvP) +{ + while( giNumQueuedEntrypoints ) + { + giNumQueuedEntrypoints --; + const struct sQueuedEntry *qe = &gaQueuedEntrypoints[giNumQueuedEntrypoints]; + DEBUGS("Calling EP %p for %p", qe->Entry, qe->Base); + qe->Entry(qe->Base, 0, NULL, EnvP); + } +} + const char *FindLibrary(char *DestBuf, const char *SoName, const char *ExtraSearchDir) { // -- #1: Executable Specified @@ -60,14 +92,12 @@ const char *FindLibrary(char *DestBuf, const char *SoName, const char *ExtraSear void *LoadLibrary(const char *SoName, const char *SearchDir, char **envp) { char sTmpName[1024]; - const char *filename; void *base; - void (*fEntry)(void *, int, char *[], char**); DEBUGS("LoadLibrary: (SoName='%s', SearchDir='%s', envp=%p)", SoName, SearchDir, envp); // Create Temp Name - filename = FindLibrary(sTmpName, SoName, SearchDir); + const char *filename = FindLibrary(sTmpName, SoName, SearchDir); if(filename == NULL) { DEBUGS("LoadLibrary: RETURN 0"); return 0; @@ -79,6 +109,7 @@ void *LoadLibrary(const char *SoName, const char *SearchDir, char **envp) DEBUGS(" LoadLibrary: SysLoadBin()"); // Load Library + tLibEntry *fEntry; base = _SysLoadBin(filename, (void**)&fEntry); if(!base) { DEBUGS("LoadLibrary: RETURN 0"); @@ -94,10 +125,17 @@ void *LoadLibrary(const char *SoName, const char *SearchDir, char **envp) } // Call Entrypoint - DEBUGS(" LoadLibrary: '%s' Entry %p", SoName, fEntry); - fEntry(base, 0, NULL, gEnvP); + // - TODO: Queue entrypoint calls + if( giNumQueuedEntrypoints >= MAX_QUEUED_ENTRYPOINTS ) { + SysDebug("ERROR - Maximum number of queued entrypoints exceeded on %p '%s'", + base, SoName); + return 0; + } + gaQueuedEntrypoints[giNumQueuedEntrypoints].Base = base; + gaQueuedEntrypoints[giNumQueuedEntrypoints].Entry = fEntry; + giNumQueuedEntrypoints ++; - DEBUGS("LoadLibrary: RETURN 1"); + DEBUGS("LoadLibrary: RETURN success"); return base; } @@ -107,7 +145,6 @@ void *LoadLibrary(const char *SoName, const char *SearchDir, char **envp) */ void *IsFileLoaded(const char *file) { - int i; DEBUGS("IsFileLoaded: (file='%s')", file); // Applications link against either libld-acess.so or ld-acess.so @@ -118,7 +155,7 @@ void *IsFileLoaded(const char *file) return &gLinkedBase; } - for( i = 0; i < MAX_LOADED_LIBRARIES; i++ ) + for( int i = 0; i < MAX_LOADED_LIBRARIES; i++ ) { if(gLoadedLibraries[i].Base == 0) break; // Last entry has Base set to NULL DEBUGS(" strcmp('%s', '%s')", gLoadedLibraries[i].Name, file); @@ -173,7 +210,6 @@ void AddLoaded(const char *File, void *base) */ void Unload(void *Base) { - int i, j; int id; char *str; for( id = 0; id < MAX_LOADED_LIBRARIES; id++ ) @@ -188,8 +224,8 @@ void Unload(void *Base) str = gLoadedLibraries[id].Name; // Compact Loaded List - j = id; - for( i = j + 1; i < MAX_LOADED_LIBRARIES; i++, j++ ) + int j = id; + for( int i = j + 1; i < MAX_LOADED_LIBRARIES; i++, j++ ) { if(gLoadedLibraries[i].Base == 0) break; // Compact String @@ -211,34 +247,57 @@ void Unload(void *Base) \fn Uint GetSymbol(const char *name) \brief Gets a symbol value from a loaded library */ -int GetSymbol(const char *name, void **Value, size_t *Size) +int GetSymbol(const char *name, void **Value, size_t *Size, void *IgnoreBase) { - int i; - - //SysDebug("ciNumLocalExports = %i", ciNumLocalExports); - for(i=0;iName, name) == 0 ) { + *Value = le->Value; if(Size) *Size = 0; + DEBUGS("'%s' = Local %p+%#x", name, le->Value, 0); return 1; } } - - // Entry 0 is ld-acess, ignore it - for(i = 0; i < MAX_LOADED_LIBRARIES; i ++) + + bool have_weak = false; + for(int i = 0; i < MAX_LOADED_LIBRARIES && gLoadedLibraries[i].Base != 0; i ++) { - if(gLoadedLibraries[i].Base == 0) - break; + const tLoadedLib* ll = &gLoadedLibraries[i]; + // Allow ignoring the current module + if( ll->Base == IgnoreBase ) { + //SysDebug("GetSymbol: Ignore %p", gLoadedLibraries[i].Base); + continue ; + } - //SysDebug(" GetSymbol: Trying 0x%x, '%s'", - // gLoadedLibraries[i].Base, gLoadedLibraries[i].Name); - if(GetSymbolFromBase(gLoadedLibraries[i].Base, name, Value, Size)) - return 1; + //SysDebug(" GetSymbol: Trying 0x%x, '%s'", ll->Base, ll->Name); + void *tmpval; + size_t tmpsize; + int rv = GetSymbolFromBase(ll->Base, name, &tmpval, &tmpsize); + if(rv) + { + *Value = tmpval; + *Size = tmpsize; + if( rv == 1 ) { + DEBUGS("'%s' = %p '%s' Strong %p+%#x", name, ll->Base, ll->Name, *Value, *Size); + return 1; + } + have_weak = true; + } + } + if(have_weak) { + DEBUGS("'%s' = Weak %p+%#x", name, *Value, *Size); + return 2; + } + else { + DEBUGS("'%s' = ?", name); + return 0; } - SysDebug("GetSymbol: === Symbol '%s' not found ===", name); - return 0; } /**