X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Fcommon.h;h=e0620c264da9224f642b9afaa818d9375091f304;hb=6fbf6b93bec9b8b5bd6d7c683eefb0ebed8dff77;hp=81913d50a2ab2e590a72cb46c38a020f567f07d9;hpb=a8a3752a92b026370ae4e6bd1a72d70c03309533;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 81913d50..e0620c26 100644
--- a/Usermode/Libraries/ld-acess.so_src/common.h
+++ b/Usermode/Libraries/ld-acess.so_src/common.h
@@ -1,68 +1,65 @@
-/*
- AcessOS v1
- By thePowersGang
- ld-acess.so
- COMMON.H
-*/
-#ifndef _COMMON_H
-#define _COMMON_H
-
-#define	NULL	((void*)0)
-
-#include <stdarg.h>
-
-// === CONSTANTS ===
-#define	MAX_LOADED_LIBRARIES	64
-#define	MAX_STRINGS_BYTES	4096
-#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 {
-	Uint	Base;
-	char	*Name;
-}	tLoadedLib;
-
-// === GLOBALS ===
-extern tLoadedLib	gLoadedLibraries[MAX_LOADED_LIBRARIES];
+/*
+ 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 char	*strcpy(char *dest, const char *src);
+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, 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);
 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(char *filename);
-
-// === 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	SysSetFaultHandler(int (*Hanlder)(int));
-extern int	open(char *filename, int flags);
-extern void	close(int fd);
+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