Merge branch 'scale-amd64' of git+ssh://amsterdam.csail.mit.edu/home/am0/6.828/xv6 into scale-amd64

91346098 · Silas Boyd-Wickizer · 16f95ce9 · ce75874a · 91346098 · 91346098
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,13 @@ LDFLAGS   = -m elf_x86_64
 ALL := 
 all:

+define SYSCALLGEN
+	@echo "  GEN    $@"
+	$(Q)mkdir -p $(@D)
+	$(Q)python tools/syscalls.py $(1) kernel/*.cc > $@.tmp
+	$(Q)cmp -s $@.tmp $@ || mv $@.tmp $@
+endef
+
 include net/Makefrag
 include lib/Makefrag
 include bin/Makefrag

--- a/kernel/Makefrag
+++ b/kernel/Makefrag
@@ -142,9 +142,7 @@ $(O)/kernel/trapasm.o: $(O)/include/asmdefines.h
 $(O)/kernel/uaccess.o: $(O)/include/asmdefines.h

 $(O)/kernel/sysvectors.cc: tools/syscalls.py kernel/*.cc
-	@echo "  GEN    $@"
-	$(Q)mkdir -p $(@D)
-	$(Q)python $^ --kvectors > $@
+	$(call SYSCALLGEN,--kvectors)

 .PRECIOUS: $(O)/kernel/%.o
 -include $(O)/kernel/*.d

--- a/kernel/sysproc.cc
+++ b/kernel/sysproc.cc
@@ -144,8 +144,8 @@ sys_unmap(userptr<void> addr, size_t len)
  return 0;
 }

-//SYSCALL
-int
+//SYSCALL NORET
+void
 sys_halt(void)
 {
  halt();

--- a/lib/Makefrag
+++ b/lib/Makefrag
@@ -6,14 +6,10 @@ ULIB = ulib.o printf.o umalloc.o uthread.o fmt.o stream.o ipc.o \
 ULIB := $(addprefix $(O)/lib/, $(ULIB))

 $(O)/lib/sysstubs.S: tools/syscalls.py kernel/*.cc
-	@echo "  GEN    $@"
-	$(Q)mkdir -p $(@D)
-	$(Q)python $^ --ustubs > $@
+	$(call SYSCALLGEN,--ustubs)

 $(O)/include/sysstubs.h: tools/syscalls.py kernel/*.cc
-	@echo "  GEN    $@"
-	$(Q)mkdir -p $(@D)
-	$(Q)python $^ --udecls > $@
+	$(call SYSCALLGEN,--udecls)

 .PRECIOUS: $(O)/lib/%.o
 -include $(O)/lib/*.d