From 1ae51bea3a56be299d546aabf353133de64bb935 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Tue, 12 Nov 2019 20:47:09 -0500
Subject: [PATCH] tests: remove instr blacklist

Because scas isn't used as a reference anymore, no need to blacklist its bugs
anymore.
---
 tools/tests/zasm/allinstrs.asm          |   2 ++
 tools/tests/zasm/allinstrs.asm.expected | Bin 5634 -> 5640 bytes
 tools/tests/zasm/geninstrs.py           |  17 +++--------------
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/tools/tests/zasm/allinstrs.asm b/tools/tests/zasm/allinstrs.asm
index 09c9e0c..e48a0b2 100644
--- a/tools/tests/zasm/allinstrs.asm
+++ b/tools/tests/zasm/allinstrs.asm
@@ -65,6 +65,7 @@ ADD IY, DE
 ADD IY, IY
 ADD IY, SP
 AND (HL)
+AND (IX)
 AND (IX+1)
 AND (IX-1)
 AND (IX+10)
@@ -73,6 +74,7 @@ AND (IX+100)
 AND (IX-100)
 AND (IX+127)
 AND (IX-127)
+AND (IY)
 AND (IY+1)
 AND (IY-1)
 AND (IY+10)
diff --git a/tools/tests/zasm/allinstrs.asm.expected b/tools/tests/zasm/allinstrs.asm.expected
index 59ad40fd8967be77cac5383984d9fc1eae87938e..7a16f495df5a10dffed1553bdeb75761b3f3368c 100644
GIT binary patch
delta 39
xcmV+?0NDS6EQl<Sg&Y9grUBii|J|kv-KO^4rexiwoZY5>-KK&4rU0><XBDR>78d{j

delta 33
rcmV++0N($IEP^bMg%$zbrvKfh3f-pm-KJ#SrkvfTf8C~mv7u)bGG-F-

diff --git a/tools/tests/zasm/geninstrs.py b/tools/tests/zasm/geninstrs.py
index 9cb7950..0acf892 100755
--- a/tools/tests/zasm/geninstrs.py
+++ b/tools/tests/zasm/geninstrs.py
@@ -6,12 +6,6 @@
 
 import sys
 
-# Those lines below are improperly assembled by scas and are skipped by tests.
-BLACKLIST = {
-    "AND (IX)",
-    "AND (IY)",
-}
-
 argspecTbl = {
     'A': "A",
     'B': "B",
@@ -124,11 +118,6 @@ def eargs(args):
     newargs = ['$+'+s for s in args[:-1]]
     return newargs + ['$-'+s for s in args[:-1]]
 
-def p(line):
-    if line not in BLACKLIST:
-        print(line)
-
-
 def main():
     asmfile = sys.argv[1]
     with open(asmfile, 'rt') as fp:
@@ -164,11 +153,11 @@ def main():
                     if n in {'JR', 'DJNZ'} and a2 == 'n':
                         args2 = eargs(args2)
                     for arg2 in args2:
-                        p(f"{n} {arg1}, {arg2}")
+                        print(f"{n} {arg1}, {arg2}")
                 else:
-                    p(f"{n} {arg1}")
+                    print(f"{n} {arg1}")
         else:
-            p(n)
+            print(n)
     pass
 
 if __name__ == '__main__':