5ce9751cab
Linux 2.4 box using gcc 3.4.6 don't seem to follow the same
conventions as the i386-jos-elf-gcc compilers.
Can run make 'TOOLPREFIX=' or edit the Makefile.
curproc[cpu()] can now be NULL, indicating that no proc is running.
This seemed safer to me than having curproc[0] and curproc[1]
both pointing at proc[0] potentially.
The old implementation of swtch depended on the stack frame layout
used inside swtch being okay to return from on the other stack
(exactly the V6 you are not expected to understand this).
It also could be called in two contexts: at boot time, to schedule
the very first process, and later, on behalf of a process, to sleep
or schedule some other process.
I split this into two functions: scheduler and swtch.
The scheduler is now a separate never-returning function, invoked
by each cpu once set up. The scheduler looks like:
scheduler() {
setjmp(cpu.context);
pick proc to schedule
blah blah blah
longjmp(proc.context)
}
The new swtch is intended to be called only when curproc[cpu()] is not NULL,
that is, only on behalf of a user proc. It does:
swtch() {
if(setjmp(proc.context) == 0)
longjmp(cpu.context)
}
to save the current proc context and then jump over to the scheduler,
running on the cpu stack.
Similarly the system call stubs are now in assembly in usys.S to avoid
needing to know the details of stack frame layout used by the compiler.
Also various changes in the debugging prints.
84 lines
1.9 KiB
C
84 lines
1.9 KiB
C
// kalloc.c
|
|
char *kalloc(int n);
|
|
void kfree(char *cp, int len);
|
|
void kinit(void);
|
|
|
|
// console.c
|
|
void cprintf(char *fmt, ...);
|
|
void panic(char *s);
|
|
void cons_putc(int);
|
|
|
|
// proc.c
|
|
struct proc;
|
|
struct jmpbuf;
|
|
void setupsegs(struct proc *);
|
|
struct proc * newproc(void);
|
|
void swtch(void);
|
|
void sleep(void *);
|
|
void wakeup(void *);
|
|
void scheduler(void);
|
|
|
|
// swtch.S
|
|
struct jmpbuf;
|
|
int setjmp(struct jmpbuf*);
|
|
void longjmp(struct jmpbuf*);
|
|
|
|
// trap.c
|
|
void tvinit(void);
|
|
void idtinit(void);
|
|
|
|
// string.c
|
|
void * memcpy(void *dst, void *src, unsigned n);
|
|
void * memset(void *dst, int c, unsigned n);
|
|
int memcmp(const void *v1, const void *v2, unsigned n);
|
|
void *memmove(void *dst, const void *src, unsigned n);
|
|
int strncmp(const char *p, const char *q, unsigned n);
|
|
|
|
// syscall.c
|
|
void syscall(void);
|
|
|
|
// picirq.c
|
|
extern uint16_t irq_mask_8259A;
|
|
void irq_setmask_8259A(uint16_t mask);
|
|
void pic_init(void);
|
|
|
|
// mp.c
|
|
void mp_init(void);
|
|
int cpu(void);
|
|
int mp_isbcpu(void);
|
|
void lapic_init(int);
|
|
void lapic_timerinit(void);
|
|
void lapic_timerintr(void);
|
|
void lapic_enableintr(void);
|
|
void lapic_disableintr(void);
|
|
|
|
// spinlock.c
|
|
extern uint32_t kernel_lock;
|
|
void acquire_spinlock(uint32_t* lock);
|
|
void release_spinlock(uint32_t* lock);
|
|
void release_grant_spinlock(uint32_t* lock, int cpu);
|
|
|
|
// main.c
|
|
void load_icode(struct proc *p, uint8_t *binary, unsigned size);
|
|
|
|
// pipe.c
|
|
struct pipe;
|
|
struct fd;
|
|
int pipe_alloc(struct fd **fd1, struct fd **fd2);
|
|
void pipe_close(struct pipe *p, int writeable);
|
|
int pipe_write(struct pipe *p, char *addr, int n);
|
|
int pipe_read(struct pipe *p, char *addr, int n);
|
|
|
|
// fd.c
|
|
int fd_ualloc();
|
|
struct fd * fd_alloc();
|
|
void fd_close(struct fd *);
|
|
int fd_read(struct fd *fd, char *addr, int n);
|
|
int fd_write(struct fd *fd, char *addr, int n);
|
|
|
|
// ide.c
|
|
void ide_init(void);
|
|
void ide_intr(void);
|
|
void* ide_start_read(uint32_t secno, void *dst, unsigned nsecs);
|
|
int ide_finish_read(void *);
|