By thePowersGang
*/
#include "common.h"
+#include <stdint.h>
#define DEBUG 0
// === PROTOTYPES ===
void *IsFileLoaded(const char *file);
- int GetSymbolFromBase(void *base, const char *name, void **ret);
+ int GetSymbolFromBase(void *base, const char *name, void **ret, size_t *size);
// === IMPORTS ===
extern const struct {
char *Name;
} caLocalExports[];
extern const int ciNumLocalExports;
+extern char **gEnvP;
// === GLOABLS ===
tLoadedLib gLoadedLibraries[MAX_LOADED_LIBRARIES];
void *base;
void (*fEntry)(void *, int, char *[], char**);
- DEBUGS("LoadLibrary: (filename='%s', envp=0x%x)\n", filename, envp);
+ DEBUGS("LoadLibrary: (SoName='%s', SearchDir='%s', envp=%p)", SoName, SearchDir, envp);
// Create Temp Name
filename = FindLibrary(sTmpName, SoName, SearchDir);
if(filename == NULL) {
- DEBUGS("LoadLibrary: RETURN 0\n");
+ DEBUGS("LoadLibrary: RETURN 0");
return 0;
}
- DEBUGS(" LoadLibrary: filename='%s'\n", filename);
+ DEBUGS(" LoadLibrary: filename='%s'", filename);
if( (base = IsFileLoaded(filename)) )
return base;
-
+
+ DEBUGS(" LoadLibrary: SysLoadBin()");
// Load Library
base = SysLoadBin(filename, (void**)&fEntry);
if(!base) {
- DEBUGS("LoadLibrary: RETURN 0\n");
+ DEBUGS("LoadLibrary: RETURN 0");
return 0;
}
- DEBUGS(" LoadLibrary: iArg=%p, iEntry=0x%x\n", base, fEntry);
+ DEBUGS(" LoadLibrary: iArg=%p, fEntry=%p", base, fEntry);
// Load Symbols
fEntry = DoRelocate( base, envp, filename );
// Call Entrypoint
- DEBUGS(" LoadLibrary: '%s' Entry 0x%x\n", SoName, fEntry);
- fEntry(base, 0, NULL, envp);
+ DEBUGS(" LoadLibrary: '%s' Entry %p", SoName, fEntry);
+ fEntry(base, 0, NULL, gEnvP);
- DEBUGS("LoadLibrary: RETURN 1\n");
+ DEBUGS("LoadLibrary: RETURN 1");
return base;
}
if(gLoadedLibraries[i].Base == 0) break; // Last entry has Base set to NULL
DEBUGS(" strcmp('%s', '%s')", gLoadedLibraries[i].Name, file);
if(strcmp(gLoadedLibraries[i].Name, file) == 0) {
- DEBUGS("IsFileLoaded: Found %i (0x%x)", i, gLoadedLibraries[i].Base);
+ DEBUGS("IsFileLoaded: Found %i (%p)", i, gLoadedLibraries[i].Base);
return gLoadedLibraries[i].Base;
}
}
int i, length;
char *name = gsNextAvailString;
- DEBUGS("AddLoaded: (File='%s', base=0x%x)", File, base);
+ DEBUGS("AddLoaded: (File='%s', base=%p)", File, base);
// Find a free slot
for( i = 0; i < MAX_LOADED_LIBRARIES; i ++ )
strcpy(name, File);
gLoadedLibraries[i].Name = name;
gsNextAvailString = &name[length+1];
- DEBUGS("'%s' (0x%x) loaded as %i\n", name, base, i);
+ DEBUGS("'%s' (%p) loaded as %i", name, base, i);
return;
}
\fn Uint GetSymbol(const char *name)
\brief Gets a symbol value from a loaded library
*/
-void *GetSymbol(const char *name)
+void *GetSymbol(const char *name, size_t *Size)
{
int i;
void *ret;
//SysDebug(" GetSymbol: Trying 0x%x, '%s'",
// gLoadedLibraries[i].Base, gLoadedLibraries[i].Name);
- if(GetSymbolFromBase(gLoadedLibraries[i].Base, name, &ret)) return ret;
+ if(GetSymbolFromBase(gLoadedLibraries[i].Base, name, &ret, Size)) return ret;
}
SysDebug("GetSymbol: === Symbol '%s' not found ===", name);
return 0;
\fn int GetSymbolFromBase(Uint base, char *name, Uint *ret)
\breif Gets a symbol from a specified library
*/
-int GetSymbolFromBase(void *base, const char *name, void **ret)
+int GetSymbolFromBase(void *base, const char *name, void **ret, size_t *Size)
{
- if(*(Uint32*)base == (0x7F|('E'<<8)|('L'<<16)|('F'<<24)))
- return ElfGetSymbol(base, name, ret);
- if(*(Uint16*)base == ('M'|('Z'<<8)))
- return PE_GetSymbol(base, name, ret);
- SysDebug("Unknown type at %p", base);
+ uint8_t *hdr = base;
+ if(hdr[0] == 0x7F && hdr[1] == 'E' && hdr[2] == 'L' && hdr[3] == 'F')
+ return ElfGetSymbol(base, name, ret, Size);
+ if(hdr[0] == 'M' && hdr[1] == 'Z')
+ return PE_GetSymbol(base, name, ret, Size);
+ SysDebug("Unknown type at %p (%02x %02x %02x %02x)", base,
+ hdr[0], hdr[1], hdr[2], hdr[3]);
return 0;
}