Move user exception support into userprog.

[pintos-anon] / src / Makefile.inc

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 20e96d7d9887056747b6388c0246d91ea8fea37b..982b5e800f5e5b63f9ddb5f0a7772beb80ab626c 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -1,29 +1,37 @@
+# -*- makefile -*-
+
 SHELL = /bin/sh
-VPATH = $(TOP_SRCDIR)/threads:$(TOP_SRCDIR)/devices:$(TOP_SRCDIR)/lib
 
--include *.d
+CC = gcc
+
+VPATH := $(TOP_SRCDIR)/threads
+VPATH := $(VPATH):$(TOP_SRCDIR)/devices
+VPATH := $(VPATH):$(TOP_SRCDIR)/lib
+VPATH := $(VPATH):$(TOP_SRCDIR)/filesys
+VPATH := $(VPATH):$(TOP_SRCDIR)/userprog
 
-DEFINES =
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS = -g -O3 -MMD $(WARNINGS) $(INCLUDES) $(DEFINES)
-ASFLAGS = $(INCLUDES) $(DEFINES)
+CFLAGS = -g -O3 -MMD -msoft-float $(WARNINGS) $(INCLUDES) $(DEFINES)
+ASFLAGS = -Wa,--gstabs+ $(INCLUDES) $(DEFINES)
 
 # Core kernel.
-THREADS_SRC  = start.S # Must be first.
-THREADS_SRC += init.c  # Start-up code.
-THREADS_SRC += thread.c        # Thread management core.
-THREADS_SRC += switch.S        # Thread switch routine.
+THREADS_SRC  = start.S         # Must be linked first.
+THREADS_SRC += init.c          # Main program.
+THREADS_SRC += thread.c                # Thread management core.
+THREADS_SRC += switch.S                # Thread switch routine.
 THREADS_SRC += interrupt.c     # Interrupt core.
 THREADS_SRC += intr-stubs.S    # Interrupt stubs.
-THREADS_SRC += synch.c # Synchronization.
-THREADS_SRC += palloc.c        # Page allocator.
-THREADS_SRC += malloc.c        # Subpage allocator.
+THREADS_SRC += synch.c         # Synchronization.
+THREADS_SRC += paging.c                # Page tables.
+THREADS_SRC += palloc.c                # Page allocator.
+THREADS_SRC += malloc.c                # Subpage allocator.
 
 # Device driver code.
-DEVICES_SRC  = timer.c # Timer device.
-DEVICES_SRC += kbd.c   # Keyboard device.
-DEVICES_SRC += vga.c   # Video device.
-DEVICES_SRC += serial.c        # Serial port device.
+DEVICES_SRC  = timer.c         # Timer device.
+DEVICES_SRC += kbd.c           # Keyboard device.
+DEVICES_SRC += vga.c           # Video device.
+DEVICES_SRC += serial.c                # Serial port device.
+DEVICES_SRC += disk.c          # IDE disk device.
 
 # Library code.
 LIB_SRC  = debug.c             # Debug helpers.
@@ -32,30 +40,46 @@ LIB_SRC += random.c         # Pseudo-random numbers.
 LIB_SRC += list.c              # Doubly-linked lists.
 LIB_SRC += bitmap.c            # Bitmaps.
 
+# Filesystem code.
+FILESYS_SRC  = filesys.c       # Filesystem core.
+FILESYS_SRC += file.c          # Files.
+FILESYS_SRC += directory.c     # Directories.
+FILESYS_SRC += filehdr.c       # File headers (inodes).
+FILESYS_SRC += fsutil.c                # Utilities.
+
+# User process code.
+USERPROG_SRC  = addrspace.c    # Address spaces.
+USERPROG_SRC += exception.c    # User exception handler.
+USERPROG_SRC += gdt.c          # GDT initialization.
+USERPROG_SRC += tss.c          # TSS management.
+
 # Objects.
 OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
 
 all: diskimage.bin
 
-intr-stubs.S: $(TOP_SRCDIR)/threads/intr-stubs.pl
-       $< > $@.tmp && mv $@.tmp $@
+intr-stubs.S: $(TOP_SRCDIR)/threads/intr-stubs.pl $(TOP_SRCDIR)/threads/loader.h
+       $< > $@
+
+kernel.lds.s: $(TOP_SRCDIR)/threads/kernel.lds.S $(TOP_SRCDIR)/threads/loader.h
+       $(CPP) -x assembler-with-cpp -P $< -o $@
 
-kernel.o: $(OBJECTS)
-       echo $(OBJECTS)
-       ld -T $(TOP_SRCDIR)/threads/kernel.lds -o $@ $^ \
-               `$(CC) -print-libgcc-file-name`
+kernel.o: $(OBJECTS) kernel.lds.s
+       ld -T kernel.lds.s -o $@ $(OBJECTS) `$(CC) -print-libgcc-file-name`
 
 kernel.bin: kernel.o
-       objcopy -O binary -R .note -R .comment -S $< $@
+       objcopy -O binary -R .note -R .comment -S $< $@.tmp
+       $(TOP_SRCDIR)/pad 4096 < $@.tmp > $@
 
-loader.bin: loader.S kernel.bin
-       gcc -c $< -DKERNEL_LOAD_PAGES=`perl -e 'print int (((-s "kernel.bin") + 4095) / 4096);'`
+loader.bin: loader.S loader.h kernel.bin
+       gcc -c $< -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
        ld -N -e start -Ttext 0x7c00 --oformat binary -o $@ loader.o
 
 diskimage.bin: loader.bin kernel.bin
        cat loader.bin kernel.bin > diskimage.bin
 
 clean:
-       rm -f *.o *.d *.bin intr-stubs.S
-
+       rm -f *.o *.d *.bin
+       rm -f kernel.bin.data kernel.bin.pad intr-stubs.S kernel.lds.s
 
+-include *.d