# -*- makefile -*-
-include ../Makefile.vars
-
-SHELL = /bin/sh
-
-# Binary utilities.
-# If the host appears to be x86, use the normal tools.
-# Otherwise assume cross-tools are installed as i386-elf-*.
-X86 = i.86\|pentium.*\|[pk][56]\|nexgen\|viac3\|6x86\|athlon.*
-ifneq (0, $(shell expr `uname -m` : '$(X86)'))
-CC = gcc
-LD = ld
-OBJCOPY = objcopy
-else
-CC = i386-elf-gcc
-LD = i386-elf-ld
-OBJCOPY = i386-elf-objcopy
-endif
-
-# Other utilities.
-DD = dd
-RM = rm
-CAT = cat
+include ../Make.vars
+include ../../Make.config
VPATH = ../..
# Compiler and assembler options.
DEFINES += -DKERNEL
-WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
CPPFLAGS = -nostdinc -I../.. -I- -I../../lib -I../../lib/kernel \
-include constants.h
-CFLAGS = -g -O3 -MMD -msoft-float
-ASFLAGS = -Wa,--gstabs -MMD
# Core kernel.
threads_SRC = threads/init.c # Main program.
threads_SRC += threads/interrupt.c # Interrupt core.
threads_SRC += threads/intr-stubs.S # Interrupt stubs.
threads_SRC += threads/synch.c # Synchronization.
-threads_SRC += threads/paging.c # Page tables.
threads_SRC += threads/palloc.c # Page allocator.
threads_SRC += threads/malloc.c # Subpage allocator.
threads_SRC += threads/start.S # Startup code.
lib_kernel_SRC += lib/kernel/hash.c # Hash tables.
lib_kernel_SRC += lib/kernel/console.c # printf(), putchar().
+# User process code.
+userprog_SRC = userprog/process.c # Process loading.
+userprog_SRC += userprog/pagedir.c # Page directories.
+userprog_SRC += userprog/exception.c # User exception handler.
+userprog_SRC += userprog/syscall.c # System call handler.
+userprog_SRC += userprog/gdt.c # GDT initialization.
+userprog_SRC += userprog/tss.c # TSS management.
+
+# No virtual memory code yet.
+#vm_SRC = vm/filename.c # Some file.
+
# Filesystem code.
filesys_SRC = filesys/filesys.c # Filesystem core.
filesys_SRC += filesys/file.c # Files.
filesys_SRC += filesys/inode.c # File headers.
filesys_SRC += filesys/fsutil.c # Utilities.
-# User process code.
-userprog_SRC = userprog/addrspace.c # Address spaces.
-userprog_SRC += userprog/exception.c # User exception handler.
-userprog_SRC += userprog/syscall.c # System call handler.
-userprog_SRC += userprog/gdt.c # GDT initialization.
-userprog_SRC += userprog/tss.c # TSS management.
-
SOURCES = $(foreach dir,$(SUBDIRS),$($(subst /,_,$(dir))_SRC))
OBJECTS = $(patsubst %.c,%.o,$(patsubst %.S,%.o,$(SOURCES)))
DEPENDS = $(patsubst %.o,%.d,$(OBJECTS))
all: os.dsk
threads/intr-stubs.S: threads/intr-stubs.pl threads/loader.h
- $< > $@
+ $< > $@.tmp && mv $@.tmp $@
-threads/kernel.lds.s: CPPFLAGS += -P -C
+threads/kernel.lds.s: CPPFLAGS += -P
threads/kernel.lds.s: threads/kernel.lds.S threads/loader.h
kernel.o: threads/kernel.lds.s $(OBJECTS)
Makefile: ../../Makefile.build
cp $< $@
-%.o: %.c
- $(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)
-
-%.o: %.S
- $(CC) -c $< -o $@ $(ASFLAGS) $(CPPFLAGS) $(DEFINES)
-
-include $(DEPENDS)