refactor syscall code

224f6598 · rsc · 31085bb4 · 224f6598 · 224f6598 · 224f6598
--- a/defs.h
+++ b/defs.h
@@ -16,7 +16,7 @@ struct jmpbuf;
 void setupsegs(struct proc*);
 struct proc* copyproc(struct proc*);
 struct spinlock;
-uint growproc(int);
+int growproc(int);
 void sleep(void*, struct spinlock*);
 void wakeup(void*);
 void scheduler(void);
@@ -43,10 +43,10 @@ int strncmp(const char*, const char*, uint);
 // syscall.c
 void syscall(void);
 int fetchint(struct proc*, uint, int*);
-int fetchbyte(struct proc*, uint, char*);
-int fetcharg(int, void*);
-int checkstring(uint);
-int putint(struct proc*, uint, int);
+int fetchstr(struct proc*, uint, char**);
+int argint(int, int*);
+int argptr(int, char**, int);
+int argstr(int, char**);

 // picirq.c
 extern ushort irq_mask_8259A;
@@ -99,7 +99,6 @@ int pipe_read(struct pipe*, char*, int);
 // file.c
 struct stat;
 void fileinit(void);
-int fdalloc(void);
 struct file* filealloc(void);
 void fileclose(struct file*);
 int fileread(struct file*, char*, int n);

--- a/file.c
+++ b/file.c
@@ -22,19 +22,7 @@ fileinit(void)
  initlock(&fd_table_lock, "fd_table");
 }

-// Allocate a file descriptor number for curproc.
-int
-fdalloc(void)
-{
-  int fd;
-  struct proc *p = curproc[cpu()];
-  for(fd = 0; fd < NOFILE; fd++)
-    if(p->ofile[fd] == 0)
-      return fd;
-  return -1;
-}
-
-// Allocate a file descriptor structure
+// Allocate a file structure
 struct file*
 filealloc(void)
 {

--- a/syscall.c
+++ b/syscall.c
@@ -21,64 +21,71 @@
 // library system call function. The saved user %esp points
 // to a saved program counter, and then the first argument.

-// Fetch 32 bits from a user-supplied pointer.
-// Returns 0 if addr was OK, -1 if illegal.
+// Fetch the int at addr from process p.
 int
 fetchint(struct proc *p, uint addr, int *ip)
 {
-  *ip = 0;
-
-  if(addr > p->sz - 4)
+  if(addr >= p->sz || addr+4 > p->sz)
    return -1;
  *ip = *(int*)(p->mem + addr);
  return 0;
 }

-// Fetch byte from a user-supplied pointer.
-// Returns 0 on success, -1 if pointer is illegal.
+// Fetch the nul-terminated string at addr from process p.
+// Doesn't actually copy the string - just sets *pp to point at it.
+// Returns length of string, not including nul.
 int
-fetchbyte(struct proc *p, uint addr, char *c)
+fetchstr(struct proc *p, uint addr, char **pp)
 {
+  char *cp, *ep;
+
  if(addr >= p->sz)
    return -1;
-  *c = *(p->mem + addr);
-  return 0;
+  *pp = p->mem + addr;
+  ep = p->mem + p->sz;
+  for(cp = *pp; cp < ep; cp++)
+    if(*cp == 0)
+      return cp - *pp;
+  return -1;
 }

+// Fetch the argno'th word-sized system call argument as an integer.
 int
-fetcharg(int argno, void *ip)
+argint(int argno, int *ip)
 {
-  uint esp;
+  struct proc *p = curproc[cpu()];

-  esp = (uint) curproc[cpu()]->tf->esp;
-  return fetchint(curproc[cpu()], esp + 4 + 4*argno, ip);
+  return fetchint(p, p->tf->esp + 4 + 4*argno, ip);
 }

-// Check that an entire string is valid in user space.
-// Returns the length, not including null, or -1.
+// Fetch the nth word-sized system call argument as a pointer
+// to a block of memory of size n bytes.  Check that the pointer
+// lies within the process address space.
 int
-checkstring(uint s)
+argptr(int argno, char **pp, int size)
 {
-  char c;
-  int len = 0;
-
-  for(;;){
-    if(fetchbyte(curproc[cpu()], s, &c) < 0)
-      return -1;
-    if(c == '\0')
-      return len;
-    len++;
-    s++;
-  }
+  int i;
+  struct proc *p = curproc[cpu()];
+  
+  if(argint(argno, &i) < 0)
+    return -1;
+  if((uint)i >= p->sz || (uint)i+size >= p->sz)
+    return -1;
+  *pp = p->mem + i;
+  return 0;
 }

+// Fetch the nth word-sized system call argument as a string pointer.
+// Check that the pointer is valid and the string is nul-terminated.
+// (There is no shared writable memory, so the string can't change
+// between this check and being used by the kernel.)
 int
-putint(struct proc *p, uint addr, int x)
+argstr(int argno, char **pp)
 {
-  if(addr > p->sz - 4)
+  int addr;
+  if(argint(argno, &addr) < 0)
    return -1;
-  memmove(p->mem + addr, &x, 4);
-  return 0;
+  return fetchstr(curproc[cpu()], addr, pp);
 }

 extern int sys_chdir(void);

--- a/syscall.h
+++ b/syscall.h
+// System call numbers
 #define SYS_fork    1
 #define SYS_exit    2
 #define SYS_wait    3

--- a/sysfile.c
+++ b/sysfile.c
--- a/sysproc.c
+++ b/sysproc.c
@@ -44,7 +44,7 @@ sys_kill(void)
 {
  int pid;

-  if(fetcharg(0, &pid) < 0)
+  if(argint(0, &pid) < 0)
    return -1;
  return proc_kill(pid);
 }
@@ -52,20 +52,19 @@ sys_kill(void)
 int
 sys_getpid(void)
 {
-  struct proc *cp = curproc[cpu()];
-  return cp->pid;
+  return curproc[cpu()]->pid;
 }

 int
 sys_sbrk(void)
 {
-  uint addr;
+  int addr;
  int n;
  struct proc *cp = curproc[cpu()];

-  if(fetcharg(0, &n) < 0)
+  if(argint(0, &n) < 0)
    return -1;
-  if((addr = growproc(n)) == 0xffffffff)
+  if((addr = growproc(n)) < 0)
    return -1;
  setupsegs(cp);
  return addr;