2007-08-23 23:58:19 +00:00
|
|
|
struct buf;
|
2007-08-28 12:48:33 +00:00
|
|
|
struct context;
|
2007-08-23 23:58:19 +00:00
|
|
|
struct file;
|
|
|
|
struct inode;
|
|
|
|
struct pipe;
|
2006-06-12 15:22:12 +00:00
|
|
|
struct proc;
|
2006-07-15 12:03:57 +00:00
|
|
|
struct spinlock;
|
2016-09-11 21:24:04 +00:00
|
|
|
struct sleeplock;
|
2007-08-23 23:58:19 +00:00
|
|
|
struct stat;
|
2011-07-28 00:35:46 +00:00
|
|
|
struct superblock;
|
2006-06-15 16:02:20 +00:00
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// bio.c
|
|
|
|
void binit(void);
|
|
|
|
struct buf* bread(uint, uint);
|
|
|
|
void brelse(struct buf*);
|
|
|
|
void bwrite(struct buf*);
|
2019-07-30 12:54:43 +00:00
|
|
|
void bpin(struct buf*);
|
|
|
|
void bunpin(struct buf*);
|
2006-06-15 16:02:20 +00:00
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// console.c
|
2009-03-08 22:07:13 +00:00
|
|
|
void consoleinit(void);
|
2019-06-03 21:59:17 +00:00
|
|
|
void consoleintr(int);
|
2019-07-27 07:49:03 +00:00
|
|
|
void consputc(int);
|
2006-06-16 20:29:25 +00:00
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// exec.c
|
2007-08-27 12:48:20 +00:00
|
|
|
int exec(char*, char**);
|
2006-09-07 01:37:58 +00:00
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// file.c
|
|
|
|
struct file* filealloc(void);
|
|
|
|
void fileclose(struct file*);
|
2007-08-27 14:35:09 +00:00
|
|
|
struct file* filedup(struct file*);
|
2007-08-23 23:58:19 +00:00
|
|
|
void fileinit(void);
|
2019-06-01 09:33:38 +00:00
|
|
|
int fileread(struct file*, uint64, int n);
|
|
|
|
int filestat(struct file*, uint64 addr);
|
|
|
|
int filewrite(struct file*, uint64, int n);
|
2006-06-21 01:53:07 +00:00
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// fs.c
|
2019-08-18 18:35:11 +00:00
|
|
|
void fsinit(int);
|
2007-08-23 23:58:19 +00:00
|
|
|
int dirlink(struct inode*, char*, uint);
|
2007-08-24 20:54:23 +00:00
|
|
|
struct inode* dirlookup(struct inode*, char*, uint*);
|
|
|
|
struct inode* ialloc(uint, short);
|
|
|
|
struct inode* idup(struct inode*);
|
2019-08-18 18:35:11 +00:00
|
|
|
void iinit();
|
2007-08-24 20:54:23 +00:00
|
|
|
void ilock(struct inode*);
|
|
|
|
void iput(struct inode*);
|
|
|
|
void iunlock(struct inode*);
|
|
|
|
void iunlockput(struct inode*);
|
2007-08-23 23:58:19 +00:00
|
|
|
void iupdate(struct inode*);
|
|
|
|
int namecmp(const char*, const char*);
|
2007-08-24 20:54:23 +00:00
|
|
|
struct inode* namei(char*);
|
|
|
|
struct inode* nameiparent(char*, char*);
|
2019-06-04 09:57:47 +00:00
|
|
|
int readi(struct inode*, int, uint64, uint, uint);
|
2007-08-23 23:58:19 +00:00
|
|
|
void stati(struct inode*, struct stat*);
|
2019-06-04 09:57:47 +00:00
|
|
|
int writei(struct inode*, int, uint64, uint, uint);
|
2006-07-12 17:00:54 +00:00
|
|
|
|
2019-05-31 15:45:42 +00:00
|
|
|
// ramdisk.c
|
|
|
|
void ramdiskinit(void);
|
|
|
|
void ramdiskintr(void);
|
|
|
|
void ramdiskrw(struct buf*);
|
2006-06-22 01:28:57 +00:00
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// kalloc.c
|
2019-05-31 13:45:59 +00:00
|
|
|
void* kalloc(void);
|
|
|
|
void kfree(void *);
|
|
|
|
void kinit();
|
2007-08-23 23:58:19 +00:00
|
|
|
|
2011-07-28 00:35:46 +00:00
|
|
|
// log.c
|
2019-08-18 18:35:11 +00:00
|
|
|
void initlog(int, struct superblock*);
|
2011-07-28 00:35:46 +00:00
|
|
|
void log_write(struct buf*);
|
2014-08-27 21:15:30 +00:00
|
|
|
void begin_op();
|
|
|
|
void end_op();
|
2011-07-28 00:35:46 +00:00
|
|
|
|
2006-06-27 14:35:53 +00:00
|
|
|
// pipe.c
|
2007-08-28 04:22:35 +00:00
|
|
|
int pipealloc(struct file**, struct file**);
|
|
|
|
void pipeclose(struct pipe*, int);
|
2019-06-04 09:57:47 +00:00
|
|
|
int piperead(struct pipe*, uint64, int);
|
|
|
|
int pipewrite(struct pipe*, uint64, int);
|
2006-06-27 14:35:53 +00:00
|
|
|
|
2019-07-27 07:49:03 +00:00
|
|
|
// printf.c
|
|
|
|
void printf(char*, ...);
|
|
|
|
void panic(char*) __attribute__((noreturn));
|
|
|
|
void printfinit(void);
|
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// proc.c
|
2017-01-31 22:47:16 +00:00
|
|
|
int cpuid(void);
|
2019-09-10 16:30:10 +00:00
|
|
|
void exit(int);
|
2009-05-31 00:38:51 +00:00
|
|
|
int fork(void);
|
2007-08-23 23:58:19 +00:00
|
|
|
int growproc(int);
|
2019-05-31 16:43:20 +00:00
|
|
|
pagetable_t proc_pagetable(struct proc *);
|
|
|
|
void proc_freepagetable(pagetable_t, uint64);
|
2007-08-28 19:25:04 +00:00
|
|
|
int kill(int);
|
2017-02-01 23:04:13 +00:00
|
|
|
struct cpu* mycpu(void);
|
2018-10-10 00:22:48 +00:00
|
|
|
struct cpu* getmycpu(void);
|
2017-02-01 01:21:14 +00:00
|
|
|
struct proc* myproc();
|
2019-05-31 13:45:59 +00:00
|
|
|
void procinit(void);
|
2007-08-27 23:32:16 +00:00
|
|
|
void scheduler(void) __attribute__((noreturn));
|
2010-09-02 18:30:06 +00:00
|
|
|
void sched(void);
|
2017-01-31 22:47:16 +00:00
|
|
|
void setproc(struct proc*);
|
2007-08-23 23:58:19 +00:00
|
|
|
void sleep(void*, struct spinlock*);
|
|
|
|
void userinit(void);
|
2019-09-10 16:30:10 +00:00
|
|
|
int wait(uint64);
|
2007-08-23 23:58:19 +00:00
|
|
|
void wakeup(void*);
|
|
|
|
void yield(void);
|
2019-06-05 18:31:13 +00:00
|
|
|
int either_copyout(int user_dst, uint64 dst, void *src, uint64 len);
|
|
|
|
int either_copyin(void *dst, int user_src, uint64 src, uint64 len);
|
2019-06-06 17:54:03 +00:00
|
|
|
void procdump(void);
|
2006-07-05 20:00:14 +00:00
|
|
|
|
2007-08-28 12:48:33 +00:00
|
|
|
// swtch.S
|
2019-05-31 13:45:59 +00:00
|
|
|
void swtch(struct context*, struct context*);
|
2006-07-16 01:47:40 +00:00
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// spinlock.c
|
|
|
|
void acquire(struct spinlock*);
|
|
|
|
int holding(struct spinlock*);
|
|
|
|
void initlock(struct spinlock*, char*);
|
|
|
|
void release(struct spinlock*);
|
2019-06-05 18:05:46 +00:00
|
|
|
void push_off(void);
|
|
|
|
void pop_off(void);
|
2006-07-21 13:18:04 +00:00
|
|
|
|
2016-09-11 21:24:04 +00:00
|
|
|
// sleeplock.c
|
|
|
|
void acquiresleep(struct sleeplock*);
|
2017-01-31 01:07:42 +00:00
|
|
|
void releasesleep(struct sleeplock*);
|
2016-09-11 21:24:04 +00:00
|
|
|
int holdingsleep(struct sleeplock*);
|
|
|
|
void initsleeplock(struct sleeplock*, char*);
|
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// string.c
|
|
|
|
int memcmp(const void*, const void*, uint);
|
|
|
|
void* memmove(void*, const void*, uint);
|
|
|
|
void* memset(void*, int, uint);
|
|
|
|
char* safestrcpy(char*, const char*, int);
|
|
|
|
int strlen(const char*);
|
|
|
|
int strncmp(const char*, const char*, uint);
|
2007-08-24 21:00:02 +00:00
|
|
|
char* strncpy(char*, const char*, int);
|
2007-08-21 19:22:08 +00:00
|
|
|
|
2007-08-23 23:58:19 +00:00
|
|
|
// syscall.c
|
|
|
|
int argint(int, int*);
|
2019-06-01 09:33:38 +00:00
|
|
|
int argstr(int, char*, int);
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 12:24:42 +00:00
|
|
|
int argaddr(int, uint64 *);
|
2019-06-01 09:33:38 +00:00
|
|
|
int fetchstr(uint64, char*, int);
|
Checkpoint port of xv6 to x86-64. Passed usertests on 2 processors a few times.
The x86-64 doesn't just add two levels to page tables to support 64 bit
addresses, but is a different processor. For example, calling conventions,
system calls, and segmentation are different from 32-bit x86. Segmentation is
basically gone, but gs/fs in combination with MSRs can be used to hold a
per-core pointer. In general, x86-64 is more straightforward than 32-bit
x86. The port uses code from sv6 and the xv6 "rsc-amd64" branch.
A summary of the changes is as follows:
- Booting: switch to grub instead of xv6's bootloader (pass -kernel to qemu),
because xv6's boot loader doesn't understand 64bit ELF files. And, we don't
care anymore about booting.
- Makefile: use -m64 instead of -m32 flag for gcc, delete boot loader, xv6.img,
bochs, and memfs. For now dont' use -O2, since usertests with -O2 is bigger than
MAXFILE!
- Update gdb.tmpl to be for i386 or x86-64
- Console/printf: use stdarg.h and treat 64-bit addresses different from ints
(32-bit)
- Update elfhdr to be 64 bit
- entry.S/entryother.S: add code to switch to 64-bit mode: build a simple page
table in 32-bit mode before switching to 64-bit mode, share code for entering
boot processor and APs, and tweak boot gdt. The boot gdt is the gdt that the
kernel proper also uses. (In 64-bit mode, the gdt/segmentation and task state
mostly disappear.)
- exec.c: fix passing argv (64-bit now instead of 32-bit).
- initcode.c: use syscall instead of int.
- kernel.ld: load kernel very high, in top terabyte. 64 bits is a lot of
address space!
- proc.c: initial return is through new syscall path instead of trapret.
- proc.h: update struct cpu to have some scratch space since syscall saves less
state than int, update struct context to reflect x86-64 calling conventions.
- swtch: simplify for x86-64 calling conventions.
- syscall: add fetcharg to handle x86-64 calling convetions (6 arguments are
passed through registers), and fetchaddr to read a 64-bit value from user space.
- sysfile: update to handle pointers from user space (e.g., sys_exec), which are
64 bits.
- trap.c: no special trap vector for sys calls, because x86-64 has a different
plan for system calls.
- trapasm: one plan for syscalls and one plan for traps (interrupt and
exceptions). On x86-64, the kernel is responsible for switching user/kernel
stacks. To do, xv6 keeps some scratch space in the cpu structure, and uses MSR
GS_KERN_BASE to point to the core's cpu structure (using swapgs).
- types.h: add uint64, and change pde_t to uint64
- usertests: exit() when fork fails, which helped in tracking down one of the
bugs in the switch from 32-bit to 64-bit
- vectors: update to make them 64 bits
- vm.c: use bootgdt in kernel too, program MSRs for syscalls and core-local
state (for swapgs), walk 4 levels in walkpgdir, add DEVSPACETOP, use task
segment to set kernel stack for interrupts (but simpler than in 32-bit mode),
add an extra argument to freevm (size of user part of address space) to avoid
checking all entries till KERNBASE (there are MANY TB before the top 1TB).
- x86: update trapframe to have 64-bit entries, which is what the processor
pushes on syscalls and traps. simplify lgdt and lidt, using struct desctr,
which needs the gcc directives packed and aligned.
TODO:
- use int32 instead of int?
- simplify curproc(). xv6 has per-cpu state again, but this time it must have it.
- avoid repetition in walkpgdir
- fix validateint() in usertests.c
- fix bugs (e.g., observed one a case of entering kernel with invalid gs or proc
2018-09-23 12:24:42 +00:00
|
|
|
int fetchaddr(uint64, uint64*);
|
2019-05-31 13:45:59 +00:00
|
|
|
void syscall();
|
2007-08-23 23:58:19 +00:00
|
|
|
|
|
|
|
// trap.c
|
2010-08-11 18:34:45 +00:00
|
|
|
extern uint ticks;
|
2019-05-31 13:45:59 +00:00
|
|
|
void trapinit(void);
|
2019-06-05 18:05:46 +00:00
|
|
|
void trapinithart(void);
|
2007-08-27 13:34:35 +00:00
|
|
|
extern struct spinlock tickslock;
|
2019-05-31 13:45:59 +00:00
|
|
|
void usertrapret(void);
|
2007-08-08 09:41:21 +00:00
|
|
|
|
2009-05-31 00:28:45 +00:00
|
|
|
// uart.c
|
2009-05-31 00:38:51 +00:00
|
|
|
void uartinit(void);
|
|
|
|
void uartintr(void);
|
|
|
|
void uartputc(int);
|
2019-06-03 21:49:27 +00:00
|
|
|
int uartgetc(void);
|
2009-05-31 00:28:45 +00:00
|
|
|
|
2010-07-02 18:51:53 +00:00
|
|
|
// vm.c
|
2019-05-31 13:45:59 +00:00
|
|
|
void kvminit(void);
|
2019-06-05 18:05:46 +00:00
|
|
|
void kvminithart(void);
|
2019-07-24 19:28:37 +00:00
|
|
|
uint64 kvmpa(uint64);
|
|
|
|
void kvmmap(uint64, uint64, uint64, int);
|
|
|
|
int mappages(pagetable_t, uint64, uint64, uint64, int);
|
2019-05-31 13:45:59 +00:00
|
|
|
pagetable_t uvmcreate(void);
|
2019-06-05 18:31:13 +00:00
|
|
|
void uvminit(pagetable_t, uchar *, uint);
|
2019-05-31 16:43:20 +00:00
|
|
|
uint64 uvmalloc(pagetable_t, uint64, uint64);
|
|
|
|
uint64 uvmdealloc(pagetable_t, uint64, uint64);
|
2019-07-02 15:45:06 +00:00
|
|
|
int uvmcopy(pagetable_t, pagetable_t, uint64);
|
2019-05-31 13:45:59 +00:00
|
|
|
void uvmfree(pagetable_t, uint64);
|
2019-07-24 19:28:37 +00:00
|
|
|
void uvmunmap(pagetable_t, uint64, uint64, int);
|
|
|
|
void uvmclear(pagetable_t, uint64);
|
2019-05-31 16:43:20 +00:00
|
|
|
uint64 walkaddr(pagetable_t, uint64);
|
|
|
|
int copyout(pagetable_t, uint64, char *, uint64);
|
2019-06-01 09:33:38 +00:00
|
|
|
int copyin(pagetable_t, char *, uint64, uint64);
|
2019-07-22 19:38:08 +00:00
|
|
|
int copyinstr(pagetable_t, char *, uint64, uint64);
|
2010-07-02 18:51:53 +00:00
|
|
|
|
2019-06-03 19:23:12 +00:00
|
|
|
// plic.c
|
|
|
|
void plicinit(void);
|
2019-06-05 18:05:46 +00:00
|
|
|
void plicinithart(void);
|
2019-06-03 19:23:12 +00:00
|
|
|
int plic_claim(void);
|
|
|
|
void plic_complete(int);
|
|
|
|
|
2019-06-13 10:49:02 +00:00
|
|
|
// virtio_disk.c
|
|
|
|
void virtio_disk_init(void);
|
2019-07-29 21:33:16 +00:00
|
|
|
void virtio_disk_rw(struct buf *, int);
|
2019-06-13 10:49:02 +00:00
|
|
|
void virtio_disk_intr();
|
|
|
|
|
2007-08-08 09:41:21 +00:00
|
|
|
// number of elements in fixed-size array
|
|
|
|
#define NELEM(x) (sizeof(x)/sizeof((x)[0]))
|