# -*- makefile -*-
-include ../Makefile.vars
+SRCDIR = ../..
-SHELL = /bin/sh
-
-CC = gcc
+all: os.dsk
-SRC_ROOT = ../..
-VPATH = $(SRC_ROOT)
+include ../../Make.config
+include ../Make.vars
+include ../../tests/Make.tests
-WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-INCLUDES = -I$(SRC_ROOT)
-CFLAGS = -g -O3 -MMD -msoft-float $(INCLUDES) $(WARNINGS) $(DEFINES)
-ASFLAGS = -Wa,--gstabs $(INCLUDES) $(DEFINES)
+# Compiler and assembler options.
+os.dsk: CPPFLAGS += -I$(SRCDIR)/lib/kernel
# Core kernel.
threads_SRC = threads/init.c # Main program.
threads_SRC += threads/interrupt.c # Interrupt core.
threads_SRC += threads/intr-stubs.S # Interrupt stubs.
threads_SRC += threads/synch.c # Synchronization.
-threads_SRC += threads/paging.c # Page tables.
threads_SRC += threads/palloc.c # Page allocator.
threads_SRC += threads/malloc.c # Subpage allocator.
threads_SRC += threads/start.S # Startup code.
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/input.c # Serial and keyboard input.
+devices_SRC += devices/intq.c # Interrupt queue.
+
+# Library code shared between kernel and user programs.
+lib_SRC = lib/debug.c # Debug helpers.
+lib_SRC += lib/random.c # Pseudo-random numbers.
+lib_SRC += lib/stdio.c # I/O library.
+lib_SRC += lib/stdlib.c # Utility functions.
+lib_SRC += lib/string.c # String functions.
+lib_SRC += lib/arithmetic.c
+
+# Kernel-specific library code.
+lib/kernel_SRC = lib/kernel/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/console.c # printf(), putchar().
-# Library code.
-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.
+# User process code.
+userprog_SRC = userprog/process.c # Process loading.
+userprog_SRC += userprog/pagedir.c # Page directories.
+userprog_SRC += userprog/exception.c # User exception handler.
+userprog_SRC += userprog/syscall.c # System call handler.
+userprog_SRC += userprog/gdt.c # GDT initialization.
+userprog_SRC += userprog/tss.c # TSS management.
+
+# No virtual memory code yet.
+#vm_SRC = vm/file.c # Some file.
# Filesystem code.
filesys_SRC = filesys/filesys.c # Filesystem core.
+filesys_SRC += filesys/free-map.c # Free sector bitmap.
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/addrspace.c # Address spaces.
-userprog_SRC += userprog/exception.c # User exception handler.
-userprog_SRC += userprog/syscall.c # System call handler.
-userprog_SRC += userprog/gdt.c # GDT initialization.
-userprog_SRC += userprog/tss.c # TSS management.
-
-SOURCES = $(foreach dir,$(SUBDIRS),$($(dir)_SRC))
+SOURCES = $(foreach dir,$(KERNEL_SUBDIRS),$($(dir)_SRC))
OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
-all: os.dsk
-
-threads/intr-stubs.S: threads/intr-stubs.pl threads/loader.h
- $< > $@
-
-threads/kernel.lds.s: CPPFLAGS += -P -C
+threads/kernel.lds.s: CPPFLAGS += -P
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)
kernel.bin: kernel.o
- objcopy -O binary -R .note -R .comment -S $< $@.tmp
- $(SRC_ROOT)/pad 4096 < $@.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) $(CPPFLAGS) $(DEFINES) -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 $^ > $@
-clean:
+clean::
rm -f $(OBJECTS) $(DEPENDS)
- rm -f threads/intr-stubs.S threads/loader.o
+ rm -f threads/loader.o threads/kernel.lds.s threads/loader.d
rm -f kernel.o kernel.lds.s
- rm -f kernel.bin loader.bin
+ rm -f kernel.bin loader.bin os.dsk
+ rm -f bochsout.txt bochsrc.txt
+ rm -f results grade
+
+Makefile: $(SRCDIR)/Makefile.build
+ cp $< $@
-include $(DEPENDS)