#include <stdarg.h>
#include <stddef.h>
-#define DEBUG(v...) Debug(v)
-//#define DEBUG(v...) do{}while(0)//Debug(v)
+#define DEBUG(v...) do{if(gbSyscallDebugEnabled)Debug(v);}while(0)
#define PAGE_SIZE 4096
+#define TODO() Warning("TODO: %s", __func__)
+
typedef struct sFILE FILE;
extern void exit(int) __attribute__ ((noreturn));
// === GLOBALS ===
int acess__errno;
+ int gbSyscallDebugEnabled = 0;
char *gsExecutablePath = "./ld-acess";
// === CODE ===
return _Syscall(SYS_CHDIR, ">s", Path);
}
-int acess__SysOpen(const char *Path, int Flags)
+int acess__SysOpen(const char *Path, unsigned int Flags)
{
if( strncmp(Path, "$$$$", 4) == 0 )
{
- return native_open(Path, Flags) | NATIVE_FILE_MASK;
+ return native_open(Path+4, Flags) | NATIVE_FILE_MASK;
+ }
+ if( strncmp(Path, "/Devices/shm/", 13) == 0 )
+ {
+ const char* tag = Path + 13;
+ Warning("TODO: Handle open SHM \"%s\"", tag);
+ return native_shm(tag, 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);
}
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);
}
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 <d", FD, Bytes, Bytes, Dest);
}
size_t acess__SysWrite(int FD, const void *Src, size_t Bytes) {
if(FD & NATIVE_FILE_MASK)
return native_write(FD & (NATIVE_FILE_MASK-1), Src, Bytes);
-// if( FD > 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);
}
+uint64_t acess__SysTruncate(int fd, uint64_t size) {
+ TODO();
+ return 0;
+}
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);
}
{
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 <d >i",
fd,
sizeof(t_sysFInfo)+maxacls*sizeof(t_sysACL), info,
}
int acess__SysReadDir(int fd, char *dest) {
- DEBUG("SysReadDir(%i, %p)", fd, dest);
+ SYSTRACE("_SysReadDir(%i, %p)", fd, dest);
return _Syscall(SYS_READDIR, ">i <d", fd, 256, dest);
}
int acess__SysSelect(int nfds, fd_set *read, fd_set *write, fd_set *error, int64_t *timeout, uint32_t events)
{
- DEBUG("_SysSelect(%i, %p, %p, %p, %p, 0x%x)", nfds, read, write, error, timeout, events);
+ SYSTRACE("_SysSelect(%i, %p, %p, %p, %p, 0x%x)", nfds, read, write, error, timeout, events);
return _Syscall(SYS_SELECT, ">i ?d ?d ?d >d >i", nfds,
read ? (nfds+7)/8 : 0, read,
write ? (nfds+7)/8 : 0, write,
}
int acess__SysMkDir(const char *pathname)
{
- DEBUG("TODO: _SysMkDir");
+ TODO();
return 0;
}
int acess__SysUnlink(const char *pathname)
{
// TODO:
- DEBUG("TODO: _Unlink");
+ TODO();
+ return 0;
+}
+void* acess__SysMMap(void *addr, size_t length, unsigned int _flags, int fd, uint64_t offset)
+{
+ TODO();
+ return NULL;
+}
+int acess__SysMUnMap(void *addr, size_t length)
+{
+ TODO();
+ return 0;
+}
+uint64_t acess__SysMarshalFD(int FD)
+{
+ TODO();
return 0;
}
+int acess__SysUnMarshalFD(uint64_t Handle)
+{
+ TODO();
+ return -1;
+}
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 <d", fd, sizeof(t_sysACL), dest);
}
int acess__SysMount(const char *Device, const char *Directory, const char *Type, const char *Options) {
- DEBUG("%s('%s', '%s', '%s', '%s')", __func__, Device, Directory, Type, Options);
+ SYSTRACE("_SysMount('%s', '%s', '%s', '%s')", Device, Directory, Type, Options);
return _Syscall(SYS_MOUNT, ">s >s >s >s", Device, Directory, Type, Options);
}
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;
}
void *acess_SysLoadBin(const char *path, void **entry)
{
// ERROR!
+ TODO();
return NULL;
}
int acess__SysUnloadBin(void *base)
{
// ERROR!
+ TODO();
+ return -1;
+}
+
+// --- System ---
+int acess__SysLoadModule(const char *Path)
+{
+ TODO();
return -1;
}
int64_t acess__SysTimestamp(void)
{
// TODO: Better impl
+ TODO();
// return now()*1000;
return 0;
}
uint64_t acess__SysGetPhys(uintptr_t vaddr)
{
// TODO:
+ TODO();
return 0;
}
int kernel_tid;
int newID;
- newID = _Syscall(SYS_AN_SPAWN, "<d >d >d", sizeof(int), &kernel_tid,
+ newID = _Syscall(SYS_AN_SPAWN, "<d >d >d",
+ sizeof(int), &kernel_tid,
nfd*sizeof(int), fds,
info ? sizeof(*info) : 0, info);
// _Syscall(SYS_SLEEP, "");
//}
+void acess__SysTimedSleep(int64_t Delay)
+{
+ DEBUG("%s(%lli)", __func__, Delay);
+ // Not accurate, but fuck it
+ //if( Delay > 1000 ) sleep(Delay / 1000);
+ //if( Delay % 1000 ) usleep( (Delay % 1000) * 1000 );
+ //_Syscall(SYS_TIMEDSLEEP, ">I", Delay);
+}
+
int acess__SysWaitTID(int TID, int *ExitStatus)
{
DEBUG("%s(%i, %p)", __func__, TID, ExitStatus);
int acess_gettid(void) { return _Syscall(SYS_GETTID, ""); }
int acess__SysGetPID(void) { return _Syscall(SYS_GETPID, ""); }
int acess__SysGetUID(void) { return _Syscall(SYS_GETUID, ""); }
+int acess__SysGetGID(void) { return _Syscall(SYS_GETGID, ""); }
int acess_getgid(void) { return _Syscall(SYS_GETGID, ""); }
int acess__SysSendMessage(int DestTID, int Length, void *Data)
}
// --- Logging
+static void int_dbgheader(void )
+{
+ printf("[_SysDebug %i] ", giSyscall_ClientID);
+}
void acess__SysDebug(const char *Format, ...)
{
va_list args;
va_start(args, Format);
-
- printf("[_SysDebug %i] ", giSyscall_ClientID);
+ int_dbgheader();
vprintf(Format, args);
printf("\n");
va_end(args);
}
+void acess__SysDebugHex(const char *tag, const void *data, size_t size)
+{
+ int_dbgheader();
+ printf("%s (Hexdump of %p+%zi)\r\n", tag, data, size);
+
+ #define CH(n) ((' '<=cdat[(n)]&&cdat[(n)]<0x7F) ? cdat[(n)] : '.')
+
+ const uint8_t *cdat = data;
+ unsigned int pos = 0;
+
+ while(size >= 16)
+ {
+ int_dbgheader();
+ printf("%04x:"
+ " %02x %02x %02x %02x %02x %02x %02x %02x "
+ " %02x %02x %02x %02x %02x %02x %02x %02x "
+ " %c%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c\r\n",
+ pos,
+ cdat[ 0], cdat[ 1], cdat[ 2], cdat[ 3], cdat[ 4], cdat[ 5], cdat[ 6], cdat[ 7],
+ cdat[ 8], cdat[ 9], cdat[10], cdat[11], cdat[12], cdat[13], cdat[14], cdat[15],
+ CH(0), CH(1), CH(2), CH(3), CH(4), CH(5), CH(6), CH(7),
+ CH(8), CH(9), CH(10), CH(11), CH(12), CH(13), CH(14), CH(15)
+ );
+ size -= 16;
+ cdat += 16;
+ pos += 16;
+ }
+
+ {
+ int_dbgheader();
+ printf("%04x: ", pos);
+ for(int i = 0; i < size; i ++)
+ printf("%02x ", cdat[i]);
+ for(int i = size; i < 16; i ++)
+ printf(" ");
+ printf(" ");
+ for(int i = 0; i < size; i ++)
+ {
+ if( i == 8 )
+ printf(" ");
+ printf("%c", CH(i));
+ }
+
+ printf("\n");
+ }
+}
+
void acess__exit(int Status)
{
DEBUG("_exit(%i)", Status);
DEFSYM(_SysAllocate),
DEFSYM(_SysSetMemFlags),
DEFSYM(_SysDebug),
+ {"_ZN4_sys5debugEPKcz", &acess__SysDebug},
+ DEFSYM(_SysDebugHex),
+ {"_ZN4_sys7hexdumpEPKcPKvj", &acess__SysDebugHex},
DEFSYM(_SysSetFaultHandler),
DEFSYM(_SysWaitEvent),
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au