Ytshih/hw2

code/test/Makefile

@@ -113,7 +113,7 @@ ifeq ($(hosttype),unknown)
 PROGRAMS = unknownhost
 else
 # change this if you create a new test program!
-PROGRAMS = add halt consoleIO_test1 consoleIO_test2 fileIO_test1 fileIO_test2
+PROGRAMS = add halt consoleIO_test1 consoleIO_test2 fileIO_test1 fileIO_test2 test
 # PROGRAMS = halt
 endif
 
@@ -189,6 +189,11 @@ fileIO_test3: fileIO_test3.o start.o
 	$(LD) $(LDFLAGS) start.o fileIO_test3.o -o fileIO_test3.coff
 	$(COFF2NOFF) fileIO_test3.coff fileIO_test3
 
+test.o: test.c
+	$(CC) $(CFLAGS) -c test.c
+test: test.o start.o
+	$(LD) $(LDFLAGS) start.o test.o -o test.coff
+	$(COFF2NOFF) test.coff test
 
 clean:
 	$(RM) -f *.o *.ii
@@ -198,10 +203,11 @@ distclean: clean
 	$(RM) -f $(PROGRAMS)
 
 run: $(PROGRAMS)
-	for i in $(PROGRAMS); do \
-		echo ===== $$i =====; \
-		$(NACHOS) -e $$i; \
-	done
+	timeout 1 $(NACHOS) -e consoleIO_test1 -e consoleIO_test2
+	echo 'done'
+
+debug: $(PROGRAMS)
+	timeout 1 $(NACHOS) -e consoleIO_test1 -e consoleIO_test2 -d +
 
 
 unknownhost:

code/test/consoleIO_test1.c

@@ -2,8 +2,8 @@
 
 int main() {
   int n;
-	for (n = 9; n > 5; n--)
-		PrintInt(n);
-  Halt();
+  for (n = 9; n > 5; n--)
+    PrintInt(n);
+  return 0;
 }
 

code/test/consoleIO_test2.c

@@ -1,13 +1,11 @@
 #include "syscall.h"
 
-int
-main()
+int main()
 {
 	int n;
-	for (n=15;n<=19;n++){
-        
+	for (n=15;n<=19;n++){   
 		PrintInt(n);
-        }
-        Halt();
+	}
+	return 0;
 }
 

code/test/start.S

@@ -187,12 +187,12 @@ ThreadJoin:
 	.end ThreadJoin
 
 	.globl PrintInt
-	.ent	PrintInt
+	.ent	 PrintInt
 PrintInt:
 	addiu   $2,$0,SC_PrintInt
-    syscall
-    j       $31
-    .end    PrintInt
+	syscall
+	j       $31
+	.end    PrintInt
 
 
 /* dummy function to keep gcc happy */

code/test/test.c

@@ -0,0 +1,6 @@
+#include "syscall.h"
+
+int main()
+{
+	Exit(0);
+}