Add a `null' test for testing src/userprog before system calls have

been implemented.

diff --git a/grading/userprog/Make.base b/grading/userprog/Make.base
index 77c580d13a107bab584a21400a1ce2709f12a920..d78787c2e8e185b7da2a283e4450f31768ca120f 100644 (file)
--- a/grading/userprog/Make.base
+++ b/grading/userprog/Make.base
@@ -6,7 +6,12 @@ child_arg_SRC = child-arg.c
 child_bad_SRC = child-bad.c
 child_close_SRC = child-close.c
 
-DISKS = $(patsubst %,%.dsk,$(TESTS))
+null.o: null.S
+null: null.o
+       $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+null.dsk: null 
+
+DISKS = $(patsubst %,%.dsk,$(TESTS)) null.dsk
 
 disks: $(DISKS)
 

diff --git a/grading/userprog/Makefile b/grading/userprog/Makefile
index 1eb67b3142af29a46f1591b25f1eea24f47bbc5e..2b9669450ea2d0db98c1ed65659771fd79139032 100644 (file)
--- a/grading/userprog/Makefile
+++ b/grading/userprog/Makefile
@@ -76,10 +76,15 @@ child_arg_SRC = child-arg.c
 child_bad_SRC = child-bad.c
 child_close_SRC = child-close.c
 
-DISKS = $(patsubst %,%.dsk,$(TESTS))
+DISKS = $(patsubst %,%.dsk,$(TESTS)) null.dsk
 
 disks: $(DISKS)
 
+null.o: null.S
+null: null.o
+       $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
+null.dsk: null 
+
 exec-once.dsk exec-multiple.dsk join-simple.dsk join-twice.dsk: child-simple
 exec-arg.dsk: child-arg
 join-killed.dsk: child-bad

diff --git a/grading/userprog/null.S b/grading/userprog/null.S
new file mode 100644 (file)
index 0000000..e4f7e3a
--- /dev/null
+++ b/grading/userprog/null.S
@@ -0,0 +1,3 @@
+       .globl _start
+_start:                
+       int $0x30

diff --git a/grading/userprog/null.exp b/grading/userprog/null.exp
new file mode 100644 (file)
index 0000000..001f798
--- /dev/null
+++ b/grading/userprog/null.exp
@@ -0,0 +1 @@
+system call!