X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2FMakefile.build;h=b73320579ecc342f0b28b0f8bc78bb3ea513de3b;hp=1c92b77d2783b36e757626687b9fe06d5ca4c4b1;hb=f1f2dc8de9e336d83383692d4478bb14a3dafc11;hpb=d46fd132092304422193b717d9a60641604cc1b5 diff --git a/src/Makefile.build b/src/Makefile.build index 1c92b77..b733205 100644 --- a/src/Makefile.build +++ b/src/Makefile.build @@ -1,14 +1,15 @@ # -*- makefile -*- -include ../Make.vars -include ../../Make.config +SRCDIR = ../.. + +all: os.dsk -VPATH = ../.. +include ../../Make.config +include ../Make.vars +include ../../tests/Make.tests # Compiler and assembler options. -DEFINES += -DKERNEL -CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel \ - -include constants.h +os.dsk: CPPFLAGS += -I$(SRCDIR)/lib/kernel # Core kernel. threads_SRC = threads/init.c # Main program. @@ -20,63 +21,69 @@ threads_SRC += threads/synch.c # Synchronization. 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/pit.c # Programmable interrupt timer chip. +devices_SRC += devices/timer.c # Periodic timer device. devices_SRC += devices/kbd.c # Keyboard 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/input.c # Serial and keyboard input. devices_SRC += devices/intq.c # Interrupt queue. +devices_SRC += devices/rtc.c # Real-time clock. +devices_SRC += devices/shutdown.c # Reboot and power off. +devices_SRC += devices/speaker.c # PC speaker. # 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/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 # 64-bit arithmetic for GCC. +lib_SRC += lib/ustar.c # Unix standard tar format utilities. # 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/inode.c # File headers. -filesys_SRC += filesys/fsutil.c # Utilities. +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(). # User process code. -userprog_SRC = userprog/addrspace.c # Address spaces. +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. -SOURCES = $(foreach dir,$(SUBDIRS),$($(subst /,_,$(dir))_SRC)) -OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES))) -DEPENDS = $(patsubst %.o,%.d,$(OBJECTS)) +# No virtual memory code yet. +#vm_SRC = vm/file.c # Some file. -all: os.dsk +# 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/inode.c # File headers. +filesys_SRC += filesys/fsutil.c # Utilities. -threads/intr-stubs.S: threads/intr-stubs.pl threads/loader.h - $< > $@ +SOURCES = $(foreach dir,$(KERNEL_SUBDIRS),$($(dir)_SRC)) +OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES))) +DEPENDS = $(patsubst %.o,%.d,$(OBJECTS)) -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 - $(DD) if=$@.tmp of=$@ bs=4096 conv=sync - $(RM) $@.tmp + dd if=$@.tmp of=$@ bs=4096 conv=sync + rm $@.tmp threads/loader.o: threads/loader.S kernel.bin $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'` @@ -85,15 +92,17 @@ loader.bin: threads/loader.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 +clean:: + rm -f $(OBJECTS) $(DEPENDS) + 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 os.dsk + rm -f bochsout.txt bochsrc.txt + rm -f results grade -Makefile: ../../Makefile.build +Makefile: $(SRCDIR)/Makefile.build cp $< $@ -include $(DEPENDS)