trying merging cpu-mm with default branch

6 files changed, 75 insertions, 21 deletions

diff --git a/ue3/mycpu/test/test.sh b/ue3/mycpu/test/test.sh
new file mode 100755
index 0000000..ff1076c
--- /dev/null
+++ b/ue3/mycpu/test/test.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+binary="./mycpu"
+tmpfile="test/tmpfile"
+inputs=( $(ls test/* | grep _program | sort -n) )
+
+for input in ${inputs[@]}
+do
+  echo "Testing $input ..."
+
+  programfile="$input"
+  args="-c $programfile"
+  memoryfile="${input/_program/_memory}"
+  reffile="${input/_program/_output}"
+  if [ -e "$memoryfile" ]
+  then
+    args+=" -m $memoryfile"
+  fi
+
+  if [ ! -e "$reffile" ]
+  then
+    echo "  ERROR: reference file $reffile doesn't exist"
+    exit 1
+  fi
+
+  rm -rf "$tmpfile"
+  echo "  Executing $binary $args ..."
+  $binary $args > $tmpfile
+
+  md5_1=$(md5sum < "$reffile")
+  md5_2=$(md5sum < "$tmpfile")
+  if [ "$md5_1" != "$md5_2" ]
+  then
+    echo "  ERROR: output and $reffile differ"
+    diff -Naur "$reffile" "$tmpfile"
+    rm -rf "$tmpfile"
+    exit 1
+  else
+    echo "  SUCCESS"
+  fi
+  rm -rf "$tmpfile"
+done
diff --git a/ue3/mycpu/test/test1_memory b/ue3/mycpu/test/test1_memory
new file mode 100644
index 0000000..209e3ef
--- /dev/null
+++ b/ue3/mycpu/test/test1_memory
@@ -0,0 +1 @@
+20
diff --git a/ue3/mycpu/test/test1_output b/ue3/mycpu/test/test1_output
new file mode 100644
index 0000000..ac30dc2
--- /dev/null
+++ b/ue3/mycpu/test/test1_output
@@ -0,0 +1,19 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
diff --git a/ue3/mycpu/test/test1_program b/ue3/mycpu/test/test1_program
new file mode 100644
index 0000000..ae5e9d2
--- /dev/null
+++ b/ue3/mycpu/test/test1_program
@@ -0,0 +1,13 @@
+# set R2 = 10
+LOAD R2, R1
+
+# start of loop
+label Loop:
+inc R3
+sub R4, R3, R2
+test R4
+jumpz EndLoop
+write WDEZ, R3
+jumpa Loop
+
+label EndLoop:
diff --git a/ue3/mycpu/test/test_prog b/ue3/mycpu/test/test_prog
deleted file mode 100644
index b50575b..0000000
--- a/ue3/mycpu/test/test_prog
+++ /dev/null
@@ -1,15 +0,0 @@
-# set R2 = 10 
-
-load R2, R1 
-
-# start of loop 
-label Loop: 
-inc R3 
-sub R4, R3, R2 
-test R4 
-jumpz EndLoop 
-write WDEZ, R3 
-store R3, R1
-jumpa Loop 
-
-label EndLoop:
diff --git a/ue3/mycpu/test/test_prog_mem b/ue3/mycpu/test/test_prog_mem
deleted file mode 100644
index 8c3e80f..0000000
--- a/ue3/mycpu/test/test_prog_mem
+++ /dev/null
@@ -1,6 +0,0 @@
-9
-3
-4
-5
-4
-3