X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile.inc;h=d6b9519edd9052672a8b97daedcabbea5de3b5d3;hb=c9c283cb3e26a5b6d918ee47dcf8efe28522b18d;hp=a086db02d28406a9ba14a09cdf9bc967917076bb;hpb=a5ccc740ff0bbc65ddca50b4c5d174bcc22ba586;p=pintos-anon

diff --git a/src/Makefile.inc b/src/Makefile.inc
index a086db0..d6b9519 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -1,26 +1,29 @@
 # -*- makefile -*-
 
 SHELL = /bin/sh
+
+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
 
--include *.d
-
-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 linked first.
-THREADS_SRC += init.c		# Start-up code.
+THREADS_SRC += init.c		# Main program.
+THREADS_SRC += gdt.c		# GDT initialization.
 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 += paging.c		# Page tables.
 THREADS_SRC += palloc.c		# Page allocator.
 THREADS_SRC += malloc.c		# Subpage allocator.
 
@@ -29,6 +32,7 @@ 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.
@@ -36,31 +40,36 @@ 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 += backdoor.c		# Backdoor IPC.
 
 # Filesystem code.
 FILESYS_SRC  = filesys.c	# Filesystem core.
-FILESYS_SRC += file.c		# Individual files.
-FILESYS_SRC += filesys-stub.c	# Stub helper code.
+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.
 
 # 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/gdt.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)
-	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 $< $@.data
-	perl -e 'print "\0" x (4096 - (-s "$@.data") % 4096)' > $@.pad
-	cat $@.data $@.pad > $@.tmp && mv $@.tmp $@
+	objcopy -O binary -R .note -R .comment -S $< $@.tmp
+	$(TOP_SRCDIR)/pad 4096 < $@.tmp > $@
 
-loader.bin: loader.S kernel.bin
+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
 
@@ -68,6 +77,7 @@ diskimage.bin: loader.bin kernel.bin
 	cat loader.bin kernel.bin > diskimage.bin
 
 clean:
-	rm -f *.o *.d *.bin kernel.bin.data kernel.bin.pad intr-stubs.S
-
+	rm -f *.o *.d *.bin
+	rm -f kernel.bin.data kernel.bin.pad intr-stubs.S kernel.lds.s
 
+-include *.d