X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Fcommon.h;h=379efc11859e134b65d802002e2d600179071199;hb=a4d8188f730bcc25cd4a6f4799ac7d65eb707cf2;hp=8fa626a7c6c15b959e48fcca7551f801730c4725;hpb=11686aa86bc0adae2555aa7796fe229770bb02f7;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/common.h b/Usermode/Libraries/ld-acess.so_src/common.h
index 8fa626a7..379efc11 100644
--- a/Usermode/Libraries/ld-acess.so_src/common.h
+++ b/Usermode/Libraries/ld-acess.so_src/common.h
@@ -9,6 +9,12 @@
 
 #include <stddef.h>
 #include <stdarg.h>
+#include <stdint.h>
+
+typedef	uintptr_t	Uint;
+typedef uint8_t 	Uint8;
+typedef uint16_t	Uint16;
+typedef uint32_t	Uint32;
 
 // HACK: Replace with underscored
 #define SysDebug	_SysDebug
@@ -19,14 +25,6 @@
 #define	SYSTEM_LIB_DIR	"/Acess/Libs/"
 
 // === Types ===
-typedef unsigned int	Uint;
-typedef unsigned char	Uint8;
-typedef unsigned short	Uint16;
-typedef unsigned long	Uint32;
-typedef signed char		Sint8;
-typedef signed short	Sint16;
-typedef signed long		Sint32;
-
 typedef struct {
 	void	*Base;
 	char	*Name;
@@ -41,8 +39,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 void	*GetSymbol(const char *name, size_t *size);
+extern int	GetSymbolFromBase(void *base, const char *name, void **ret, size_t *size);
 
 // === Library Functions ===
 extern char	*strcpy(char *dest, const char *src);
@@ -50,6 +48,7 @@ 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);
@@ -62,9 +61,11 @@ 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