Reworked unit tests for machine and renamed test_programs directory

test/riscv_instructions/Makefile

@@ -0,0 +1,9 @@
+dumps:
+	make dumps -C boolean_logic/
+	make dumps -C jump_instructions/
+	make dumps -C simple_arithmetics/
+
+tests:
+	make tests -C boolean_logic/
+	make tests -C jump_instructions/
+	make tests -C simple_arithmetics/

test/riscv_instructions/boolean_logic/Makefile

@@ -0,0 +1,9 @@
+TOPDIR = ../..
+include $(TOPDIR)/Makefile.tests
+
+dumps: comparisons.dump if.dump switch.dump
+
+tests: comparisons.guac if.guac switch.guac
+
+# Dependances
+$(PROGRAMS): % : $(USERLIB)/sys.o $(USERLIB)/libnachos.o %.o

test/riscv_instructions/boolean_logic/comparisons.c

@@ -0,0 +1,15 @@
+int main() {
+    int x = 0;
+    int y = 1;
+    while (x <= y) {
+        if (x > y) {
+            x += 1;
+        } else if (x == y) {
+            x += y;
+        } else if (x < y) {
+            y += 1;
+        } else {
+            return 0;
+        }
+    }
+}

test/riscv_instructions/boolean_logic/if.c

@@ -0,0 +1,10 @@
+int main() {
+    int x = 1;
+    if (x == 1 && x > 0) {
+        x = 2;
+    } else if (x || x == 0 ) {
+        x = 3;
+    } else {
+        x = 0;
+    }
+}

test/riscv_instructions/boolean_logic/new_comparisons.c

@@ -0,0 +1,17 @@
+int main() {
+    int x = 0;
+    int y = 1;
+    while (x <= y) {
+        if (x > y) {
+            y += 1;
+        }
+        if (x == y) {
+            x += y;
+        }
+        if (x < y) {
+            x += 1;
+        } else {
+            return 0;
+        }
+    }
+}

test/riscv_instructions/boolean_logic/switch.c

@@ -0,0 +1,7 @@
+int main() {
+    int x = 0;
+    switch(x) {
+        case 1: x = 1; break;
+        default: return 0;
+    }
+}

test/riscv_instructions/jump_instructions/Makefile

@@ -0,0 +1,6 @@
+TOPDIR = ../..
+include $(TOPDIR)/Makefile.tests
+
+dumps: jump.dump ret.dump
+
+tests: jump.guac ret.guac

test/riscv_instructions/jump_instructions/jump.c

@@ -0,0 +1,8 @@
+int test() {
+    return 0;
+}
+
+int main() {
+    int x = test();
+    return x;
+}

test/riscv_instructions/jump_instructions/ret.c

@@ -0,0 +1,3 @@
+int main() {
+    return 1;
+}

test/riscv_instructions/simple_arithmetics/Makefile

@@ -0,0 +1,6 @@
+TOPDIR = ../..
+include $(TOPDIR)/Makefile.tests
+
+dumps: unsigned_addition.dump unsigned_division.dump unsigned_multiplication.dump unsigned_substraction.dump
+
+tests: unsigned_addition.guac unsigned_division.guac unsigned_multiplication.guac unsigned_substraction.guac

test/riscv_instructions/simple_arithmetics/README.md

@@ -0,0 +1,15 @@
+# Simple arithmetics program
+
+These allow to check whether the following instructions are correctly implemented.
+
+- addi
+- sd
+- sw
+- li
+- sw
+- lw
+- mv
+- addw
+- nop
+- ld
+- ret

test/riscv_instructions/simple_arithmetics/unsigned_addition.c

@@ -0,0 +1,9 @@
+#include "userlib/syscall.h"
+#include "userlib/libnachos.h"
+
+// EXPECTS TWO VARIABLES WITH A VALUE OF UNSIGNED 1
+int main() {
+    unsigned int x = 0;
+    unsigned int y = 1;
+    x = x + y;
+}

test/riscv_instructions/simple_arithmetics/unsigned_division.c

@@ -0,0 +1,6 @@
+// Expecting two variables with a value of two
+int main() {
+    unsigned int x = 4;
+    unsigned int y = 2;
+    x = x / y;
+}

test/riscv_instructions/simple_arithmetics/unsigned_multiplication.c

@@ -0,0 +1,6 @@
+// EXPECTS TWO VARIABLES WITH A VALUE OF UNSIGNED 2
+int main() {
+    unsigned int x = 1;
+    unsigned int y = 2;
+    x = x * y;
+}

test/riscv_instructions/simple_arithmetics/unsigned_substraction.c

@@ -0,0 +1,6 @@
+// EXPECTS TWO VARIABLES WITH A VALUE OF UNSIGNED 1
+int main() {
+    unsigned int x = 1;
+    unsigned int y = 1;
+    x = x - y;
+}