Added the null syscall and a userapp that exploits it.
[akaros.git] / kern / Makefrag
index 3b94979..497bbba 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Makefile fragment for JOS kernel.
+# Makefile fragment for ROS kernel.
 # This is NOT a complete makefile;
 # you must run GNU make in the top-level directory
 # where the GNUmakefile is located.
@@ -15,6 +15,7 @@ KERN_LDFLAGS := $(LDFLAGS) -Lobj/ivylib -T kern/kernel.ld -nostdlib
 # We also snatch the use of a couple handy source files
 # from the lib directory, to avoid gratuitous code duplication.
 KERN_SRCFILES :=       kern/entry.S \
+                       kern/smp_entry.S \
                        kern/init.c \
                        kern/console.c \
                        kern/monitor.c \
@@ -28,6 +29,10 @@ KERN_SRCFILES :=     kern/entry.S \
                        kern/sched.c \
                        kern/syscall.c \
                        kern/kdebug.c \
+                       kern/apic.c \
+                       kern/testing.c \
+                       kern/atomic.c \
+                       kern/smp.c \
                        lib/printfmt.c \
                        lib/readline.c \
                        lib/string.c
@@ -35,18 +40,19 @@ KERN_SRCFILES :=    kern/entry.S \
 # Only build files if they exist.
 KERN_SRCFILES := $(wildcard $(KERN_SRCFILES))
 
-KERN_BINFILES :=       user/hello \
-                       user/buggyhello \
-                       user/evilhello \
-                       user/testbss \
-                       user/divzero \
-                       user/breakpoint \
-                       user/softint \
-                       user/badsegment \
-                       user/faultread \
-                       user/faultreadkernel \
-                       user/faultwrite \
-                       user/faultwritekernel
+KERN_BINFILES :=       user/null \
+                                       user/hello \
+                                       user/buggyhello \
+                                       user/evilhello \
+                                       user/testbss \
+                                       user/divzero \
+                                       user/breakpoint \
+                                       user/softint \
+                                       user/badsegment \
+                                       user/faultread \
+                                       user/faultreadkernel \
+                                       user/faultwrite \
+                                       user/faultwritekernel
 
 KERN_OBJFILES := $(patsubst %.c, $(OBJDIR)/%.o, $(KERN_SRCFILES))
 KERN_OBJFILES := $(patsubst %.S, $(OBJDIR)/%.o, $(KERN_OBJFILES))
@@ -84,9 +90,6 @@ $(OBJDIR)/kern/bochs.img: $(OBJDIR)/kern/kernel $(OBJDIR)/boot/boot
        $(V)dd if=$(OBJDIR)/boot/boot of=$(OBJDIR)/kern/bochs.img~ conv=notrunc 2>/dev/null
        $(V)dd if=$(OBJDIR)/kern/kernel of=$(OBJDIR)/kern/bochs.img~ seek=1 conv=notrunc 2>/dev/null
        $(V)mv $(OBJDIR)/kern/bochs.img~ $(OBJDIR)/kern/bochs.img
-# brho uses these
-#      $(V)cp $(OBJDIR)/kern/kernel mnt/hdd/texas
-#      $(V)sync
 
 all: $(OBJDIR)/kern/bochs.img