ab0db651af
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
252 lines
6.9 KiB
Makefile
252 lines
6.9 KiB
Makefile
OBJS = \
|
|
bio.o\
|
|
console.o\
|
|
exec.o\
|
|
file.o\
|
|
fs.o\
|
|
ide.o\
|
|
ioapic.o\
|
|
kalloc.o\
|
|
kbd.o\
|
|
lapic.o\
|
|
log.o\
|
|
main.o\
|
|
mp.o\
|
|
picirq.o\
|
|
pipe.o\
|
|
proc.o\
|
|
sleeplock.o\
|
|
spinlock.o\
|
|
string.o\
|
|
swtch.o\
|
|
syscall.o\
|
|
sysfile.o\
|
|
sysproc.o\
|
|
trapasm.o\
|
|
trap.o\
|
|
uart.o\
|
|
vectors.o\
|
|
vm.o\
|
|
|
|
# Cross-compiling (e.g., on Mac OS X)
|
|
# TOOLPREFIX = i386-jos-elf
|
|
|
|
# Using native tools (e.g., on X86 Linux)
|
|
#TOOLPREFIX =
|
|
|
|
# Try to infer the correct TOOLPREFIX if not set
|
|
ifndef TOOLPREFIX
|
|
TOOLPREFIX := $(shell if i386-jos-elf-objdump -i 2>&1 | grep '^elf32-i386$$' >/dev/null 2>&1; \
|
|
then echo 'i386-jos-elf-'; \
|
|
elif objdump -i 2>&1 | grep 'elf32-i386' >/dev/null 2>&1; \
|
|
then echo ''; \
|
|
else echo "***" 1>&2; \
|
|
echo "*** Error: Couldn't find an i386-*-elf version of GCC/binutils." 1>&2; \
|
|
echo "*** Is the directory with i386-jos-elf-gcc in your PATH?" 1>&2; \
|
|
echo "*** If your i386-*-elf toolchain is installed with a command" 1>&2; \
|
|
echo "*** prefix other than 'i386-jos-elf-', set your TOOLPREFIX" 1>&2; \
|
|
echo "*** environment variable to that prefix and run 'make' again." 1>&2; \
|
|
echo "*** To turn off this error, run 'gmake TOOLPREFIX= ...'." 1>&2; \
|
|
echo "***" 1>&2; exit 1; fi)
|
|
endif
|
|
|
|
# If the makefile can't find QEMU, specify its path here
|
|
QEMU = qemu-system-x86_64
|
|
|
|
# Try to infer the correct QEMU
|
|
ifndef QEMU
|
|
QEMU = $(shell if which qemu > /dev/null; \
|
|
then echo qemu; exit; \
|
|
elif which qemu-system-i386 > /dev/null; \
|
|
then echo qemu-system-i386; exit; \
|
|
elif which qemu-system-x86_64 > /dev/null; \
|
|
then echo qemu-system-x86_64; exit; \
|
|
else \
|
|
qemu=/Applications/Q.app/Contents/MacOS/i386-softmmu.app/Contents/MacOS/i386-softmmu; \
|
|
if test -x $$qemu; then echo $$qemu; exit; fi; fi; \
|
|
echo "***" 1>&2; \
|
|
echo "*** Error: Couldn't find a working QEMU executable." 1>&2; \
|
|
echo "*** Is the directory containing the qemu binary in your PATH" 1>&2; \
|
|
echo "*** or have you tried setting the QEMU variable in Makefile?" 1>&2; \
|
|
echo "***" 1>&2; exit 1)
|
|
endif
|
|
|
|
CC = $(TOOLPREFIX)gcc
|
|
AS = $(TOOLPREFIX)gas
|
|
LD = $(TOOLPREFIX)ld
|
|
OBJCOPY = $(TOOLPREFIX)objcopy
|
|
OBJDUMP = $(TOOLPREFIX)objdump
|
|
|
|
XFLAGS = -m64 -mcmodel=large -ggdb
|
|
# CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -O2 -Wall -MD -ggdb -Werror -fno-omit-frame-pointer
|
|
CFLAGS = -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -MD -ggdb -Werror -fno-omit-frame-pointer
|
|
CFLAGS += -ffreestanding -fno-common -nostdlib $(XFLAGS)
|
|
CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
|
|
ASFLAGS = -gdwarf-2 -Wa,-divide $(XFLAGS)
|
|
# FreeBSD ld wants ``elf_i386_fbsd''
|
|
LDFLAGS += -m $(shell $(LD) -V | grep elf_x86_64 2>/dev/null | head -n 1)
|
|
LDFLAGS += -z max-page-size=4096
|
|
|
|
# Disable PIE when possible (for Ubuntu 16.10 toolchain)
|
|
ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
|
|
CFLAGS += -fno-pie -no-pie
|
|
endif
|
|
ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]nopie'),)
|
|
CFLAGS += -fno-pie -nopie
|
|
endif
|
|
|
|
kernel: $(OBJS) entry.o entryother initcode kernel.ld
|
|
$(LD) $(LDFLAGS) -T kernel.ld -o kernel entry.o $(OBJS) -b binary initcode entryother
|
|
$(OBJDUMP) -S kernel > kernel.asm
|
|
$(OBJDUMP) -t kernel | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > kernel.sym
|
|
|
|
entryother: entryother.S
|
|
$(CC) $(CFLAGS) -fno-pic -nostdinc -I. -c entryother.S
|
|
$(LD) $(LDFLAGS) -N -e start -Ttext 0x7000 -o bootblockother.o entryother.o
|
|
$(OBJCOPY) -S -O binary -j .text bootblockother.o entryother
|
|
$(OBJDUMP) -S bootblockother.o > entryother.asm
|
|
|
|
initcode: initcode.S
|
|
$(CC) $(CFLAGS) -nostdinc -I. -c initcode.S
|
|
$(LD) $(LDFLAGS) -N -e start -Ttext 0 -o initcode.out initcode.o
|
|
$(OBJCOPY) -S -O binary initcode.out initcode
|
|
$(OBJDUMP) -S initcode.o > initcode.asm
|
|
|
|
tags: $(OBJS) entryother.S _init
|
|
etags *.S *.c
|
|
|
|
vectors.S: vectors.pl
|
|
./vectors.pl > vectors.S
|
|
|
|
ULIB = ulib.o usys.o printf.o umalloc.o
|
|
|
|
_%: %.o $(ULIB)
|
|
$(LD) $(LDFLAGS) -N -e main -Ttext 0 -o $@ $^
|
|
$(OBJDUMP) -S $@ > $*.asm
|
|
$(OBJDUMP) -t $@ | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > $*.sym
|
|
|
|
_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) $(LDFLAGS) -N -e main -Ttext 0 -o _forktest forktest.o ulib.o usys.o
|
|
$(OBJDUMP) -S _forktest > forktest.asm
|
|
|
|
mkfs: mkfs.c fs.h
|
|
gcc -Werror -Wall -o mkfs mkfs.c
|
|
|
|
# Prevent deletion of intermediate files, e.g. cat.o, after first build, so
|
|
# that disk image changes after first build are persistent until clean. More
|
|
# details:
|
|
# http://www.gnu.org/software/make/manual/html_node/Chained-Rules.html
|
|
.PRECIOUS: %.o
|
|
|
|
UPROGS=\
|
|
_cat\
|
|
_echo\
|
|
_forktest\
|
|
_grep\
|
|
_init\
|
|
_kill\
|
|
_ln\
|
|
_ls\
|
|
_mkdir\
|
|
_rm\
|
|
_sh\
|
|
_stressfs\
|
|
_usertests\
|
|
_wc\
|
|
_zombie\
|
|
|
|
fs.img: mkfs README $(UPROGS)
|
|
./mkfs fs.img README $(UPROGS)
|
|
|
|
-include *.d
|
|
|
|
clean:
|
|
rm -f *.tex *.dvi *.idx *.aux *.log *.ind *.ilg \
|
|
*.o *.d *.asm *.sym vectors.S bootblock entryother \
|
|
initcode initcode.out kernel fs.img kernelmemfs \
|
|
mkfs .gdbinit \
|
|
$(UPROGS)
|
|
|
|
# make a printout
|
|
FILES = $(shell grep -v '^\#' runoff.list)
|
|
PRINT = runoff.list runoff.spec README toc.hdr toc.ftr $(FILES)
|
|
|
|
xv6.pdf: $(PRINT)
|
|
./runoff
|
|
ls -l xv6.pdf
|
|
|
|
print: xv6.pdf
|
|
|
|
# try to generate a unique GDB port
|
|
GDBPORT = $(shell expr `id -u` % 5000 + 25000)
|
|
# QEMU's gdb stub command line changed in 0.11
|
|
QEMUGDB = $(shell if $(QEMU) -help | grep -q '^-gdb'; \
|
|
then echo "-gdb tcp::$(GDBPORT)"; \
|
|
else echo "-s -p $(GDBPORT)"; fi)
|
|
ifndef CPUS
|
|
CPUS := 2
|
|
endif
|
|
QEMUOPTS = -kernel kernel -drive file=fs.img,index=1,media=disk,format=raw -smp $(CPUS) -m 512 $(QEMUEXTRA)
|
|
qemu: fs.img
|
|
$(QEMU) -serial mon:stdio $(QEMUOPTS)
|
|
|
|
qemu-nox: fs.img kernel
|
|
$(QEMU) -nographic $(QEMUOPTS)
|
|
|
|
.gdbinit: .gdbinit.tmpl-x64
|
|
sed "s/localhost:1234/localhost:$(GDBPORT)/" < $^ > $@
|
|
|
|
qemu-gdb: fs.img kernel .gdbinit
|
|
@echo "*** Now run 'gdb'." 1>&2
|
|
$(QEMU) $(QEMUOPTS) -S $(QEMUGDB)
|
|
|
|
qemu-nox-gdb: fs.img kernel .gdbinit
|
|
@echo "*** Now run 'gdb'." 1>&2
|
|
$(QEMU) -nographic $(QEMUOPTS) -S $(QEMUGDB)
|
|
|
|
# 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.
|
|
|
|
EXTRA=\
|
|
mkfs.c ulib.c user.h cat.c echo.c forktest.c grep.c kill.c\
|
|
ln.c ls.c mkdir.c rm.c stressfs.c usertests.c wc.c zombie.c\
|
|
printf.c umalloc.c\
|
|
README dot-bochsrc *.pl toc.* runoff runoff1 runoff.list\
|
|
.gdbinit.tmpl gdbutil\
|
|
|
|
dist:
|
|
rm -rf dist
|
|
mkdir dist
|
|
for i in $(FILES); \
|
|
do \
|
|
grep -v PAGEBREAK $$i >dist/$$i; \
|
|
done
|
|
sed '/CUT HERE/,$$d' Makefile >dist/Makefile
|
|
echo >dist/runoff.spec
|
|
cp $(EXTRA) dist
|
|
|
|
dist-test:
|
|
rm -rf dist
|
|
make dist
|
|
rm -rf dist-test
|
|
mkdir dist-test
|
|
cp dist/* dist-test
|
|
cd dist-test; $(MAKE) print
|
|
cd dist-test; $(MAKE) bochs || true
|
|
cd dist-test; $(MAKE) qemu
|
|
|
|
# update this rule (change rev#) when it is time to
|
|
# make a new revision.
|
|
tar:
|
|
rm -rf /tmp/xv6
|
|
mkdir -p /tmp/xv6
|
|
cp dist/* dist/.gdbinit.tmpl /tmp/xv6
|
|
(cd /tmp; tar cf - xv6) | gzip >xv6-rev10.tar.gz # the next one will be 10 (9/17)
|
|
|
|
.PHONY: dist-test dist
|