X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2Finclude_exp%2Facess%2Fsys.h;h=4e0f14524069191b98641b71e5f69a6dea8a435a;hb=92c5980925e773c6e1d6775c50c9d86c77b84d23;hp=0f9a5f9951f40d0301b8d1962888a114101905c9;hpb=52fad670ab81459de0ff1bd0fa99a3396a6999e3;p=tpg%2Facess2.git

diff --git a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h
index 0f9a5f99..4e0f1452 100644
--- a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h
+++ b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h
@@ -8,6 +8,10 @@
 #include <stddef.h>	// size_t
 #include "syscall_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // === CONSTANTS ===
 #ifndef NULL
 # define NULL	((void*)0)
@@ -25,6 +29,7 @@
 #define OPENFLAG_APPEND	0x20
 #define	OPENFLAG_NOLINK	0x40
 #define	OPENFLAG_CREATE	0x80
+#define OPENFLAG_NONBLOCK	0x100	// How would this work?
 #ifndef SEEK_CUR
 # define SEEK_SET	1
 # define SEEK_CUR	0
@@ -33,6 +38,19 @@
 #define GETMSG_IGNORE	((void*)-1)
 #define FILEFLAG_DIRECTORY	0x10
 #define FILEFLAG_SYMLINK	0x20
+#define CLONE_VM	0x10
+
+#define MMAP_PROT_READ	0x001	//!< Readable memory
+#define MMAP_PROT_WRITE	0x002	//!< Writable memory
+#define MMAP_PROT_EXEC	0x004	//!< Executable memory
+#define MMAP_MAP_SHARED 	0x001	//!< Shared with all other users of the FD
+#define MMAP_MAP_PRIVATE	0x002	//!< Local (COW) copy
+#define MMAP_MAP_FIXED  	0x004	//!< Load to a fixed address
+#define MMAP_MAP_ANONYMOUS	0x008	//!< Not associated with a FD
+
+#ifdef ARCHDIR_is_native
+# include "_native_syscallmod.h"
+#endif
 
 // === TYPES ===
 
@@ -41,43 +59,50 @@ extern int	_errno;
 
 // === FUNCTIONS ===
 extern void	_SysDebug(const char *format, ...);
+extern void	_SysDebugHex(const char *Label, const void *Data, size_t Size);
 // --- Proc ---
 extern void	_exit(int status)	__attribute__((noreturn));
-//extern void	sleep(void);
-//extern void	yield(void);
-extern int	kill(int pid, int sig);
-//extern void	wait(int miliseconds);
+extern int	_SysKill(int pid, int sig);
 extern int	_SysWaitEvent(int EventMask);
-extern int	waittid(int id, int *status);
-extern int	clone(int flags, void *stack);
-extern int	execve(const char *path, char **argv, char **envp);
+extern int	_SysWaitTID(int id, int *status);
+extern int	_SysClone(int flags, void *stack);
+extern int	_SysExecVE(const char *path, char **argv, char **envp);
 extern int	_SysSpawn(const char *Path, const char **argv, const char **envp, int nFDs, int *FDs, struct s_sys_spawninfo *info);
 extern int	gettid(void);
-extern int	getpid(void);
+extern int	_SysGetPID(void);
 extern int	_SysSetFaultHandler(int (*Handler)(int));
-extern void	SysSetName(const char *Name);
-extern int	SysGetName(char *NameDest);
-extern int	SysSetPri(int Priority);
+extern void	_SysSetName(const char *Name);
+extern int	_SysGetName(char *NameDest);
+extern int	_SysSetPri(int Priority);
+// --- System ---
+extern int	_SysLoadModule(const char *Module);
+// --- Timekeeping ---
 extern int64_t	_SysTimestamp(void);
+extern void	_SysTimedSleep(int64_t Delay);
 
 // --- Permissions ---
-extern int	getuid(void);
-extern int	getgid(void);
-extern void	setuid(int id);
-extern void	setgid(int id);
+extern int	_SysGetUID(void);
+extern int	_SysGetGID(void);
+extern int	setuid(int id);
+extern int	setgid(int id);
 
 // --- VFS ---
 extern int	_SysChdir(const char *dir);
