Add more unary operation tests.

19 files changed, 58 insertions, 5 deletions

diff --git a/assembler/test/.gitignore b/assembler/test/.gitignore
index 037d1395..c0a52dc9 100644
--- a/assembler/test/.gitignore
+++ b/assembler/test/.gitignore
@@ -1,2 +1,10 @@
 *.out
 mov
+frc
+rndd
+rnde
+rnde-intsrc
+rndu
+rndz
+lzd
+not
diff --git a/assembler/test/Makefile.am b/assembler/test/Makefile.am
index 3053b7b1..d565194d 100644
--- a/assembler/test/Makefile.am
+++ b/assembler/test/Makefile.am
@@ -2,11 +2,38 @@ check_SCRIPTS = run-test.sh
 
 TESTS_ENVIRONMENT = top_builddir=${top_builddir}
 TESTS = \
-	mov
+	mov \
+	frc \
+	rndd \
+	rndu \
+	rnde-intsrc \
+	rndz \
+	lzd \
+	not
+
+# Tests that are expected to fail because they contain some inccorect code.
+XFAIL_TESTS = \
+	rnde-intsrc
 
 TESTDATA = \
 	mov.expected \
-	mov.g4a
+	mov.g4a \
+	frc.expected \
+	frc.g4a \
+	rndd.expected \
+	rndd.g4a \
+	rndu.expected \
+	rndu.g4a \
+	rnde.expected \
+	rnde.g4a \
+	rnde-intsrc.expected \
+	rnde-intsrc.g4a \
+	rndz.expected \
+	rndz.g4a \
+	lzd.expected \
+	lzd.g4a \
+	not.expected \
+	not.g4a
 
 EXTRA_DIST = \
 	${TESTDATA} \
