diff --git a/tests/testsuite.py b/tests/testsuite.py index 63d7692..b8f6718 100644 --- a/tests/testsuite.py +++ b/tests/testsuite.py @@ -11,6 +11,7 @@ def __str__(self): def runTest(self): TESTS = ( + (b'\xcb\x30', 'sll b'), (b'\xdd\xe5', 'push ix'), (b'\xfd\xe1', 'pop iy'), (b'\xed\x50', 'in d, (c)'), diff --git a/z80/__init__.py b/z80/__init__.py index d7fcdad..64b55c0 100644 --- a/z80/__init__.py +++ b/z80/__init__.py @@ -11,7 +11,8 @@ from ._error import Error from ._instr import (ADD, ADC, AND, CP, OR, SBC, SUB, XOR, BIT, CALL, CCF, CPL, DAA, DEC, DI, DJNZ, EI, EX, EXX, HALT, IM, INC, IN, JP, - JR, LD, LDDR, LDIR, NEG, NOP, RLC, RL, RR, RRC, SLA, SRA, + JR, LD, LDDR, LDIR, NEG, NOP, + RLC, RL, RR, RRC, SLA, SLL, SRA, SRL, OUT, OUTI, POP, PUSH, RES, RET, RLA, RLCA, RLD, RRA, RRCA, RST, SCF, SET, A, AF, AF2, CF, M, NC, NZ, PO, P, Z, DE, diff --git a/z80/_disasm.py b/z80/_disasm.py index b9f4582..657840f 100644 --- a/z80/_disasm.py +++ b/z80/_disasm.py @@ -15,7 +15,8 @@ from ._error import Error from ._instr import (ADD, ADC, AND, CP, OR, SBC, SUB, XOR, BIT, CALL, CCF, CPL, DAA, DEC, DI, DJNZ, EI, EX, EXX, HALT, IM, INC, IN, JP, - JR, LD, LDDR, LDIR, NEG, NOP, RLC, RL, RR, RRC, SLA, SRA, + JR, LD, LDDR, LDIR, NEG, NOP, + RLC, RL, RR, RRC, SLA, SLL, SRA, SRL, OUT, OUTI, POP, PUSH, RES, RET, RLA, RLCA, RLD, RRA, RRCA, RST, SCF, SET, A, AF, AF2, CF, M, NC, NZ, PO, P, Z, DE, @@ -168,6 +169,7 @@ class Z80InstrBuilder(object): 'Orr': RR, 'Orrc': RRC, 'Osla': SLA, + 'Osll': SLL, 'Osra': SRA, 'Osrl': SRL, 'out': OUT, diff --git a/z80/_instr.py b/z80/_instr.py index bdbc32e..4812ec6 100644 --- a/z80/_instr.py +++ b/z80/_instr.py @@ -404,6 +404,10 @@ class SLA(Instr): pass +class SLL(Instr): + pass + + class SRA(Instr): pass