X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.build;h=e124011ac646210885fc7c311080ede3e6bfd3d3;hb=59385cfe7f0fc5a66dfc1da7c2e5b817edbcae65;hp=017267f688b14a356d5c8556ecae12956efd29c6;hpb=993c1d9f4452e2edd851f3175dfdf317f18bdb9f;p=pintos-anon

diff --git a/src/Makefile.build b/src/Makefile.build
index 017267f..e124011 100644
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -1,18 +1,13 @@
 # -*- makefile -*-
 
-include ../Makefile.vars
-
-SHELL = /bin/sh
-
-CC = gcc
+include ../Make.vars
+include ../../Make.config
 
 VPATH = ../..
 
+# 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)
+CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel
 
 # Core kernel.
 threads_SRC  = threads/init.c		# Main program.
@@ -21,7 +16,6 @@ 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.
@@ -36,11 +30,11 @@ 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_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.
 
 # Kernel-specific library code.
 lib_kernel_SRC += lib/kernel/list.c	# Doubly-linked lists.
@@ -48,6 +42,17 @@ 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/filename.c			# Some file.
+
 # Filesystem code.
 filesys_SRC  = filesys/filesys.c	# Filesystem core.
 filesys_SRC += filesys/file.c		# Files.
@@ -55,46 +60,39 @@ 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))
 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) `$(CC) -print-libgcc-file-name`
 
 kernel.bin: kernel.o
-	objcopy -O binary -R .note -R .comment -S $< $@.tmp
-	../../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 kernel.bin
-	$(CC) -c $< -o $@ $(ASFLAGS) -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
+	$(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 $^ > $@
+	$(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/loader.o
+	$(RM) -f kernel.o kernel.lds.s
+	$(RM) -f kernel.bin loader.bin
+
+Makefile: ../../Makefile.build
+	cp $< $@
 
 -include $(DEPENDS)