diff --git a/assembler/test/frc.expected b/assembler/test/frc.expected
new file mode 100644
index 00000000..e93f8f77
--- /dev/null
+++ b/assembler/test/frc.expected
@@ -0,0 +1 @@
+   { 0x00000001, 0x20000021, 0x00000020, 0x00000000 },
diff --git a/assembler/test/frc.g4a b/assembler/test/frc.g4a
new file mode 100644
index 00000000..8844f676
--- /dev/null
+++ b/assembler/test/frc.g4a
@@ -0,0 +1 @@
+mov (1) g0<1>UD g1<0,1,0>UD { align1 };
diff --git a/assembler/test/lzd.expected b/assembler/test/lzd.expected
new file mode 100644
index 00000000..1df4db99
--- /dev/null
+++ b/assembler/test/lzd.expected
@@ -0,0 +1 @@
+   { 0x0000004a, 0x20000021, 0x00000020, 0x00000000 },
diff --git a/assembler/test/lzd.g4a b/assembler/test/lzd.g4a
new file mode 100644
index 00000000..b644d76a
--- /dev/null
+++ b/assembler/test/lzd.g4a
@@ -0,0 +1 @@
+lzd (1) g0<1>UD g1<0,1,0>UD { align1 };
diff --git a/assembler/test/not.expected b/assembler/test/not.expected
new file mode 100644
index 00000000..072d7ab7
--- /dev/null
+++ b/assembler/test/not.expected
@@ -0,0 +1 @@
+   { 0x00000004, 0x20000021, 0x00000020, 0x00000000 },
diff --git a/assembler/test/not.g4a b/assembler/test/not.g4a
new file mode 100644
index 00000000..69d9f8c0
--- /dev/null
+++ b/assembler/test/not.g4a
@@ -0,0 +1 @@
+not (1) g0<1>UD g1<0,1,0>UD { align1 };
diff --git a/assembler/test/rndd.expected b/assembler/test/rndd.expected
new file mode 100644
index 00000000..a841e25e
--- /dev/null
+++ b/assembler/test/rndd.expected
@@ -0,0 +1 @@
+   { 0x00000045, 0x200003a1, 0x00000020, 0x00000000 },
diff --git a/assembler/test/rndd.g4a b/assembler/test/rndd.g4a
new file mode 100644
index 00000000..832a5446
--- /dev/null
+++ b/assembler/test/rndd.g4a
@@ -0,0 +1 @@
+rndd (1) g0<1>UD g1<0,1,0>F { align1 };
diff --git a/assembler/test/rnde-intsrc.expected b/assembler/test/rnde-intsrc.expected
new file mode 100644
index 00000000..1138d733
--- /dev/null
+++ b/assembler/test/rnde-intsrc.expected
@@ -0,0 +1 @@
+   { 0x00000046, 0x20000021, 0x00000020, 0x00000000 },
diff --git a/assembler/test/rnde-intsrc.g4a b/assembler/test/rnde-intsrc.g4a
new file mode 100644
index 00000000..53bfc186
--- /dev/null
+++ b/assembler/test/rnde-intsrc.g4a
@@ -0,0 +1 @@
+rnde (1) g0<1>UD g1<0,1,0>UD { align1 };
diff --git a/assembler/test/rnde.expected b/assembler/test/rnde.expected
new file mode 100644
index 00000000..21553790
--- /dev/null
+++ b/assembler/test/rnde.expected
@@ -0,0 +1 @@
+   { 0x00000046, 0x200003a1, 0x00000020, 0x00000000 },
diff --git a/assembler/test/rnde.g4a b/assembler/test/rnde.g4a
new file mode 100644
index 00000000..9bc13cb3
--- /dev/null
+++ b/assembler/test/rnde.g4a
@@ -0,0 +1 @@
+rnde (1) g0<1>UD g1<0,1,0>F { align1 };
diff --git a/assembler/test/rndu.expected b/assembler/test/rndu.expected
new file mode 100644
index 00000000..46e26c12
--- /dev/null
+++ b/assembler/test/rndu.expected
@@ -0,0 +1 @@
+   { 0x00000044, 0x200003a1, 0x00000020, 0x00000000 },
diff --git a/assembler/test/rndu.g4a b/assembler/test/rndu.g4a
new file mode 100644
index 00000000..6321f2e9
--- /dev/null
+++ b/assembler/test/rndu.g4a
@@ -0,0 +1 @@
+rndu (1) g0<1>UD g1<0,1,0>F { align1 };
diff --git a/assembler/test/rndz.expected b/assembler/test/rndz.expected
new file mode 100644
index 00000000..9045cfca
--- /dev/null
+++ b/assembler/test/rndz.expected
@@ -0,0 +1 @@
+   { 0x00000047, 0x200003a1, 0x00000020, 0x00000000 },
diff --git a/assembler/test/rndz.g4a b/assembler/test/rndz.g4a
new file mode 100644
index 00000000..6dd60f7d
--- /dev/null
+++ b/assembler/test/rndz.g4a
@@ -0,0 +1 @@
+rndz (1) g0<1>UD g1<0,1,0>F { align1 };
diff --git a/assembler/test/run-test.sh b/assembler/test/run-test.sh
index 926c5c30..a93a79fc 100644
--- a/assembler/test/run-test.sh
+++ b/assembler/test/run-test.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
-TESTDIR=${srcdir-`pwd`}
+SRCDIR=${srcdir-`pwd`}
 BUILDDIR=${top_builddir-`pwd`}
 
-${BUILDDIR}/src/gen4asm -o TEST.out $TESTDIR/TEST.g4a
-if cmp TEST.out ${TESTDIR}/TEST.expected; then : ; else
+${BUILDDIR}/src/gen4asm -o TEST.out $SRCDIR/TEST.g4a
+if cmp TEST.out ${SRCDIR}/TEST.expected 2> /dev/null; then : ; else
+  echo "Output comparison for TEST"
+  diff -u ${SRCDIR}/TEST.expected TEST.out
   exit 1;
 fi