-extern int	_SysRoot(const char *dir);
+extern int	_SysChroot(const char *dir);
 
 extern int	_SysOpen(const char *path, int flags, ...);
 extern int	_SysOpenChild(int fd, const char *name, int flags);
 extern int	_SysOpenPipe(int *read, int *write, int flags);
 extern int	_SysReopen(int fd, const char *path, int flags);
 extern int	_SysCopyFD(int srcfd, int dstfd);
-extern int	_SysClose(int fd);
+extern int	_SysFDFlags(int fd, int mask, int newflags);
 extern size_t	_SysRead(int fd, void *buffer, size_t length);
+extern size_t	_SysReadAt(int fd, uint64_t offset, size_t length, void *buffer);
+extern uint64_t	_SysTruncate(int fd, uint64_t size);
+extern int	_SysClose(int fd);
+extern int	_SysFDCtl(int fd, int option, ...);
 extern size_t	_SysWrite(int fd, const void *buffer, size_t length);
+extern size_t	_SysWriteAt(int fd, uint64_t offset, size_t length, const void *buffer);
 extern int	_SysSeek(int fd, int64_t offset, int whence);
 extern uint64_t	_SysTell(int fd);
 extern int	_SysIOCtl(int fd, int id, void *data);
@@ -86,16 +111,34 @@ extern int	_SysReadDir(int fd, char *dest);
 extern int	_SysGetACL(int fd, t_sysACL *dest);
 extern int	_SysMount(const char *Device, const char *Directory, const char *Type, const char *Options);
 extern int	_SysSelect(int nfds, fd_set *read, fd_set *write, fd_set *err, int64_t *timeout, unsigned int extraevents);
-#define select(nfs, rdfds, wrfds, erfds, timeout)	_SysSelect(nfs, rdfds, wrfds, erfds, timeout, 0)
+//#define select(nfs, rdfds, wrfds, erfds, timeout)	_SysSelect(nfs, rdfds, wrfds, erfds, timeout, 0)
+extern int	_SysMkDir(const char *dirname);
 extern int	_SysUnlink(const char *pathname);
+extern void*	_SysMMap(void *addr, size_t length, unsigned int _flags, int fd, uint64_t offset);
+#ifdef _SysMMap
+# undef _SysMMap
+# define _SysMMap(addr,length,flags,prot,fd,offset)	acess__SysMMap(addr,length,(flags|(prot<<16)), fd, offset)
+#else
+# define _SysMMap(addr,length,flags,prot,fd,offset)	_SysMMap(addr,length,(flags|(prot<<16)), fd, offset)
+#endif
+extern int	_SysMUnMap(void *addr, size_t length);
+extern uint64_t	_SysMarshalFD(int FD);
+extern int	_SysUnMarshalFD(uint64_t Handle);
 
 // --- IPC ---
-extern int	SysSendMessage(int dest, size_t length, const void *Data);
-extern int	SysGetMessage(int *src, size_t buflen, void *Data);
+extern int	_SysSendMessage(int dest, size_t length, const void *Data);
+extern int	_SysGetMessage(int *src, size_t buflen, void *Data);
 
 // --- MEMORY ---
-uint64_t	_SysGetPhys(uintptr_t vaddr);
-uint64_t	_SysAllocate(uintptr_t vaddr);
-uint32_t	SysSetMemFlags(uintptr_t vaddr, uint32_t flags, uint32_t mask);
+extern uint64_t	_SysGetPhys(uintptr_t vaddr);
+extern uint64_t	_SysAllocate(uintptr_t vaddr);
+extern uint32_t	_SysSetMemFlags(uintptr_t vaddr, uint32_t flags, uint32_t mask);
+extern void	*_SysLoadBin(const char *path, void **entry);
+extern int	_SysUnloadBin(void *base);
+extern void	SysSetFaultHandler(int (*Hanlder)(int));
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif