# -*- 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.
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.
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.
+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
+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: $(TOP_SRCDIR)/threads/kernel.lds.S $(TOP_SRCDIR)/threads/loader.h
+ $(CPP) -x assembler-with-cpp -P $< -o $@
+
+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 $< $@.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
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