Nicer way to generate kernel.lds.s.

[pintos-anon] / src / Makefile.inc

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 6ed310ea91b24035a12545a6d05456c9edcacaa8..df6b01046a306f9efb4e20fd60d0819df8009ca0 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -1,22 +1,21 @@
 # -*- 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 += -DCNACHOS86
 WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS = -g -O3 -MMD $(WARNINGS) $(INCLUDES) $(DEFINES)
-ASFLAGS = -Wa,--gstabs+ $(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 += thread.c                # Thread management core.
 THREADS_SRC += switch.S                # Thread switch routine.
 THREADS_SRC += interrupt.c     # Interrupt core.
@@ -25,12 +24,14 @@ 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.
 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.
@@ -38,34 +39,41 @@ 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.
+LIB_SRC += hash.c              # Hash tables.
 
 # 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.
+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
-       $< > $@.tmp && mv $@.tmp $@
+intr-stubs.S: $(TOP_SRCDIR)/threads/intr-stubs.pl $(TOP_SRCDIR)/threads/loader.h
+       $< > $@
 
-kernel.o: $(OBJECTS)
-       ld -T $(TOP_SRCDIR)/threads/kernel.lds -o $@ $^ \
-               `$(CC) -print-libgcc-file-name`
+kernel.lds.s: CPPFLAGS += -P -C
+kernel.lds.s: $(TOP_SRCDIR)/threads/kernel.lds.S $(TOP_SRCDIR)/threads/loader.h
+
+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
 
@@ -73,4 +81,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