Support Linux ABI and (optionally) virtual memory

1 files changed, 87 insertions, 34 deletions

diff --git a/pk/syscall.c b/pk/syscall.c
index 711bb9e..1d3940c 100644
--- a/pk/syscall.c
+++ b/pk/syscall.c
@@ -1,44 +1,53 @@
 // See LICENSE for license details.
 
-#include <machine/syscall.h>
-#include <string.h>
-#include <errno.h>
+#include "syscall.h"
 #include "pk.h"
 #include "pcr.h"
 #include "file.h"
 #include "frontend.h"
+#include "vm.h"
+#include <string.h>
+#include <errno.h>
 
-typedef sysret_t (*syscall_t)(long,long,long,long,long);
+typedef sysret_t (*syscall_t)(long, long, long, long, long, long, long);
 
 void sys_exit(int code)
 {
-  frontend_syscall(SYS_exit,code,0,0,0);
-  panic("exit didn't exit!");
+  frontend_syscall(SYS_exit, code, 0, 0, 0);
+  while (1);
 }
 
 sysret_t sys_read(int fd, char* buf, size_t n)
 {
   sysret_t r = {-1,EBADF};
   file_t* f = file_get(fd);
-  if(!f)
-    return r;
 
-  return file_read(f,buf,n);
+  if (f)
+  {
+    r = file_read(f, buf, n);
+    file_decref(f);
+  }
+
+  return r;
 }
 
 sysret_t sys_write(int fd, const char* buf, size_t n)
 {
   sysret_t r = {-1,EBADF};
   file_t* f = file_get(fd);
-  if(!f)
-    return r;
 
-  return file_write(f,buf,n);
+  if (f)
+  {
+    r = file_write(f, buf, n);
+    file_decref(f);
+  }
+
+  return r;
 }
 
-sysret_t sys_open(const char* name, size_t len, int flags, int mode)
+sysret_t sys_open(const char* name, int flags, int mode)
 {
-  sysret_t ret = file_open(name, len, flags, mode);
+  sysret_t ret = file_open(name, flags, mode);
   if(ret.result == -1)
     return ret;
 
@@ -50,62 +59,98 @@ sysret_t sys_open(const char* name, size_t len, int flags, int mode)
 
 sysret_t sys_close(int fd)
 {
-  return (sysret_t){fd_close(fd),EBADF};
+  int ret = fd_close(fd);
+  return (sysret_t){ret, ret & EBADF};
 }
 
 sysret_t sys_fstat(int fd, void* st)
 {
   sysret_t r = {-1,EBADF};
   file_t* f = file_get(fd);
-  if(!f)
-    return r;
 
-  return file_stat(f,st);
+  if (f)
+  {
+    r = file_stat(f, st);
+    file_decref(f);
+  }
+
+  return r;
 }
 
 sysret_t sys_lseek(int fd, size_t ptr, int dir)
 {
   sysret_t r = {-1,EBADF};
   file_t* f = file_get(fd);
-  if(!f)
-    return r;
 
-  return file_lseek(f,ptr,dir);
+  if (f)
+  {
+    r = file_lseek(f, ptr, dir);
+    file_decref(f);
+  }
+
+  return r;
 }
 
-sysret_t sys_stat(const char* name, size_t len, void* st)
+sysret_t sys_stat(const char* name, void* st)
 {
-  return frontend_syscall(SYS_stat,(long)name,len,(long)st,0);
+  size_t name_size = strlen(name)+1;
+  populate_mapping(st, sizeof(struct stat), PROT_WRITE);
+  return frontend_syscall(SYS_stat, (uintptr_t)name, name_size, (uintptr_t)st, 0);
 }
 
-sysret_t sys_lstat(const char* name, size_t len, void* st)
+sysret_t sys_lstat(const char* name, void* st)
 {
-  return frontend_syscall(SYS_lstat,(long)name,len,(long)st,0);
+  size_t name_size = strlen(name)+1;
+  populate_mapping(st, sizeof(struct stat), PROT_WRITE);
+  return frontend_syscall(SYS_lstat, (uintptr_t)name, name_size, (uintptr_t)st, 0);
 }
 
-sysret_t sys_link(const char* old_name, size_t old_len,
-                  const char* new_name, size_t new_len)
+sysret_t sys_link(const char* old_name, const char* new_name)
 {
-  return frontend_syscall(SYS_link,(long)old_name,old_len,
-                                   (long)new_name,new_len);
+  size_t old_size = strlen(old_name)+1;
+  size_t new_size = strlen(new_name)+1;
+  return frontend_syscall(SYS_link, (uintptr_t)old_name, old_size,
+                                    (uintptr_t)new_name, new_size);
 }
 
 sysret_t sys_unlink(const char* name, size_t len)
 {
-  return frontend_syscall(SYS_unlink,(long)name,len,0,0);
+  size_t name_size = strlen(name)+1;
+  return frontend_syscall(SYS_unlink, (uintptr_t)name, name_size, 0, 0);
 }
 
 sysret_t sys_brk(size_t pos)
 {
-  if(pos / (1024 * 1024) >= mem_mb)
-    return (sysret_t){-1, ENOMEM};
+  return do_brk(pos);
+}
+
+sysret_t sys_uname(void* buf)
+{
+  const int sz = 65;
+  strcpy(buf + 0*sz, "Proxy Kernel");
+  strcpy(buf + 1*sz, "");
+  strcpy(buf + 2*sz, "3.4.5");
+  strcpy(buf + 3*sz, "");
+  strcpy(buf + 4*sz, "");
+  strcpy(buf + 5*sz, "");
   return (sysret_t){0,0};
 }
 
-sysret_t syscall(long a0, long a1, long a2, long a3, long n)
+sysret_t sys_getuid()
+{
+  return (sysret_t){0,0};
+}
+
+sysret_t sys_mmap(uintptr_t addr, size_t length, int prot, int flags, int fd, off_t offset)
+{
+  return do_mmap(addr, length, prot, flags, fd, offset);
+}
+
+sysret_t syscall(long a0, long a1, long a2, long a3, long a4, long a5, long n)
 {
   const static void* syscall_table[] = {
     [SYS_exit] = sys_exit,
+    [SYS_exit_group] = sys_exit,
     [SYS_read] = sys_read,
     [SYS_write] = sys_write,
     [SYS_open] = sys_open,
@@ -117,10 +162,18 @@ sysret_t syscall(long a0, long a1, long a2, long a3, long n)
     [SYS_link] = sys_link,
     [SYS_unlink] = sys_unlink,
     [SYS_brk] = sys_brk,
+    [SYS_uname] = sys_uname,
+    [SYS_getuid] = sys_getuid,
+    [SYS_geteuid] = sys_getuid,
+    [SYS_getgid] = sys_getuid,
+    [SYS_getegid] = sys_getuid,
+    [SYS_mmap] = sys_mmap,
   };
 
   if(n >= ARRAY_SIZE(syscall_table) || !syscall_table[n])
     panic("bad syscall #%ld!",n);
 
-  return ((syscall_t)syscall_table[n])(a0, a1, a2, a3, n);
+  sysret_t r = ((syscall_t)syscall_table[n])(a0, a1, a2, a3, a4, a5, n);
+  printk("syscall %d %x %x %x = %x\n", n, a0, a1, a2, r.result);
+  return r;
 }