SHELL = /bin/sh
+# Binary utilities.
+# If the host appears to be x86, use the normal tools.
+# Otherwise assume cross-tools are installed as i386-elf-*.
+X86 = i.86\|pentium.*\|[pk][56]\|nexgen\|viac3\|6x86\|athlon.*
+ifneq (0, $(shell expr `uname -m` : '$(X86)'))
CC = gcc
-
-SRC_ROOT = ../..
-VPATH = $(SRC_ROOT)
-
+LD = ld
+OBJCOPY = objcopy
+else
+CC = i386-elf-gcc
+LD = i386-elf-ld
+OBJCOPY = i386-elf-objcopy
+endif
+
+# Other utilities.
+DD = dd
+RM = rm
+CAT = cat
+
+VPATH = ../..
+
+# Compiler and assembler options.
+DEFINES += -DKERNEL
WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-INCLUDES = -I$(SRC_ROOT)
+INCLUDES = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel
CFLAGS = -g -O3 -MMD -msoft-float $(INCLUDES) $(WARNINGS) $(DEFINES)
-ASFLAGS = -Wa,--gstabs $(INCLUDES) $(DEFINES)
+ASFLAGS = -Wa,--gstabs -MMD $(INCLUDES) $(DEFINES)
# Core kernel.
threads_SRC = threads/init.c # Main program.
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.
+# Library code shared between kernel and user programs.
lib_SRC = lib/debug.c # Debug helpers.
-lib_SRC += lib/lib.c # Standard C library.
lib_SRC += lib/random.c # Pseudo-random numbers.
-lib_SRC += lib/list.c # Doubly-linked lists.
-lib_SRC += lib/bitmap.c # Bitmaps.
-lib_SRC += lib/hash.c # Hash tables.
+lib_SRC += lib/stdio.c # I/O library.
+lib_SRC += lib/stdlib.c # Utility functions.
+lib_SRC += lib/string.c # String functions.
+
+# Kernel-specific library code.
+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/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.
userprog_SRC += userprog/gdt.c # GDT initialization.
userprog_SRC += userprog/tss.c # TSS management.
-SOURCES = $(foreach dir,$(SUBDIRS),$($(dir)_SRC))
+SOURCES = $(foreach dir,$(SUBDIRS),$($(subst /,_,$(dir))_SRC))
OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
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
- $(SRC_ROOT)/pad 4096 < $@.tmp > $@
- rm $@.tmp
+ $(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp
+ $(DD) if=$@.tmp of=$@ bs=4096 conv=sync
+ $(RM) $@.tmp
-threads/loader.o: threads/loader.S threads/loader.h kernel.bin
- gcc -c $< -o $@ -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
+threads/loader.o: threads/loader.S kernel.bin
+ $(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 $^ > $@
+ $(CAT) $^ > $@
clean:
- rm -f $(OBJECTS) $(DEPENDS)
- rm -f threads/intr-stubs.S threads/loader.o
- rm -f kernel.o kernel.lds.s
- rm -f kernel.bin loader.bin
+ $(RM) -f $(OBJECTS) $(DEPENDS)
+ $(RM) -f threads/intr-stubs.S threads/loader.o
+ $(RM) -f kernel.o kernel.lds.s
+ $(RM) -f kernel.bin loader.bin
-include $(DEPENDS)