xv6-65oo2/usys.S

#include "syscall.h"
#include "traps.h"

#define STUB(name) \
	.globl name; \
	name: \
		movl $SYS_ ## name, %eax; \
		int $T_SYSCALL; \
		ret 

STUB(fork)
STUB(exit)
STUB(wait)
STUB(cons_putc)
STUB(pipe)
STUB(read)
STUB(write)
STUB(close)
STUB(block)
STUB(kill)
STUB(panic)
STUB(cons_puts)
Changes to allow use of native x86 ELF compilers, which on my 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. 2006-07-11 01:07:40 +00:00			`#include "syscall.h"`
			`#include "traps.h"`

			`#define STUB(name) \`
			`.globl name; \`
			`name: \`
			`movl $SYS_ ## name, %eax; \`
			`int $T_SYSCALL; \`
			`ret`

			`STUB(fork)`
			`STUB(exit)`
pre-empt both user and kernel, in clock interrupt usertest.c tests pre-emption kill() 2006-07-11 17:39:45 +00:00			`STUB(wait)`
Changes to allow use of native x86 ELF compilers, which on my 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. 2006-07-11 01:07:40 +00:00			`STUB(cons_putc)`
			`STUB(pipe)`
			`STUB(read)`
			`STUB(write)`
			`STUB(close)`
			`STUB(block)`
pre-empt both user and kernel, in clock interrupt usertest.c tests pre-emption kill() 2006-07-11 17:39:45 +00:00			`STUB(kill)`
no more recursive locks wakeup1() assumes you hold proc_table_lock sleep(chan, lock) provides atomic sleep-and-release to wait for condition ugly code in swtch/scheduler to implement new sleep fix lots of bugs in pipes, wait, and exit fix bugs if timer interrupt goes off in schedule() console locks per line, not per byte 2006-07-15 12:03:57 +00:00			`STUB(panic)`
Add user.h for prototypes. Add cons_puts for cleaner output. 2006-07-16 15:36:31 +00:00			`STUB(cons_puts)`