By thePowersGang
*/
#include "common.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include <acess/sys.h>
-#define DEBUG 1
+#define DEBUG 0
#if DEBUG
# define DEBUGS(v...) SysDebug(v)
# define DEBUGS(v...)
#endif
-// === PROTOTYPES ===
-void *IsFileLoaded(const char *file);
- int GetSymbolFromBase(void *base, const char *name, void **ret);
+#define MAX_QUEUED_ENTRYPOINTS 8
// === IMPORTS ===
extern const struct {
char *Name;
} 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 ++ )
+ {
+ if(gLoadedLibraries[i].Base == 0) break; // Last entry has Base set to NULL
+ _SysDebug("%p: %s",
+ gLoadedLibraries[i].Base,
+ gLoadedLibraries[i].Name
+ );
+ }
+}
+
+/**
+ * \brief Call queued up entry points (after relocations completed)
+ */
+void CallQueuedEntrypoints(char **EnvP)
+{
+ while( giNumQueuedEntrypoints )
+ {
+ giNumQueuedEntrypoints --;
+ const struct sQueuedEntry *qe = &gaQueuedEntrypoints[giNumQueuedEntrypoints];
+ //_SysDebug("Calling EP for %p", qe->Base);
+ qe->Entry(qe->Base, 0, NULL, EnvP);
+ }
+}
+
const char *FindLibrary(char *DestBuf, const char *SoName, const char *ExtraSearchDir)
{
// -- #1: Executable Specified
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=0x%x)", SoName, SearchDir, envp);
+ 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;
DEBUGS(" LoadLibrary: SysLoadBin()");
// Load Library
- base = SysLoadBin(filename, (void**)&fEntry);
+ tLibEntry *fEntry;
+ base = _SysLoadBin(filename, (void**)&fEntry);
if(!base) {
DEBUGS("LoadLibrary: RETURN 0");
return 0;
}
- DEBUGS(" LoadLibrary: iArg=%p, iEntry=0x%x", base, fEntry);
+ DEBUGS(" LoadLibrary: iArg=%p, fEntry=%p", base, fEntry);
// Load Symbols
fEntry = DoRelocate( base, envp, filename );
+ if( !fEntry ) {
+ return 0;
+ }
// Call Entrypoint
- DEBUGS(" LoadLibrary: '%s' Entry 0x%x", SoName, fEntry);
- fEntry(base, 0, NULL, envp);
+ // - 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;
}
{
int i;
DEBUGS("IsFileLoaded: (file='%s')", file);
+
+ // Applications link against either libld-acess.so or ld-acess.so
+ if( strcmp(file, "/Acess/Libs/libld-acess.so") == 0
+ || strcmp(file, "/Acess/Libs/ld-acess.so") == 0 )
+ {
+ DEBUGS("IsFileLoaded: Found local (%p)", &gLinkedBase);
+ return &gLinkedBase;
+ }
+
for( 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);
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", name, base, i);
+ DEBUGS("'%s' (%p) loaded as %i", name, base, i);
return;
}
if(id == MAX_LOADED_LIBRARIES) return;
// Unload Binary
- SysUnloadBin( Base );
+ _SysUnloadBin( Base );
// Save String Pointer
str = gLoadedLibraries[id].Name;
\fn Uint GetSymbol(const char *name)
\brief Gets a symbol value from a loaded library
*/
-void *GetSymbol(const char *name)
+int GetSymbol(const char *name, void **Value, size_t *Size, void *IgnoreBase)
{
- int i;
- void *ret;
-
- //SysDebug("ciNumLocalExports = %i", ciNumLocalExports);
- for(i=0;i<ciNumLocalExports;i++)
+ //SysDebug("GetSymbol: (%s)");
+ for( int i = 0; i < ciNumLocalExports; i ++ )
{
- if( strcmp(caLocalExports[i].Name, name) == 0 )
- return caLocalExports[i].Value;
+ if( strcmp(caLocalExports[i].Name, name) == 0 ) {
+ *Value = caLocalExports[i].Value;
+ if(Size)
+ *Size = 0;
+ //SysDebug("GetSymbol: Local %p+0x%x", *Value, 0);
+ return 1;
+ }
}
-
- // Entry 0 is ld-acess, ignore it
- for(i = 1; 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;
+ // Allow ignoring the current module
+ if( gLoadedLibraries[i].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, &ret)) return ret;
+ void *tmpval;
+ size_t tmpsize;
+ int rv = GetSymbolFromBase(gLoadedLibraries[i].Base, name, &tmpval, &tmpsize);
+ if(rv)
+ {
+ *Value = tmpval;
+ *Size = tmpsize;
+ if( rv == 1 ) {
+ return 1;
+ }
+ have_weak = true;
+ }
+ }
+ if(have_weak) {
+ return 2;
+ }
+ else {
+ return 0;
}
- 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;
}
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au