SHELL = /bin/sh
-CC = gcc
+# Utilities.
+# On a system where i386-elf is native (e.g. on an x86 GNU/Linux
+# machine) you want to set BINUTIL_PREFIX to expand to null, as shown
+# in the line that's commented out.
+BINUTIL_PREFIX = i386-elf-
+#BINUTIL_PREFIX =
+CC = $(BINUTIL_PREFIX)gcc
+LD = $(BINUTIL_PREFIX)ld
+OBJCOPY = $(BINUTIL_PREFIX)objcopy
VPATH = ../..
threads_SRC += threads/palloc.c # Page allocator.
threads_SRC += threads/malloc.c # Subpage allocator.
threads_SRC += threads/start.S # Startup code.
+threads_SRC += threads/test.c # Test code.
# Device driver code.
devices_SRC = devices/timer.c # Timer device.
devices_SRC += devices/vga.c # Video device.
devices_SRC += devices/serial.c # Serial port device.
devices_SRC += devices/disk.c # IDE disk device.
+devices_SRC += devices/intq.c # Interrupt queue.
# Library code shared between kernel and user programs.
lib_SRC = lib/debug.c # Debug helpers.
lib_kernel_SRC += lib/kernel/list.c # Doubly-linked lists.
lib_kernel_SRC += lib/kernel/bitmap.c # Bitmaps.
lib_kernel_SRC += lib/kernel/hash.c # Hash tables.
-lib_kernel_SRC += lib/kernel/printf.c # Kernel printf().
+lib_kernel_SRC += lib/kernel/console.c # printf(), putchar().
# Filesystem code.
filesys_SRC = filesys/filesys.c # Filesystem core.
filesys_SRC += filesys/file.c # Files.
filesys_SRC += filesys/directory.c # Directories.
-filesys_SRC += filesys/filehdr.c # File headers (inodes).
+filesys_SRC += filesys/inode.c # File headers.
filesys_SRC += filesys/fsutil.c # Utilities.
# User process code.
threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
kernel.o: threads/kernel.lds.s $(OBJECTS)
- ld -T $< -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name`
+ $(LD) -T $< -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name`
kernel.bin: kernel.o
- objcopy -O binary -R .note -R .comment -S $< $@.tmp
+ $(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp
../../pad 4096 < $@.tmp > $@
rm $@.tmp
$(CC) -c $< -o $@ $(ASFLAGS) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
loader.bin: threads/loader.o
- ld -N -e start -Ttext 0x7c00 --oformat binary -o $@ $<
+ $(LD) -N -e start -Ttext 0x7c00 --oformat binary -o $@ $<
os.dsk: loader.bin kernel.bin
cat $^ > $@