VPATH := $(TOP_SRCDIR)/threads
VPATH := $(VPATH):$(TOP_SRCDIR)/devices
VPATH := $(VPATH):$(TOP_SRCDIR)/lib
VPATH := $(VPATH):$(TOP_SRCDIR)/filesys
VPATH := $(VPATH):$(TOP_SRCDIR)/userprog
VPATH := $(TOP_SRCDIR)/threads
VPATH := $(VPATH):$(TOP_SRCDIR)/devices
VPATH := $(VPATH):$(TOP_SRCDIR)/lib
VPATH := $(VPATH):$(TOP_SRCDIR)/filesys
VPATH := $(VPATH):$(TOP_SRCDIR)/userprog
-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)
THREADS_SRC += thread.c # Thread management core.
THREADS_SRC += switch.S # Thread switch routine.
THREADS_SRC += interrupt.c # Interrupt core.
THREADS_SRC += thread.c # Thread management core.
THREADS_SRC += switch.S # Thread switch routine.
THREADS_SRC += interrupt.c # Interrupt core.
THREADS_SRC += paging.c # Page tables.
THREADS_SRC += palloc.c # Page allocator.
THREADS_SRC += malloc.c # Subpage allocator.
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.
# 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.
LIB_SRC += random.c # Pseudo-random numbers.
LIB_SRC += list.c # Doubly-linked lists.
LIB_SRC += bitmap.c # Bitmaps.
LIB_SRC += random.c # Pseudo-random numbers.
LIB_SRC += list.c # Doubly-linked lists.
LIB_SRC += bitmap.c # Bitmaps.
-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.
# Objects.
OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
all: diskimage.bin
# Objects.
OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
all: diskimage.bin
-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`
- 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 > $@
gcc -c $< -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
ld -N -e start -Ttext 0x7c00 --oformat binary -o $@ loader.o
gcc -c $< -DKERNEL_LOAD_PAGES=`perl -e 'print +(-s "kernel.bin") / 4096;'`
ld -N -e start -Ttext 0x7c00 --oformat binary -o $@ loader.o