The start of syscalls.

7bbae2fb · Silas Boyd-Wickizer · bcd91944 · 7bbae2fb · 7bbae2fb · 7bbae2fb
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ OBJS = \
 	cga.o \
 	condvar.o \
 	console.o \
+	exec.o \
 	file.o \
 	fs.o \
 	lapic.o \
@@ -18,6 +19,8 @@ OBJS = \
 	spinlock.o \
 	swtch.o \
 	string.o \
+	syscall.o \
+	sysfile.o \
 	uart.o \
 	vm.o \
 	trap.o \

--- a/exec.c
+++ b/exec.c
@@ -6,16 +6,22 @@
 #include "condvar.h"
 #include "queue.h"
 #include "proc.h"
-#include "defs.h"
+#include "kernel.h"
 #include "x86.h"
-#include "elf.h"
 #include "stat.h"
 #include "fs.h"
 #include "file.h"
+#if 0
+#include "elf.h"
+#endif
 int
 exec(char *path, char **argv)
 {
+  panic("exec");
+  return 0;
+#if 0
  char *s, *last;
  int i, off, brk = 0;
  uint argc, sp, ustack[3+MAXARG+1];
@@ -149,4 +155,5 @@ exec(char *path, char **argv)
    vmn_free(vmn);
  rcu_end_read();
  return -1;
+#endif
 }
--- a/kernel.h
+++ b/kernel.h
@@ -46,6 +46,9 @@ void            cprintf(const char*, ...);
 void            panic(const char*) __attribute__((noreturn));
 void            snprintf(char *buf, u32 n, char *fmt, ...);
+// exec.c
+int             exec(char*, char**);
 // file.c
 struct file*    filealloc(void);
 void            fileclose(struct file*);
@@ -57,6 +60,8 @@ int             filewrite(struct file*, char*, int n);
 // fs.c
 int             namecmp(const char*, const char*);
+struct inode*   dirlookup(struct inode*, char*);
+struct inode*   ialloc(u32, short);
 struct inode*   namei(char*);
 void            iput(struct inode*);
 struct inode*   iget(u32 dev, u32 inum);
@@ -68,6 +73,10 @@ int             readi(struct inode*, char*, u32, u32);
 void            stati(struct inode*, struct stat*);
 int             writei(struct inode*, char*, u32, u32);
 struct inode*   idup(struct inode*);
+struct inode*   nameiparent(char*, char*);
+int             dirlink(struct inode*, char*, u32);
+void            dir_init(struct inode *dp);
+void	        dir_flush(struct inode *dp);
 // ide.c
 void            ideinit(void);
@@ -176,6 +185,15 @@ void            release(struct spinlock*);
 void            pushcli(void);
 void            popcli(void);
+// syscall.c
+int             argint64(int, u64*);
+int             argint32(int n, int *ip);
+int             argptr(int, char**, int);
+int             argstr(int, char**);
+int             fetchint64(uptr, u64*);
+int             fetchstr(uptr, char**);
+void            syscall(void);
 // string.c
 int             memcmp(const void*, const void*, u32);
 void*           memmove(void*, const void*, u32);

--- a/syscall.c
+++ b/syscall.c
 #include "types.h"
-#include "defs.h"
 #include "param.h"
 #include "memlayout.h"
 #include "mmu.h"
+#include "kernel.h"
 #include "spinlock.h"
 #include "condvar.h"
 #include "queue.h"
 #include "proc.h"
 #include "x86.h"
 #include "syscall.h"
-#include "xv6-kmtrace.h"
+#include "xv6-mtrace.h"
+#include "cpu.h"
 // User code makes a system call with INT T_SYSCALL.
 // System call number in %eax.
@@ -19,13 +20,13 @@
 // Fetch the int at addr from process p.
 int
-fetchint(uint addr, int *ip)
+fetchint64(uptr addr, u64 *ip)
 {
-  if(pagefault(proc->vmap, addr, 0) < 0)
+  if(pagefault(myproc()->vmap, addr, 0) < 0)
    return -1;
-  if(pagefault(proc->vmap, addr+3, 0) < 0)
+  if(pagefault(myproc()->vmap, addr+sizeof(*ip)-1, 0) < 0)
    return -1;
-  *ip = *(int*)(addr);
+  *ip = *(u64*)(addr);
  return 0;
 }
@@ -33,12 +34,12 @@ fetchint(uint addr, int *ip)
 // Doesn't actually copy the string - just sets *pp to point at it.
 // Returns length of string, not including nul.
 int
