X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.build;h=d4c6d659d0afc5af2da03dbe67751d10beff0324;hb=251b51f76f0594460e1cfbf2c05576fb445b861b;hp=43273a7f54fa743e6e9cfca2d1b6e1141eb31c2c;hpb=287d94b7afcfb6dd65fc6fde02e9a4dc6e099a16;p=pintos-anon

diff --git a/src/Makefile.build b/src/Makefile.build
index 43273a7..d4c6d65 100644
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -1,26 +1,14 @@
 # -*- makefile -*-
 
-include ../Makefile.vars
-
-SHELL = /bin/sh
-
-# Utilities.  
-# On a system where i386-elf is native (e.g. on an x86 GNU/Linux
-# machine) you want to set BINUTIL_PREFIX to expand to null, as shown
-# in the line that's commented out.
-BINUTIL_PREFIX = i386-elf-
-#BINUTIL_PREFIX =
-CC = $(BINUTIL_PREFIX)gcc
-LD = $(BINUTIL_PREFIX)ld
-OBJCOPY = $(BINUTIL_PREFIX)objcopy
+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	\
+	   -include constants.h
 
 # Core kernel.
 threads_SRC  = threads/init.c		# Main program.
@@ -29,7 +17,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.
@@ -56,6 +43,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.
@@ -63,23 +61,13 @@ 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) 
@@ -87,22 +75,25 @@ kernel.o: threads/kernel.lds.s $(OBJECTS)
 
 kernel.bin: kernel.o
 	$(OBJCOPY) -O binary -R .note -R .comment -S $< $@.tmp
-	../../pad 4096 < $@.tmp > $@
-	rm $@.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 $@ $<
 
 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)