X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pintos-anon;a=blobdiff_plain;f=src%2FMakefile.build;h=e997d2787543cb4860edff352660dea9ae350bcf;hp=60f8dcf3ceffdcf1fbe47ed34e1ad76d0cbada66;hb=a03618133f7df0954802a470a4bee7674f7aed45;hpb=549160a3aebb7003046380c5a052220bd0edc0ef diff --git a/src/Makefile.build b/src/Makefile.build index 60f8dcf..e997d27 100644 --- a/src/Makefile.build +++ b/src/Makefile.build @@ -1,121 +1,109 @@ # -*- makefile -*- -include ../Makefile.vars - -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 -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 = ../.. +SRCDIR = ../.. + +all: kernel.bin loader.bin + +include ../../Make.config +include ../Make.vars +include ../../tests/Make.tests # Compiler and assembler options. -DEFINES += -DKERNEL -WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -INCLUDES = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel -CFLAGS = -g -O3 -MMD -msoft-float $(INCLUDES) $(WARNINGS) $(DEFINES) -ASFLAGS = -Wa,--gstabs -MMD $(INCLUDES) $(DEFINES) +kernel.bin: CPPFLAGS += -I$(SRCDIR)/lib/kernel # Core kernel. -threads_SRC = threads/init.c # Main program. +threads_SRC = threads/start.S # Startup code. +threads_SRC += threads/init.c # Main program. threads_SRC += threads/thread.c # Thread management core. threads_SRC += threads/switch.S # Thread switch routine. 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. -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/block.c # Block device abstraction layer. +devices_SRC += devices/partition.c # Partition block device. +devices_SRC += devices/ide.c # IDE disk block 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(). +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/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/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),$($(subst /,_,$(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 - $(DD) if=$@.tmp of=$@ bs=4096 conv=sync - $(RM) $@.tmp + $(OBJCOPY) -R .note -R .comment -S $< $@ -threads/loader.o: threads/loader.S kernel.bin - $(CC) -c $< -o $@ $(ASFLAGS) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'` +threads/loader.o: threads/loader.S + $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES) loader.bin: threads/loader.o - $(LD) -N -e start -Ttext 0x7c00 --oformat binary -o $@ $< + $(LD) -N -e 0 -Ttext 0x7c00 --oformat binary -o $@ $< -os.dsk: loader.bin kernel.bin - $(CAT) $^ > $@ +os.dsk: kernel.bin + 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.bin.tmp + rm -f kernel.o kernel.lds.s + rm -f kernel.bin loader.bin + rm -f bochsout.txt bochsrc.txt + rm -f results grade -Makefile: ../../Makefile.build +Makefile: $(SRCDIR)/Makefile.build cp $< $@ -include $(DEPENDS)