From dfbafeb0b58db59aa0f61d5721d074db1facfb3e Mon Sep 17 00:00:00 2001
From: "A. Fachat" <fachat@web.de>
Date: Tue, 19 Aug 2014 17:25:27 +0200
Subject: [PATCH] Update and fix test suite scripts and first tests

---
 xa/tests/adrm/Makefile   |   5 +++++
 xa/tests/adrm/a.out-02   | Bin 0 -> 60 bytes
 xa/tests/adrm/a.out-816  | Bin 0 -> 50 bytes
 xa/tests/adrm/a.out-c02  | Bin 0 -> 58 bytes
 xa/tests/adrm/a.out-zab  | Bin 0 -> 47 bytes
 xa/tests/adrm/a.out-zab2 | Bin 0 -> 46 bytes
 xa/tests/adrm/a.out-zpa  | Bin 0 -> 47 bytes
 xa/tests/adrm/a.out-zpa2 | Bin 0 -> 46 bytes
 xa/tests/adrm/bip2.inc   |  28 ++++++++++++++++++++++++++++
 xa/tests/adrm/runtest.sh |  39 ++++++++++++++++++++++++++++++---------
 xa/tests/adrm/zab2.asm   |   4 ++++
 xa/tests/adrm/zpa2.asm   |   4 ++++
 12 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 xa/tests/adrm/Makefile
 create mode 100644 xa/tests/adrm/a.out-02
 create mode 100644 xa/tests/adrm/a.out-816
 create mode 100644 xa/tests/adrm/a.out-c02
 create mode 100644 xa/tests/adrm/a.out-zab
 create mode 100644 xa/tests/adrm/a.out-zab2
 create mode 100644 xa/tests/adrm/a.out-zpa
 create mode 100644 xa/tests/adrm/a.out-zpa2
 create mode 100644 xa/tests/adrm/bip2.inc
 create mode 100644 xa/tests/adrm/zab2.asm
 create mode 100644 xa/tests/adrm/zpa2.asm

diff --git a/xa/tests/adrm/Makefile b/xa/tests/adrm/Makefile
new file mode 100644
index 0000000..b847663
--- /dev/null
+++ b/xa/tests/adrm/Makefile
@@ -0,0 +1,5 @@
+
+tests:
+	./runtest.sh -q -C
+
+
diff --git a/xa/tests/adrm/a.out-02 b/xa/tests/adrm/a.out-02
new file mode 100644
index 0000000000000000000000000000000000000000..f6bd5e1a06534accf1e87b22af020fba4eaf0d06
GIT binary patch
literal 60
zcmZQzX=Me$W310um$LS;GV}sbYJ1<DiSJk$&N(&r8oIoDP}##Jt?=Z(&!ay+W-NXR
N3Kvc%Bz!oY005957>@t|

literal 0
HcmV?d00001

