X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.inc;h=885c6bba53ccefb1fa7d464ca75e459f9cd5bfb2;hb=8d321fddc6a25651e7fccacfe46b0ff1c4e52501;hp=c125ebaeb7be4447f9258b2736c354a73c1538d9;hpb=a051c001c942a1f9cce57b1beec79794f9c7089f;p=pintos-anon

diff --git a/src/Makefile.inc b/src/Makefile.inc
index c125eba..885c6bb 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -12,13 +12,10 @@ VPATH := $(VPATH):$(TOP_SRCDIR)/userprog
 
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS = -g -O3 -MMD -msoft-float $(WARNINGS) $(INCLUDES) $(DEFINES)
-ASFLAGS = -Wa,--gstabs+ $(INCLUDES) $(DEFINES)
+ASFLAGS = -Wa,--gstabs $(INCLUDES) $(DEFINES)
 
 # Core kernel.
-THREADS_SRC  = start.S		# Must be linked first.
-THREADS_SRC += init.c		# Main program.
-THREADS_SRC += gdt.c		# GDT initialization.
-THREADS_SRC += tss.c		# TSS management.
+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.
@@ -27,6 +24,7 @@ THREADS_SRC += synch.c		# Synchronization.
 THREADS_SRC += paging.c		# Page tables.
 THREADS_SRC += palloc.c		# Page allocator.
 THREADS_SRC += malloc.c		# Subpage allocator.
+THREADS_SRC += start.S		# Startup code.
 
 # Device driver code.
 DEVICES_SRC  = timer.c		# Timer device.
@@ -41,6 +39,7 @@ LIB_SRC += lib.c		# Standard C library.
 LIB_SRC += random.c		# Pseudo-random numbers.
 LIB_SRC += list.c		# Doubly-linked lists.
 LIB_SRC += bitmap.c		# Bitmaps.
+LIB_SRC += hash.c		# Hash tables.
 
 # Filesystem code.
 FILESYS_SRC  = filesys.c	# Filesystem core.
@@ -51,13 +50,17 @@ FILESYS_SRC += fsutil.c		# Utilities.
 
 # User process code.
 USERPROG_SRC  = addrspace.c	# Address spaces.
+USERPROG_SRC += exception.c	# User exception handler.
+USERPROG_SRC += syscall.c	# System call 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 $(TOP_SRCDIR)/threads/gdt.h
+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