more m32 compatibility tests

merlintests.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+X=
+if [ "$1""L" != "L" ] ; then
+	X=_$1
+fi
+
 OUTDIR=./m32out
 
 rm -rf $OUTDIR
@@ -18,7 +23,7 @@ for S in $SRC ; do
 	BASE=${S/.S/}
 	BASE=${BASE/.s/}
 	cd ./testdata
-	merlin32 . $S 2>/dev/null >/dev/null
+	merlin32$X . $S 2>/dev/null >/dev/null
 	#merlin32 . $S 2>/dev/null 
 
 	R=?$

testdata/1000-allops-value-65816.S

@@ -5,7 +5,7 @@
 ZP       EQU   $FF
 ABS      EQU   $FEFF
 LONG     EQU   $FDFEFF
-MV0      EQU   ZP           ;Merlin 32 bug -- must use 8-bit constant, or
-MV1      EQU   ZP-1         ; '^' modifier is implicitly applied
+MV0      EQU   LONG           ;Merlin 32 bug -- must use 8-bit constant, or
+MV1      EQU   LONG-$10000         ; '^' modifier is implicitly applied
 
          PUT   allops-common-65816.S

testdata/3000-addresses.S

@@ -23,6 +23,6 @@ start	nop
 		lda #<long
 		lda #>long
 		lda	#^long
-		lda	#|long
+		lda	#long
 
 		lst off