diff --git a/xa/tests/adrm/a.out-816 b/xa/tests/adrm/a.out-816
new file mode 100644
index 0000000000000000000000000000000000000000..218516c921d89e81e10c67e8c7bb4ce449844e2c
GIT binary patch
literal 50
vcmZQzX=R1LURDMWN^S3FWnchf=hXHDpGSXU9{ri=qr(!T!@`ho;bH;+WtI?j

literal 0
HcmV?d00001

diff --git a/xa/tests/adrm/a.out-c02 b/xa/tests/adrm/a.out-c02
new file mode 100644
index 0000000000000000000000000000000000000000..f6b29d110919f49afe2afed85808983600c03e71
GIT binary patch
literal 58
zcmZQzX=Me$W310u`&b!zfhe`TZ_dPbtPE1;oSLnA4PD+nsO;gAR(SH?=g}V@6Ba)O
Kg@l9)Cldfu>lS_h

literal 0
HcmV?d00001

diff --git a/xa/tests/adrm/a.out-zab b/xa/tests/adrm/a.out-zab
new file mode 100644
index 0000000000000000000000000000000000000000..357f4d346352c12f5352167b23c8f9a027610a6d
GIT binary patch
literal 47
zcmV+~0MP#cK&_Pk(EFkdzau~ZodqDu(DtbSg&?T{g(0c`g(9gFg(FM@AWT{wOrRc2
F00GTE5lsL9

literal 0
HcmV?d00001

diff --git a/xa/tests/adrm/a.out-zab2 b/xa/tests/adrm/a.out-zab2
new file mode 100644
index 0000000000000000000000000000000000000000..766f58ca09b20d72307d8dce0cbc34491159bec6
GIT binary patch
literal 46
zcmV+}0MY*dK&_Pk(EFkdy&^!J1t7}M_o)DdAgKa{A*ug`BB>LFBTNGzOj;gHpdL&B
E0msh~O8@`>

literal 0
HcmV?d00001

diff --git a/xa/tests/adrm/a.out-zpa b/xa/tests/adrm/a.out-zpa
new file mode 100644
index 0000000000000000000000000000000000000000..b3392207b1a1cdf9a19c73b745acac25c281a6eb
GIT binary patch
literal 47
zcmV+~0MP#c0Iih((EFkdzaszuodqDu(DtbSg&?T{g(0c`g(9gFg(FM@AWT{wOrRc2
F00Fqa5X}Gp

literal 0
HcmV?d00001

diff --git a/xa/tests/adrm/a.out-zpa2 b/xa/tests/adrm/a.out-zpa2
new file mode 100644
index 0000000000000000000000000000000000000000..d7bbeed9b7077ab15e810d7076bdc7e7b21a6778
GIT binary patch
literal 46
zcmV+}0MY*d0Iih((EFkdy&?de1t7}M_o)DdAgKa{A*ug`BB>LFBTNGzOj;gHpdL&B
E0kh8#%K!iX

literal 0
HcmV?d00001

diff --git a/xa/tests/adrm/bip2.inc b/xa/tests/adrm/bip2.inc
new file mode 100644
index 0000000..3ad6318
--- /dev/null
+++ b/xa/tests/adrm/bip2.inc
@@ -0,0 +1,28 @@
+/*
+
+- tbasic.0.asm: if you make vecwri absolute with !, then the branch gets
+        generated as if it were NOT absolute. works okay without it (and
+        gets a warning)
+
+*/
+
+test	lda !$0095
+	bne test
+
+	ldx #13
+lup0	lda !vecwri,x
+	sta $2005,x
+	dex
+	bne lup0
+	lda #$00
+	sta $0020
+	lda #$02
+	sta $0021
+	lda #$ff
+	sta $0022
+	lda #$13
+	sta $0023
+	jmp $2003
+	
+vectors	.byt $4c, $5a, $1e, $4c, $a0, $1e, $4c, $00, $01
+vecwri	= vectors - 1
diff --git a/xa/tests/adrm/runtest.sh b/xa/tests/adrm/runtest.sh
index 929afe3..ccb8610 100755
--- a/xa/tests/adrm/runtest.sh
+++ b/xa/tests/adrm/runtest.sh
@@ -8,8 +8,24 @@ THISDIR=`pwd`
 echo "0=$0"
 echo "THISDIR=$THISDIR"
 
+declare -A opts
+#opts=([816.asm]="-w")
+opts[02.asm]="-C"
+opts[816.asm]="-w"
+opts[zab.asm]="-w"
+opts[zpa.asm]="-w"
+
+#ASMFLAGS=-v
+ASMFLAGS=
+
+# exclude filter from *.asm if no explicit file is given
 EXCLUDE=
-TESTFILES=
+
+# test files used
+TESTFILES="bip.inc bip2.inc"
+
+# files to compare afterwards, against <file>-<script>
+COMPAREFILES=a.out
 
 XA=$THISDIR/../../xa
 
@@ -172,7 +188,7 @@ else
         done;
 fi;
 
-echo "TESTSCRIPTS=$TESTSCRIPTS"
+#echo "TESTSCRIPTS=$TESTSCRIPTS"
 
 ########################
 # tmp names
@@ -207,6 +223,14 @@ for script in $TESTSCRIPTS; do
 
         echo "Run script $script"
 
+	AFLAGS="${ASMFLAGS} ${opts[$script]}"
+
+	ALOG=
+        if test "x$LOGFILE" = "x"; then
+		ALOG="-P $script.log"
+	else
+		ALOG="-P $LOGFILE"
+	fi
 
         # overwrite test files in each iteration, just in case
         for i in $TESTFILES; do
@@ -221,12 +245,8 @@ for script in $TESTSCRIPTS; do
                 ############################################
                 # simply do assemble
 
-                echo "Run assembler:" $XA $VERBOSE $script $TMPDIR 
-                if test "x$LOGFILE" = "x"; then
-			(cd $TMPDIR; $XA -o a.out -P $script.log $script)
-		else
-			(cd $TMPDIR; $XA -o a.out -P $LOGFILE $script)
-		fi
+                echo "Run assembler:" $XA $AFLAGS $script 
+		(cd $TMPDIR; $XA -o a.out $ALOG $AFLAGS $script)
                 RESULT=$?
 
                 if test $RESULT -eq 0; then
@@ -240,7 +260,7 @@ for script in $TESTSCRIPTS; do
                 for i in $DEBUG; do
                         echo "break $i" >> $DEBUGFILE
                 done;
-                gdb -x $DEBUGFILE -ex "run -o a.out -P $LOGFILE $script.asm" $XA
+               	gdb -x $DEBUGFILE -ex "run -o $TMPDIR/a.out $ALOG $AFLAGS $script" $XA
         fi;
 
         #echo "Killing server (pid $SERVERPID)"
@@ -272,6 +292,7 @@ for script in $TESTSCRIPTS; do
         if test $CLEAN -ge 1; then
                 rm -f $DEBUGFILE;
                 rm -f $TMPDIR/$script;
+                rm -f $TMPDIR/a.out;
         fi
 done;
 
diff --git a/xa/tests/adrm/zab2.asm b/xa/tests/adrm/zab2.asm
new file mode 100644
index 0000000..3278eb2
--- /dev/null
+++ b/xa/tests/adrm/zab2.asm
@@ -0,0 +1,4 @@
+	.word $4000
+	* = $4000
+
+#include "bip2.inc"
diff --git a/xa/tests/adrm/zpa2.asm b/xa/tests/adrm/zpa2.asm
new file mode 100644
index 0000000..85ab3b8
--- /dev/null
+++ b/xa/tests/adrm/zpa2.asm
@@ -0,0 +1,4 @@
+	.word $0000
+	* = $0000
+
+#include "bip2.inc"