Usermode/libc - Fix strchr and strrchr behavior

[tpg/acess2.git] / Usermode / Libraries / ld-acess.so_src / common.h

diff --git a/Usermode/Libraries/ld-acess.so_src/common.h b/Usermode/Libraries/ld-acess.so_src/common.h
index d44008f..af620be 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/common.h
+++ b/Usermode/Libraries/ld-acess.so_src/common.h
@@ -10,12 +10,16 @@
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdint.h>
+#include <acess/sys.h>
+#include <assert.h>
 
 typedef        uintptr_t       Uint;
 typedef uint8_t        Uint8;
 typedef uint16_t       Uint16;
 typedef uint32_t       Uint32;
 
+#define ASSERT(cnd) do { if( !(cnd) ) { _SysDebug("ASSERT: "#cnd" failed"); *(volatile int*)1 = 123; } } while(0)
+
 // HACK: Replace with underscored
 #define SysDebug       _SysDebug
 
@@ -30,6 +34,11 @@ typedef struct {
        char    *Name;
 }      tLoadedLib;
 
+typedef struct {
+       void    *Value;
+       const char      *Name;
+} tLocalExport;
+
 // === GLOBALS ===
 extern tLoadedLib      gLoadedLibraries[MAX_LOADED_LIBRARIES];
 
@@ -39,8 +48,8 @@ extern void   *DoRelocate(void *Base, char **envp, const char *Filename);
 // === Library/Symbol Manipulation ==
 extern void    *LoadLibrary(const char *Filename, const char *SearchDir, char **envp);
 extern void    AddLoaded(const char *File, void *base);
-extern void    *GetSymbol(const char *name);
-extern int     GetSymbolFromBase(void *base, const char *name, void **ret);
+extern int     GetSymbol(const char *Name, void **Value, size_t *size, void *IgnoreBase);
+extern int     GetSymbolFromBase(void *base, const char *name, void **ret, size_t *size);
 
 // === Library Functions ===
 extern char    *strcpy(char *dest, const char *src);
@@ -48,21 +57,16 @@ extern char *strcat(char *dest, const char *src);
 extern int     strcmp(const char *s1, const char *s2);
 extern int     strlen(const char *str);
 extern int     file_exists(const char *filename);
+extern void    *memcpy(void *dest, const void *src, size_t len);
 
 // === System Calls ===
-extern void    _exit(int retval);
-extern void    SysDebug(const char *fmt, ...); //!< Now implemented in main.c
-extern void    SysDebugV(const char *fmt, ...);
-extern void    *SysLoadBin(const char *path, void **entry);
-extern int     SysUnloadBin(void *Base);
-extern void    SysSetFaultHandler(int (*Hanlder)(int));
-extern int     open(const char *filename, int flags);
-extern int     close(int fd);
 
 // === ELF Loader ===
-extern int     ElfGetSymbol(void *Base, const char *name, void **ret);
+extern void    *ElfRelocate(void *Base, char **envp, const char *Filename);
+extern int     ElfGetSymbol(void *Base, const char *name, void **ret, size_t *Size);
 
 // === PE Loader ===
-extern int     PE_GetSymbol(void *Base, const char *Name, void **ret);
+extern void    *PE_Relocate(void *Base, char **envp, const char *Filename);
+extern int     PE_GetSymbol(void *Base, const char *Name, void **ret, size_t *Size);
 
 #endif