-fetchstr(uint addr, char **pp)
+fetchstr(uptr addr, char **pp)
 {
  char *s = (char *) addr;
  while(1){
-    if(pagefault(proc->vmap, (uint) s, 0) < 0)
+    if(pagefault(myproc()->vmap, (uptr) s, 0) < 0)
      return -1;
    if(*s == 0){
      *pp = (char*)addr;
@@ -49,11 +50,23 @@ fetchstr(uint addr, char **pp)
  return -1;
 }
-// Fetch the nth 32-bit system call argument.
+// Fetch the nth 64-bit system call argument.
 int
-argint(int n, int *ip)
+argint64(int n, u64 *ip)
 {
-  return fetchint(proc->tf->esp + 4 + 4*n, ip);
+  return fetchint64(myproc()->tf->rsp + 8 + 8*n, ip);
+}
+int
+argint32(int n, int *ip)
+{
+  int r;
+  u64 i;
+  r = fetchint64(myproc()->tf->rsp + 8 + 8*n, &i);
+  if (r > 0)
+    *ip = i;
+  return r;
 }
 // Fetch the nth word-sized system call argument as a pointer
@@ -62,12 +75,12 @@ argint(int n, int *ip)
 int
 argptr(int n, char **pp, int size)
 {
-  int i;
+  u64 i;
-  if(argint(n, &i) < 0)
+  if(argint64(n, &i) < 0)
    return -1;
-  for(uint va = PGROUNDDOWN(i); va < i+size; va = va + PGSIZE)
+  for(uptr va = PGROUNDDOWN(i); va < i+size; va = va + PGSIZE)
-    if(pagefault(proc->vmap, va, 0) < 0)
+    if(pagefault(myproc()->vmap, va, 0) < 0)
      return -1;
  *pp = (char*)i;
  return 0;
@@ -80,8 +93,8 @@ argptr(int n, char **pp, int size)
 int
 argstr(int n, char **pp)
 {
-  int addr;
+  uptr addr;
-  if(argint(n, &addr) < 0)
+  if(argint64(n, &addr) < 0)
    return -1;
  return fetchstr(addr, pp);
 }
@@ -112,10 +125,13 @@ extern int sys_unmap(void);
 extern int sys_halt(void);
 static int (*syscalls[])(void) = {
-[SYS_chdir]   sys_chdir,
+#if 0
-[SYS_close]   sys_close,
+  [SYS_chdir] =  sys_chdir,
-[SYS_dup]     sys_dup,
+  [SYS_close] =  sys_close,
-[SYS_exec]    sys_exec,
+  [SYS_dup]   =  sys_dup,
+#endif
+  [SYS_exec]  =  sys_exec,
+#if 0
 [SYS_exit]    sys_exit,
 [SYS_fork]    sys_fork,
 [SYS_fstat]   sys_fstat,
@@ -136,6 +152,7 @@ static int (*syscalls[])(void) = {
 [SYS_map]     sys_map,
 [SYS_unmap]   sys_unmap,
 [SYS_halt]    sys_halt,
+#endif
 };
 void
@@ -143,16 +160,16 @@ syscall(void)
 {
  int num;
-  num = proc->tf->eax;
+  num = myproc()->tf->rax;
  if(num >= 0 && num < NELEM(syscalls) && syscalls[num]) {
    mtrace_kstack_start(syscalls[num], proc);
    mtrace_call_set(1, cpunum());
-    proc->tf->eax = syscalls[num]();
+    myproc()->tf->rax = syscalls[num]();
-    mtrace_kstack_stop(proc);
+    mtrace_kstack_stop(myproc());
    mtrace_call_set(0, cpunum());
  } else {
    cprintf("%d %s: unknown sys call %d\n",
-            proc->pid, proc->name, num);
+            myproc()->pid, myproc()->name, num);
-    proc->tf->eax = -1;
+    myproc()->tf->rax = -1;
  }
 }
--- a/sysfile.c
+++ b/sysfile.c
 #include "types.h"
-#include "defs.h"
 #include "param.h"
 #include "stat.h"
 #include "mmu.h"
+#include "kernel.h"
 #include "spinlock.h"
 #include "condvar.h"
 #include "queue.h"
@@ -10,6 +10,7 @@
 #include "fs.h"
 #include "file.h"
 #include "fcntl.h"
+#include "cpu.h"
 // Fetch the nth word-sized system call argument as a file descriptor
 // and return both the descriptor and the corresponding struct file.
@@ -19,9 +20,9 @@ argfd(int n, int *pfd, struct file **pf)
  int fd;
  struct file *f;
-  if(argint(n, &fd) < 0)
+  if(argint32(n, &fd) < 0)
    return -1;
-  if(fd < 0 || fd >= NOFILE || (f=proc->ofile[fd]) == 0)
+  if(fd < 0 || fd >= NOFILE || (f=myproc()->ofile[fd]) == 0)
    return -1;
  if(pfd)
    *pfd = fd;
@@ -38,8 +39,8 @@ fdalloc(struct file *f)
  int fd;
  for(fd = 0; fd < NOFILE; fd++){
-    if(proc->ofile[fd] == 0){
+    if(myproc()->ofile[fd] == 0){
-      proc->ofile[fd] = f;
+      myproc()->ofile[fd] = f;
      return fd;
    }
  }
@@ -67,7 +68,7 @@ sys_read(void)
  int n;
  char *p;
-  if(argfd(0, 0, &f) < 0 || argint(2, &n) < 0 || argptr(1, &p, n) < 0)
+  if(argfd(0, 0, &f) < 0 || argint32(2, &n) < 0 || argptr(1, &p, n) < 0)
    return -1;
  return fileread(f, p, n);
 }
@@ -79,7 +80,7 @@ sys_write(void)
  int n;
  char *p;
-  if(argfd(0, 0, &f) < 0 || argint(2, &n) < 0 || argptr(1, &p, n) < 0)
+  if(argfd(0, 0, &f) < 0 || argint32(2, &n) < 0 || argptr(1, &p, n) < 0)
    return -1;
  return filewrite(f, p, n);
 }
@@ -92,7 +93,7 @@ sys_close(void)
  if(argfd(0, &fd, &f) < 0)
    return -1;
-  proc->ofile[fd] = 0;
+  myproc()->ofile[fd] = 0;
  fileclose(f);
  return 0;
 }
@@ -200,7 +201,7 @@ sys_unlink(void)
  }
  dir_init(dp);
