X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Fcommon.h;h=ac07f9c7365f2f0bd5d829c1461f132d6aed14dc;hb=6afcf1f9b14d9ad0111daea549cb0db5bf7f9009;hp=22066f91000425f581d96844d14207165edc1c1e;hpb=17e16b3110b4c5124b0707435e0427993d696545;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 22066f91..ac07f9c7 100644
--- a/Usermode/Libraries/ld-acess.so_src/common.h
+++ b/Usermode/Libraries/ld-acess.so_src/common.h
@@ -1,50 +1,65 @@
-/*
- AcessOS v1
- By thePowersGang
- ld-acess.so
- COMMON.H
-*/
-#ifndef _COMMON_H
-#define _COMMON_H
-
-#define	NULL	((void*)0)
-
-#include <stdarg.h>
-
-// === 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;
+/*
+ AcessOS v1
+ By thePowersGang
+ ld-acess.so
+ COMMON.H
+*/
+#ifndef _COMMON_H
+#define _COMMON_H
+
+#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;
+
+// HACK: Replace with underscored
+#define SysDebug	_SysDebug
+
+// === CONSTANTS ===
+#define	MAX_LOADED_LIBRARIES	64
+#define	MAX_STRINGS_BYTES	4096
+#define	SYSTEM_LIB_DIR	"/Acess/Libs/"
+
+// === Types ===
+typedef struct {
+	void	*Base;
+	char	*Name;
+}	tLoadedLib;
+
+// === GLOBALS ===
+extern tLoadedLib	gLoadedLibraries[MAX_LOADED_LIBRARIES];
 
 // === Main ===
-extern int	DoRelocate( Uint base, char **envp, char *Filename );
-
-// === Library/Symbol Manipulation ==
-extern Uint	LoadLibrary(char *filename, char *SearchDir, char **envp);
-extern void	AddLoaded(char *File, Uint base);
-extern Uint	GetSymbol(char *name);
-extern int	GetSymbolFromBase(Uint base, char *name, Uint *ret);
-
-// === Library Functions ===
-extern void	strcpy(char *dest, char *src);
-extern int	strcmp(char *s1, char *s2);
-extern int	strlen(char *str);
-
-// === System Calls ===
-extern void	SysExit();
-extern void	SysDebug(char *fmt, ...);	//!< Now implemented in main.c
-extern void	SysDebugV(char *fmt, ...);
-extern Uint	SysLoadBin(char *path, Uint *entry);
-extern Uint	SysUnloadBin(Uint Base);
+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 int	GetSymbol(const char *Name, void **Value, 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);
+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 ===
 
 // === ELF Loader ===
-extern int	ElfGetSymbol(Uint Base, char *name, Uint *ret);
-
-// === PE Loader ===
-extern int	PE_GetSymbol(Uint Base, char *Name, Uint *ret);
-
-#endif
+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 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