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 59ad40f..7a16f49 100644 Binary files a/tools/tests/zasm/allinstrs.asm.expected and b/tools/tests/zasm/allinstrs.asm.expected differ 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__':