f32f3638f4
- Got rid of dummy proc[0]. Now proc[0] is init. - Added initcode.S to exec /init, so that /init is just a regular binary. - Moved exec out of sysfile to exec.c - Moved code dealing with fs guts (like struct inode) from sysfile.c to fs.c. Code dealing with system call arguments stays in sysfile.c - Refactored directory routines in fs.c; should be simpler. - Changed iget to return *unlocked* inode structure. This solves the lookup-then-use race in namei without introducing deadlocks. It also enabled getting rid of the dummy proc[0].
143 lines
3.3 KiB
C
143 lines
3.3 KiB
C
#include "types.h"
|
|
#include "stat.h"
|
|
#include "param.h"
|
|
#include "mmu.h"
|
|
#include "proc.h"
|
|
#include "defs.h"
|
|
#include "x86.h"
|
|
#include "traps.h"
|
|
#include "syscall.h"
|
|
#include "spinlock.h"
|
|
#include "buf.h"
|
|
#include "fs.h"
|
|
#include "fsvar.h"
|
|
#include "elf.h"
|
|
#include "file.h"
|
|
#include "fcntl.h"
|
|
|
|
// User code makes a system call with INT T_SYSCALL.
|
|
// System call number in %eax.
|
|
// Arguments on the stack, from the user call to the C
|
|
// library system call function. The saved user %esp points
|
|
// to a saved program counter, and then the first argument.
|
|
|
|
// Fetch the int at addr from process p.
|
|
int
|
|
fetchint(struct proc *p, uint addr, int *ip)
|
|
{
|
|
if(addr >= p->sz || addr+4 > p->sz)
|
|
return -1;
|
|
*ip = *(int*)(p->mem + addr);
|
|
return 0;
|
|
}
|
|
|
|
// 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
|
|
fetchstr(struct proc *p, uint addr, char **pp)
|
|
{
|
|
char *s, *ep;
|
|
|
|
if(addr >= p->sz)
|
|
return -1;
|
|
*pp = p->mem + addr;
|
|
ep = p->mem + p->sz;
|
|
for(s = *pp; s < ep; s++)
|
|
if(*s == 0)
|
|
return s - *pp;
|
|
return -1;
|
|
}
|
|
|
|
// Fetch the argno'th word-sized system call argument as an integer.
|
|
int
|
|
argint(int argno, int *ip)
|
|
{
|
|
return fetchint(cp, cp->tf->esp + 4 + 4*argno, ip);
|
|
}
|
|
|
|
// 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
|
|
argptr(int argno, char **pp, int size)
|
|
{
|
|
int i;
|
|
|
|
if(argint(argno, &i) < 0)
|
|
return -1;
|
|
if((uint)i >= cp->sz || (uint)i+size >= cp->sz)
|
|
return -1;
|
|
*pp = cp->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
|
|
argstr(int argno, char **pp)
|
|
{
|
|
int addr;
|
|
if(argint(argno, &addr) < 0)
|
|
return -1;
|
|
return fetchstr(cp, addr, pp);
|
|
}
|
|
|
|
extern int sys_chdir(void);
|
|
extern int sys_close(void);
|
|
extern int sys_dup(void);
|
|
extern int sys_exec(void);
|
|
extern int sys_exit(void);
|
|
extern int sys_fork(void);
|
|
extern int sys_fstat(void);
|
|
extern int sys_getpid(void);
|
|
extern int sys_kill(void);
|
|
extern int sys_link(void);
|
|
extern int sys_mkdir(void);
|
|
extern int sys_mknod(void);
|
|
//PAGEBREAK: 0
|
|
extern int sys_open(void);
|
|
extern int sys_pipe(void);
|
|
extern int sys_read(void);
|
|
extern int sys_sbrk(void);
|
|
extern int sys_unlink(void);
|
|
extern int sys_wait(void);
|
|
extern int sys_write(void);
|
|
|
|
static int (*syscalls[])(void) = {
|
|
[SYS_chdir] sys_chdir,
|
|
[SYS_close] sys_close,
|
|
[SYS_dup] sys_dup,
|
|
[SYS_exec] sys_exec,
|
|
[SYS_exit] sys_exit,
|
|
[SYS_fork] sys_fork,
|
|
[SYS_fstat] sys_fstat,
|
|
[SYS_getpid] sys_getpid,
|
|
[SYS_kill] sys_kill,
|
|
[SYS_link] sys_link,
|
|
[SYS_mkdir] sys_mkdir,
|
|
[SYS_mknod] sys_mknod,
|
|
[SYS_open] sys_open,
|
|
[SYS_pipe] sys_pipe,
|
|
[SYS_read] sys_read,
|
|
[SYS_sbrk] sys_sbrk,
|
|
[SYS_unlink] sys_unlink,
|
|
[SYS_wait] sys_wait,
|
|
[SYS_write] sys_write,
|
|
};
|
|
|
|
void
|
|
syscall(void)
|
|
{
|
|
int num = cp->tf->eax;
|
|
|
|
if(num >= 0 && num < NELEM(syscalls) && syscalls[num])
|
|
cp->tf->eax = syscalls[num]();
|
|
else {
|
|
cprintf("%d %s: unknown sys call %d\n",
|
|
cp->pid, cp->name, num);
|
|
cp->tf->eax = -1;
|
|
}
|
|
}
|