X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=AcessNative%2Fld-acess_src%2Fexports.c;h=3f5f295c21953e66c00a0c37ac5f782e71116155;hb=bbace1ebc0a53c9b8c561de6a3a2d9955fcdab0b;hp=dcfc526ac42cff92b6d8862bf92ce67aed0f2a2c;hpb=c7acbe49842c871244d76ce9dd7e4e9e70ec3a97;p=tpg%2Facess2.git diff --git a/AcessNative/ld-acess_src/exports.c b/AcessNative/ld-acess_src/exports.c index dcfc526a..3f5f295c 100644 --- a/AcessNative/ld-acess_src/exports.c +++ b/AcessNative/ld-acess_src/exports.c @@ -15,6 +15,8 @@ //#define DEBUG(v...) do{}while(0)//Debug(v) #define PAGE_SIZE 4096 +#define TODO() Warning("TODO: %s", __func__) + typedef struct sFILE FILE; extern void exit(int) __attribute__ ((noreturn)); @@ -53,7 +55,7 @@ int acess__SysOpen(const char *Path, int Flags) { return native_open(Path, Flags) | NATIVE_FILE_MASK; } - DEBUG("open(\"%s\", 0x%x)", Path, Flags); + SYSTRACE("open(\"%s\", 0x%x)", Path, Flags); return _Syscall(SYS_OPEN, ">s >i", Path, Flags); } @@ -62,28 +64,35 @@ void acess__SysClose(int FD) if(FD & NATIVE_FILE_MASK) { return native_close(FD & (NATIVE_FILE_MASK-1)); } - DEBUG("close(%i)", FD); + SYSTRACE("close(%i)", FD); _Syscall(SYS_CLOSE, ">i", FD); } int acess__SysReopen(int FD, const char *Path, int Flags) { - DEBUG("reopen(0x%x, \"%s\", 0x%x)", FD, Path, Flags); + SYSTRACE("reopen(0x%x, \"%s\", 0x%x)", FD, Path, Flags); return _Syscall(SYS_REOPEN, ">i >s >i", FD, Path, Flags); } +int acess__SysCopyFD(int srcfd, int dstfd) { + SYSTRACE("_SysCopyFD(%i, %i)", srcfd, dstfd); + return _Syscall(SYS_COPYFD, ">i >i", srcfd, dstfd); +} + +int acess__SysFDFlags(int fd, int mask, int newflags) { + return _Syscall(SYS_FDFLAGS, ">i >i >i", fd, mask, newflags); +} + size_t acess__SysRead(int FD, void *Dest, size_t Bytes) { if(FD & NATIVE_FILE_MASK) return native_read(FD & (NATIVE_FILE_MASK-1), Dest, Bytes); -// if( FD > 2 ) - DEBUG("read(0x%x, 0x%x, *%p)", FD, Bytes, Dest); + SYSTRACE("_SysRead(0x%x, 0x%x, *%p)", FD, Bytes, Dest); return _Syscall(SYS_READ, ">i >i 2 ) - DEBUG("write(0x%x, 0x%x, %p\"%.*s\")", FD, Bytes, Src, Bytes, (char*)Src); + SYSTRACE("_SysWrite(0x%x, 0x%x, %p\"%.*s\")", FD, Bytes, Src, Bytes, (char*)Src); return _Syscall(SYS_WRITE, ">i >i >d", FD, Bytes, Bytes, Src); } @@ -92,7 +101,7 @@ int acess__SysSeek(int FD, int64_t Ofs, int Dir) if(FD & NATIVE_FILE_MASK) { return native_seek(FD & (NATIVE_FILE_MASK-1), Ofs, Dir); } - DEBUG("seek(0x%x, 0x%llx, %i)", FD, Ofs, Dir); + SYSTRACE("_SysSeek(0x%x, 0x%llx, %i)", FD, Ofs, Dir); return _Syscall(SYS_SEEK, ">i >I >i", FD, Ofs, Dir); } @@ -100,23 +109,20 @@ uint64_t acess__SysTell(int FD) { if(FD & NATIVE_FILE_MASK) return native_tell( FD & (NATIVE_FILE_MASK-1) ); - DEBUG("tell(0x%x)", FD); + SYSTRACE("_SysTell(0x%x)", FD); return _Syscall(SYS_TELL, ">i", FD); } int acess__SysIOCtl(int fd, int id, void *data) { int len; - DEBUG("ioctl(%i, %i, %p)", fd, id, data); + SYSTRACE("_SysIOCtl(%i, %i, %p)", fd, id, data); // NOTE: The length here is hacky and could break - if( data == NULL ) - len = 0; - else - len = PAGE_SIZE - ((uintptr_t)data % PAGE_SIZE); + len = (data == NULL ? 0 : PAGE_SIZE - ((uintptr_t)data % PAGE_SIZE)); return _Syscall(SYS_IOCTL, ">i >i ?d", fd, id, len, data); } int acess__SysFInfo(int fd, t_sysFInfo *info, int maxacls) { // DEBUG("offsetof(size, t_sysFInfo) = %i", offsetof(t_sysFInfo, size)); - DEBUG("finfo(%i, %p, %i)", fd, info, maxacls); + SYSTRACE("_SysFInfo(%i, %p, %i)", fd, info, maxacls); return _Syscall(SYS_FINFO, ">i i", fd, sizeof(t_sysFInfo)+maxacls*sizeof(t_sysACL), info, @@ -125,13 +131,13 @@ int acess__SysFInfo(int fd, t_sysFInfo *info, int maxacls) { } int acess__SysReadDir(int fd, char *dest) { - DEBUG("SysReadDir(%i, %p)", fd, dest); + SYSTRACE("_SysReadDir(%i, %p)", fd, dest); return _Syscall(SYS_READDIR, ">i i ?d ?d ?d >d >i", nfds, read ? (nfds+7)/8 : 0, read, write ? (nfds+7)/8 : 0, write, @@ -140,19 +146,30 @@ int acess__SysSelect(int nfds, fd_set *read, fd_set *write, fd_set *error, int64 events ); } +int acess__SysMkDir(const char *pathname) +{ + TODO(); + return 0; +} +int acess__SysUnlink(const char *pathname) +{ + // TODO: + TODO(); + return 0; +} int acess__SysOpenChild(int fd, char *name, int flags) { - DEBUG("_SysOpenChild(0x%x, '%s', 0x%x)", fd, name, flags); + SYSTRACE("_SysOpenChild(0x%x, '%s', 0x%x)", fd, name, flags); return _Syscall(SYS_OPENCHILD, ">i >s >i", fd, name, flags); } int acess__SysGetACL(int fd, t_sysACL *dest) { - DEBUG("%s(0x%x, %p)", __func__, fd, dest); + SYSTRACE("%s(0x%x, %p)", __func__, fd, dest); return _Syscall(SYS_GETACL, ">i s >s >s >s", Device, Directory, Type, Options); } @@ -163,7 +180,58 @@ int acess__SysSetFaultHandler(int (*Handler)(int)) { return 0; } +void acess__SysSetName(const char *Name) +{ + // TODO: + TODO(); +} + +int acess__SysGetName(char *NameDest) +{ + // TODO: + TODO(); + return 0; +} + +int acess__SysSetPri(int Priority) +{ + // TODO: + TODO(); + return 0; +} + +// --- Binaries? --- +void *acess_SysLoadBin(const char *path, void **entry) +{ + // ERROR! + TODO(); + return NULL; +} + +int acess__SysUnloadBin(void *base) +{ + // ERROR! + TODO(); + return -1; +} + +// --- Timekeeping --- +int64_t acess__SysTimestamp(void) +{ + // TODO: Better impl + TODO(); +// return now()*1000; + return 0; +} + // --- Memory Management --- +uint64_t acess__SysGetPhys(uintptr_t vaddr) +{ + // TODO: + TODO(); + return 0; +} + uint64_t acess__SysAllocate(uintptr_t vaddr) { if( AllocateMemory(vaddr, 0x1000) == -1 ) // Allocate a page @@ -209,6 +277,12 @@ int acess__SysClone(int flags, void *stack) #endif } +int acess__SysKill(int pid, int sig) +{ + // TODO: Impliment SysKill + return -1; +} + int acess__SysExecVE(char *path, char **argv, const char **envp) { int i, argc; @@ -301,8 +375,8 @@ int acess__SysWaitTID(int TID, int *ExitStatus) int acess_setuid(int ID) { return _Syscall(SYS_SETUID, ">i", ID); } int acess_setgid(int ID) { return _Syscall(SYS_SETGID, ">i", ID); } int acess_gettid(void) { return _Syscall(SYS_GETTID, ""); } -int acess_getpid(void) { return _Syscall(SYS_GETPID, ""); } -int acess_getuid(void) { return _Syscall(SYS_GETUID, ""); } +int acess__SysGetPID(void) { return _Syscall(SYS_GETPID, ""); } +int acess__SysGetUID(void) { return _Syscall(SYS_GETUID, ""); } int acess_getgid(void) { return _Syscall(SYS_GETGID, ""); } int acess__SysSendMessage(int DestTID, int Length, void *Data) @@ -355,7 +429,9 @@ uint32_t acess__SysSetMemFlags(uintptr_t vaddr, uint32_t flags, uint32_t mask) // === Symbol List === -#define DEFSYM(name) {#name, &acess_##name} +#ifndef DEFSYM +# define DEFSYM(name) {#name, &acess_##name} +#endif const tSym caBuiltinSymbols[] = { DEFSYM(_exit), @@ -374,6 +450,8 @@ const tSym caBuiltinSymbols[] = { DEFSYM(_SysGetACL), DEFSYM(_SysMount), DEFSYM(_SysSelect), + DEFSYM(_SysMkDir), + DEFSYM(_SysUnlink), DEFSYM(_SysClone), DEFSYM(_SysExecVE), @@ -382,9 +460,10 @@ const tSym caBuiltinSymbols[] = { DEFSYM(_SysWaitTID), DEFSYM(gettid), + DEFSYM(_SysGetPID), DEFSYM(setuid), DEFSYM(setgid), - DEFSYM(getuid), + DEFSYM(_SysGetUID), DEFSYM(getgid), DEFSYM(_SysSendMessage),