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.
64 lines
1.9 KiB
Makefile
64 lines
1.9 KiB
Makefile
OBJS = main.o console.o string.o kalloc.o proc.o trapasm.o trap.o vectors.o \
|
|
syscall.o ide.o picirq.o mp.o spinlock.o fd.o pipe.o swtch.o
|
|
|
|
# Cross-compiling (e.g., on Mac OS X)
|
|
TOOLPREFIX = i386-jos-elf-
|
|
|
|
# Using native tools (e.g., on X86 Linux)
|
|
# TOOLPREFIX =
|
|
|
|
CC = $(TOOLPREFIX)gcc
|
|
LD = $(TOOLPREFIX)ld
|
|
OBJCOPY = $(TOOLPREFIX)objcopy
|
|
OBJDUMP = $(TOOLPREFIX)objdump
|
|
CFLAGS = -nostdinc -I. -O2 -Wall -MD
|
|
AS = $(TOOLPREFIX)gas
|
|
|
|
xv6.img : bootblock kernel
|
|
dd if=/dev/zero of=xv6.img count=10000
|
|
dd if=bootblock of=xv6.img conv=notrunc
|
|
dd if=kernel of=xv6.img seek=1 conv=notrunc
|
|
|
|
bootblock : bootasm.S bootmain.c
|
|
$(CC) -O -nostdinc -I. -c bootmain.c
|
|
$(CC) -nostdinc -I. -c bootasm.S
|
|
$(LD) -N -e start -Ttext 0x7C00 -o bootblock.o bootasm.o bootmain.o
|
|
$(OBJDUMP) -S bootblock.o > bootblock.asm
|
|
$(OBJCOPY) -S -O binary bootblock.o bootblock
|
|
./sign.pl bootblock
|
|
|
|
kernel : $(OBJS) bootother.S user1 usertests userfs
|
|
$(CC) -nostdinc -I. -c bootother.S
|
|
$(LD) -N -e start -Ttext 0x7000 -o bootother.out bootother.o
|
|
$(OBJCOPY) -S -O binary bootother.out bootother
|
|
$(OBJDUMP) -S bootother.o > bootother.asm
|
|
$(LD) -Ttext 0x100000 -e main -o kernel $(OBJS) -b binary bootother user1 usertests userfs
|
|
$(OBJDUMP) -S kernel > kernel.asm
|
|
|
|
vectors.S : vectors.pl
|
|
perl vectors.pl > vectors.S
|
|
|
|
ULIB = ulib.o usys.o
|
|
|
|
user1 : user1.c $(ULIB)
|
|
$(CC) -nostdinc -I. -c user1.c
|
|
$(LD) -N -e main -Ttext 0 -o user1 user1.o $(ULIB)
|
|
$(OBJDUMP) -S user1 > user1.asm
|
|
|
|
usertests : usertests.c $(ULIB)
|
|
$(CC) -nostdinc -I. -c usertests.c
|
|
$(LD) -N -e main -Ttext 0 -o usertests usertests.o $(ULIB)
|
|
$(OBJDUMP) -S usertests > usertests.asm
|
|
|
|
userfs : userfs.c $(ULIB)
|
|
$(CC) -nostdinc -I. -c userfs.c
|
|
$(LD) -N -e main -Ttext 0 -o userfs userfs.o $(ULIB)
|
|
$(OBJDUMP) -S userfs > userfs.asm
|
|
|
|
ulib.o : ulib.c
|
|
$(CC) -nostdinc -I. -c ulib.c
|
|
|
|
-include *.d
|
|
|
|
clean :
|
|
rm -f *.o bootblock kernel kernel.asm xv6.img *.d user1
|