Move pagedir stuff into userprog.

[pintos-anon] / src / Makefile.build

diff --git a/src/Makefile.build b/src/Makefile.build
index 3886b5d0b7f279ed21afd6ad4e9c39e83aa2cfed..8a7348590772227fc466643b433e39796b2106b7 100644 (file)
--- a/src/Makefile.build
+++ b/src/Makefile.build
@@ -4,15 +4,34 @@ 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 = ../..
 
+# 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
+CFLAGS = -g -O3 -MMD -msoft-float 
+ASFLAGS = -Wa,--gstabs -MMD
 
 # Core kernel.
 threads_SRC  = threads/init.c          # Main program.
@@ -21,10 +40,10 @@ 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.
@@ -32,6 +51,7 @@ 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/intq.c          # Interrupt queue.
 
 # Library code shared between kernel and user programs.
 lib_SRC  = lib/debug.c         # Debug helpers.
@@ -44,17 +64,18 @@ lib_SRC += lib/string.c             # String functions.
 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/printf.c  # Kernel printf().
+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/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/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.
@@ -73,26 +94,35 @@ threads/kernel.lds.s: CPPFLAGS += -P -C
 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/intr-stubs.S threads/loader.o
+       $(RM) -f kernel.o kernel.lds.s
+       $(RM) -f kernel.bin loader.bin
+
+Makefile: ../../Makefile.build
+       cp $< $@
+
+%.o: %.c
+       $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)
+
+%.o: %.S
+       $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES)
 
 -include $(DEPENDS)