-  if (ns_remove(dp->dir, KD(name), (void*)ip->inum) == 0) {
+  if (ns_remove(dp->dir, KD(name), (void*)(u64)ip->inum) == 0) {
    iunlockput(ip);
    goto retry;
  }
@@ -279,7 +280,7 @@ sys_open(void)
  struct file *f;
  struct inode *ip;
-  if(argstr(0, &path) < 0 || argint(1, &omode) < 0)
+  if(argstr(0, &path) < 0 || argint32(1, &omode) < 0)
    return -1;
  if(omode & O_CREATE){
    if((ip = create(path, T_FILE, 0, 0)) == 0)
@@ -340,8 +341,8 @@ sys_mknod(void)
  int major, minor;
  if((len=argstr(0, &path)) < 0 ||
-     argint(1, &major) < 0 ||
+     argint32(1, &major) < 0 ||
-     argint(2, &minor) < 0 ||
+     argint32(2, &minor) < 0 ||
     (ip = create(path, T_DEV, major, minor)) == 0)
    return -1;
  iunlockput(ip);
@@ -362,8 +363,8 @@ sys_chdir(void)
    return -1;
  }
  iunlock(ip);
-  iput(proc->cwd);
+  iput(myproc()->cwd);
-  proc->cwd = ip;
+  myproc()->cwd = ip;
  return 0;
 }
@@ -372,16 +373,17 @@ sys_exec(void)
 {
  char *path, *argv[MAXARG];
  int i;
-  uint uargv, uarg;
+  uptr uargv;
+  u64 uarg;
-  if(argstr(0, &path) < 0 || argint(1, (int*)&uargv) < 0){
+  if(argstr(0, &path) < 0 || argint64(1, &uargv) < 0){
    return -1;
  }
  memset(argv, 0, sizeof(argv));
  for(i=0;; i++){
    if(i >= NELEM(argv))
      return -1;
-    if(fetchint(uargv+4*i, (int*)&uarg) < 0)
+    if(fetchint64(uargv+8*i, &uarg) < 0)
      return -1;
    if(uarg == 0){
      argv[i] = 0;
@@ -407,7 +409,7 @@ sys_pipe(void)
  fd0 = -1;
  if((fd0 = fdalloc(rf)) < 0 || (fd1 = fdalloc(wf)) < 0){
    if(fd0 >= 0)
-      proc->ofile[fd0] = 0;
+      myproc()->ofile[fd0] = 0;
    fileclose(rf);
    fileclose(wf);
    return -1;

--- a/trap.c
+++ b/trap.c
@@ -50,19 +50,16 @@ trap(struct trapframe *tf)
  // XXX(sbw) sysenter/sysexit
  if(tf->trapno == T_SYSCALL){
-    panic("syscall..");
+    if(myproc()->killed) {
-#if 0
-    if(proc->killed) {
      mtrace_kstack_start(trap, proc);
      exit();
    }
-    proc->tf = tf;
+    myproc()->tf = tf;
    syscall();
-    if(proc->killed) {
+    if(myproc()->killed) {
-      mtrace_kstack_start(trap, proc);
+      mtrace_kstack_start(trap, myproc());
      exit();
    }
-#endif
    return;
  }

--- a/vm.c
+++ b/vm.c
@@ -470,7 +470,7 @@ pagefault_wcow(struct vmap *vmap, uptr va, pme_t *pte, struct vma *m, u64 npg)
 }
 int
-pagefault(struct vmap *vmap, u64 va, u32 err)
+pagefault(struct vmap *vmap, uptr va, u32 err)
 {
  pme_t *pte = walkpgdir(vmap->pml4, (const void *)va, 1);