izaya
/
collapseos
mirror of https://github.com/hsoft/collapseos.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tests: remove instr blacklist 

Because scas isn't used as a reference anymore, no need to blacklist its bugs
anymore.
This commit is contained in:
Virgil Dupras 2019-11-12 20:47:09 -05:00
parent 39f3637c60
commit 1ae51bea3a
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/tests/zasm/allinstrs.asm
View File

@ -65,6 +65,7 @@ ADD IY, DE
ADD IY, IY ADD IY, IY
ADD IY, SP ADD IY, SP
AND (HL) AND (HL)
AND (IX)
AND (IX+1) AND (IX+1)
AND (IX-1) AND (IX-1)
AND (IX+10) AND (IX+10)
@ -73,6 +74,7 @@ AND (IX+100)
AND (IX-100) AND (IX-100)
AND (IX+127) AND (IX+127)
AND (IX-127) AND (IX-127)
AND (IY)
AND (IY+1) AND (IY+1)
AND (IY-1) AND (IY-1)
AND (IY+10) AND (IY+10)

BIN
tools/tests/zasm/allinstrs.asm.expected
View File

Binary file not shown.

17
tools/tests/zasm/geninstrs.py
View File

@ -6,12 +6,6 @@
import sys import sys
# Those lines below are improperly assembled by scas and are skipped by tests.
BLACKLIST = {
"AND (IX)",
"AND (IY)",
}
argspecTbl = { argspecTbl = {
'A': "A", 'A': "A",
'B': "B", 'B': "B",
@ -124,11 +118,6 @@ def eargs(args):
newargs = ['$+'+s for s in args[:-1]] newargs = ['$+'+s for s in args[:-1]]
return 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(): def main():
asmfile = sys.argv[1] asmfile = sys.argv[1]
with open(asmfile, 'rt') as fp: with open(asmfile, 'rt') as fp:
@ -164,11 +153,11 @@ def main():
if n in {'JR', 'DJNZ'} and a2 == 'n': if n in {'JR', 'DJNZ'} and a2 == 'n':
args2 = eargs(args2) args2 = eargs(args2)
for arg2 in args2: for arg2 in args2:
p(f"{n} {arg1}, {arg2}") print(f"{n} {arg1}, {arg2}")
else: else:
p(f"{n} {arg1}") print(f"{n} {arg1}")
else: else:
p(n) print(n)
pass pass
if __name__ == '__main__': if __name__ == '__main__':