2006-07-16 17:35:18 +02:00
|
|
|
OBJS = \
|
|
|
|
|
console.o\
|
2006-09-06 20:40:28 +02:00
|
|
|
file.o\
|
2006-07-16 17:35:18 +02:00
|
|
|
ide.o\
|
|
|
|
|
kalloc.o\
|
|
|
|
|
lapic.o\
|
2006-08-04 20:12:31 +02:00
|
|
|
ioapic.o\
|
2006-07-16 17:35:18 +02:00
|
|
|
main.o\
|
|
|
|
|
mp.o\
|
|
|
|
|
picirq.o\
|
|
|
|
|
pipe.o\
|
|
|
|
|
proc.o\
|
|
|
|
|
setjmp.o\
|
|
|
|
|
spinlock.o\
|
|
|
|
|
string.o\
|
|
|
|
|
syscall.o\
|
2006-09-06 20:18:43 +02:00
|
|
|
sysfile.o\
|
|
|
|
|
sysproc.o\
|
2006-07-16 17:35:18 +02:00
|
|
|
trapasm.o\
|
|
|
|
|
trap.o\
|
|
|
|
|
vectors.o\
|
2006-07-21 15:18:04 +02:00
|
|
|
bio.o\
|
|
|
|
|
fs.o\
|
2007-08-21 21:22:08 +02:00
|
|
|
exec.o\
|
2006-09-07 03:37:58 +02:00
|
|
|
8253pit.o\
|
2006-06-12 17:22:12 +02:00
|
|
|
|
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 03:07:40 +02:00
|
|
|
# Cross-compiling (e.g., on Mac OS X)
|
2006-09-07 23:03:13 +02:00
|
|
|
#TOOLPREFIX = i386-jos-elf-
|
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 03:07:40 +02:00
|
|
|
|
|
|
|
|
# Using native tools (e.g., on X86 Linux)
|
2006-09-07 22:06:15 +02:00
|
|
|
TOOLPREFIX =
|
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 03:07:40 +02:00
|
|
|
|
|
|
|
|
CC = $(TOOLPREFIX)gcc
|
|
|
|
|
LD = $(TOOLPREFIX)ld
|
|
|
|
|
OBJCOPY = $(TOOLPREFIX)objcopy
|
|
|
|
|
OBJDUMP = $(TOOLPREFIX)objdump
|
2007-08-08 10:38:55 +02:00
|
|
|
# On newer gcc you may need to add -fno-stack-protector to $(CFLAGS)
|
2007-08-21 21:22:08 +02:00
|
|
|
CFLAGS = -fno-builtin -O2 -Wall -MD -ggdb -fno-stack-protector
|
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 03:07:40 +02:00
|
|
|
AS = $(TOOLPREFIX)gas
|
2006-06-12 17:22:12 +02:00
|
|
|
|
2006-07-21 15:18:04 +02:00
|
|
|
xv6.img : bootblock kernel fs.img
|
2006-06-12 17:22:12 +02:00
|
|
|
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
|
|
|
|
|
|
2007-08-21 21:22:08 +02:00
|
|
|
kernel : $(OBJS) bootother.S initcode.S
|
2006-06-22 03:28:57 +02:00
|
|
|
$(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
|
2007-08-21 21:22:08 +02:00
|
|
|
$(CC) -nostdinc -I. -c initcode.S
|
|
|
|
|
$(LD) -N -e start -Ttext 0 -o initcode.out initcode.o
|
|
|
|
|
$(OBJCOPY) -S -O binary initcode.out initcode
|
|
|
|
|
$(OBJDUMP) -S initcode.o > initcode.asm
|
|
|
|
|
$(LD) -Ttext 0x100000 -e main0 -o kernel $(OBJS) -b binary initcode bootother
|
2006-06-12 17:22:12 +02:00
|
|
|
$(OBJDUMP) -S kernel > kernel.asm
|
2006-09-17 21:21:12 +02:00
|
|
|
$(OBJDUMP) -t kernel | awk '/SYMBOL TABLE/ { go=1; next } go {print $$1, $$NF}' >kernel.sym
|
2006-06-12 17:22:12 +02:00
|
|
|
|
2006-09-07 16:10:52 +02:00
|
|
|
tags: $(OBJS) bootother.S _init
|
2006-08-28 20:31:33 +02:00
|
|
|
etags *.S *.c
|
|
|
|
|
|
2006-06-13 17:50:06 +02:00
|
|
|
vectors.S : vectors.pl
|
|
|
|
|
perl vectors.pl > vectors.S
|
|
|
|
|
|
2006-08-24 04:44:41 +02:00
|
|
|
ULIB = ulib.o usys.o printf.o umalloc.o
|
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 03:07:40 +02:00
|
|
|
|
2007-08-24 22:20:23 +02:00
|
|
|
_usertests : usertests.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _usertests usertests.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _usertests > usertests.asm
|
2006-06-27 16:35:53 +02:00
|
|
|
|
2006-09-07 15:07:39 +02:00
|
|
|
_echo : echo.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _echo echo.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _echo > echo.asm
|
2006-07-29 00:33:07 +02:00
|
|
|
|
2006-09-07 15:07:39 +02:00
|
|
|
_cat : cat.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _cat cat.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _cat > cat.asm
|
2006-08-08 21:58:06 +02:00
|
|
|
|
2006-09-07 15:07:39 +02:00
|
|
|
_init : init.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _init init.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _init > init.asm
|
2007-08-08 09:43:02 +02:00
|
|
|
$(OBJDUMP) -t _init | awk '/SYMBOL TABLE/ { go=1; next } go {print $$1, $$NF}' >init.sym
|
2006-08-11 15:55:18 +02:00
|
|
|
|
2007-08-08 10:50:23 +02:00
|
|
|
_kill : kill.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _kill kill.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _kill > kill.asm
|
2006-08-11 15:55:18 +02:00
|
|
|
|
2006-09-07 15:07:39 +02:00
|
|
|
_ls : ls.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _ls ls.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _ls > ls.asm
|
2006-08-12 06:33:50 +02:00
|
|
|
|
2006-09-07 15:07:39 +02:00
|
|
|
_mkdir : mkdir.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _mkdir mkdir.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _mkdir > mkdir.asm
|
2006-08-14 23:22:13 +02:00
|
|
|
|
2006-09-07 15:07:39 +02:00
|
|
|
_rm : rm.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _rm rm.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _rm > rm.asm
|
2006-08-14 23:22:13 +02:00
|
|
|
|
2007-08-22 07:54:55 +02:00
|
|
|
_ln : ln.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _ln ln.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _ln > ln.asm
|
|
|
|
|
|
2007-08-08 10:50:23 +02:00
|
|
|
_sh : sh.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _sh sh.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _sh > sh.asm
|
|
|
|
|
|
2007-08-08 10:38:55 +02:00
|
|
|
_zombie: zombie.o $(ULIB)
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _zombie zombie.o $(ULIB)
|
|
|
|
|
$(OBJDUMP) -S _zombie > zombie.asm
|
|
|
|
|
|
2007-08-24 22:20:23 +02:00
|
|
|
_forktest: forktest.o $(ULIB)
|
|
|
|
|
# forktest has less library code linked in - needs to be small
|
|
|
|
|
# in order to be able to max out the proc table.
|
|
|
|
|
$(LD) -N -e main -Ttext 0 -o _forktest forktest.o ulib.o usys.o
|
|
|
|
|
$(OBJDUMP) -S _forktest > forktest.asm
|
|
|
|
|
|
2006-07-21 15:18:04 +02:00
|
|
|
mkfs : mkfs.c fs.h
|
|
|
|
|
cc -o mkfs mkfs.c
|
|
|
|
|
|
2007-08-24 22:20:23 +02:00
|
|
|
UPROGS=_usertests _echo _cat _init _kill _ln _ls _mkdir _rm _sh _zombie _forktest
|
2007-08-08 10:38:55 +02:00
|
|
|
fs.img : mkfs README $(UPROGS)
|
|
|
|
|
./mkfs fs.img README $(UPROGS)
|
2006-07-21 15:18:04 +02:00
|
|
|
|
2006-06-15 21:58:01 +02:00
|
|
|
-include *.d
|
|
|
|
|
|
2006-06-12 17:22:12 +02:00
|
|
|
clean :
|
2006-09-03 16:38:10 +02:00
|
|
|
rm -f *.ps *.tex *.dvi *.idx *.aux *.log *.ind *.ilg \
|
2006-08-29 19:50:19 +02:00
|
|
|
*.o *.d *.asm vectors.S parport.out \
|
2007-08-08 10:38:55 +02:00
|
|
|
bootblock kernel xv6.img fs.img mkfs \
|
|
|
|
|
$(UPROGS)
|
2006-09-07 22:06:15 +02:00
|
|
|
|
|
|
|
|
# make a printout
|
|
|
|
|
PRINT = \
|
|
|
|
|
runoff.list \
|
|
|
|
|
README\
|
|
|
|
|
types.h param.h defs.h x86.h asm.h elf.h mmu.h spinlock.h\
|
2006-09-07 23:03:13 +02:00
|
|
|
bootasm.S bootother.S main.c init.c spinlock.c\
|
2006-09-07 22:06:15 +02:00
|
|
|
proc.h proc.c setjmp.S kalloc.c\
|
|
|
|
|
syscall.h trapasm.S traps.h trap.c vectors.pl syscall.c sysproc.c\
|
2006-09-07 23:03:13 +02:00
|
|
|
buf.h dev.h fcntl.h stat.h file.h fs.h fsvar.h file.c fs.c bio.c ide.c sysfile.c\
|
2007-08-21 21:22:08 +02:00
|
|
|
pipe.c exec.c\
|
2006-09-07 22:06:15 +02:00
|
|
|
mp.h ioapic.h mp.c lapic.c ioapic.c picirq.c\
|
|
|
|
|
console.c\
|
|
|
|
|
string.c\
|
|
|
|
|
|
|
|
|
|
xv6.pdf : $(PRINT)
|
|
|
|
|
./runoff
|
|
|
|
|
|
|
|
|
|
print : xv6.pdf
|
|
|
|
|
|
|
|
|
|
# run in emulators
|
|
|
|
|
|
|
|
|
|
bochs : fs.img xv6.img
|
|
|
|
|
if [ ! -e .bochsrc ]; then ln -s dot-bochsrc .bochsrc; fi
|
|
|
|
|
bochs -q
|
|
|
|
|
|
|
|
|
|
qemu : fs.img xv6.img
|
|
|
|
|
qemu -parallel stdio -hdb fs.img xv6.img
|
|
|
|
|
|
2006-09-08 16:41:06 +02:00
|
|
|
# CUT HERE
|
|
|
|
|
# prepare dist for students
|
|
|
|
|
# after running make dist, probably want to
|
|
|
|
|
# rename it to rev0 or rev1 or so on and then
|
|
|
|
|
# check in that version.
|
|
|
|
|
dist :
|
|
|
|
|
rm -rf dist
|
|
|
|
|
mkdir dist
|
|
|
|
|
for i in *.c *.h *.S; \
|
|
|
|
|
do \
|
|
|
|
|
grep -v PAGEBREAK $$i >dist/$$i; \
|
|
|
|
|
done
|
|
|
|
|
sed '/CUT HERE/,$$d' Makefile >dist/Makefile
|
|
|
|
|
cp README dot-bochsrc *.pl toc.* runoff runoff1 runoff.list dist
|
|
|
|
|
|
|
|
|
|
dist-test :
|
|
|
|
|
rm -rf dist-test
|
|
|
|
|
mkdir dist-test
|
|
|
|
|
cp dist/* dist-test
|
|
|
|
|
cd dist-test; ../m print
|
|
|
|
|
cd dist-test; ../m bochs || true
|
|
|
|
|
cd dist-test; ../m qemu
|
|
|
|
|
|
|
|
|
|
# update this rule (change rev0) when it is time to
|
|
|
|
|
# make a new revision.
|
|
|
|
|
tar :
|
|
|
|
|
rm -rf /tmp/xv6
|
|
|
|
|
mkdir -p /tmp/xv6
|
|
|
|
|
cp dist/* /tmp/xv6
|
|
|
|
|
(cd /tmp; tar cf - xv6) | gzip >xv6-rev0.tar.gz
|
|
|
|
|
|
