X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Fcommon.h;h=fad0344a6ac7fe4227089b8cb2dacefa14cf9199;hb=48de21e1b27fcb2595aabe2669bdec80567961df;hp=bc2efbdcbbc3e7bcc7e15acd057278322ea38757;hpb=466eda7c917791866a29c253c6c22197faf41bf7;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 bc2efbdc..fad0344a 100644
--- a/Usermode/Libraries/ld-acess.so_src/common.h
+++ b/Usermode/Libraries/ld-acess.so_src/common.h
@@ -1,54 +1,71 @@
-/*
- 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
+
+#define	NULL	((void*)0)
+
+#include <stdarg.h>
+
+// 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 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];
 
 // === Main ===
 extern int	DoRelocate( Uint base, char **envp, char *Filename );
-
-// === Library/Symbol Manipulation ==
+
+// === 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 Uint	GetSymbol(char *name);
+extern int	GetSymbolFromBase(Uint base, char *name, Uint *ret);
+
+// === 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 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(char *filename);
+
+// === 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 Uint	SysLoadBin(const char *path, Uint *entry);
+extern Uint	SysUnloadBin(Uint Base);
+extern void	SysSetFaultHandler(int (*Hanlder)(int));
+extern int	open(const char *filename, int flags);
+extern void	close(int fd);
 
 // === 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 int	ElfGetSymbol(Uint Base, char *name, Uint *ret);
+
+// === PE Loader ===
+extern int	PE_GetSymbol(Uint Base, char *Name, Uint *ret);
+
+#endif