Merge pull request #298 from boriel/feature/zx_next_asm

Feature/zx next asm

Author: boriel

api/config.py

@@ -68,6 +68,7 @@ def init():
     OPTIONS.add_option('explicit', bool, False)
     OPTIONS.add_option('Sinclair', bool, False)
     OPTIONS.add_option('strict', bool, False)  # True to force type checking
+    OPTIONS.add_option('zxnext', bool, False)  # True to enable ZX Next ASM opcodes
 
 
 init()

asmlex.py

@@ -93,6 +93,31 @@
     'xor': 'XOR',
 }
 
+zx_next_mnemonics = {
+    x.lower(): x for x in [
+        "LDIX",
+        "LDWS",
+        "LDIRX",
+        "LDDX",
+        "LDDRX",
+        "LDPIRX",
+        "OUTINB",
+        "MUL",
+        "SWAPNIB",
+        "MIRROR",
+        "NEXTREG",
+        "PIXELDN",
+        "PIXELAD",
+        "SETAE",
+        "TEST",
+        "BSLA",
+        "BSRA",
+        "BSRL",
+        "BSRF",
+        "BRLC"
+    ]
+}
+
 pseudo = {  # pseudo ops
     'align': 'ALIGN',
     'org': 'ORG',
@@ -154,6 +179,7 @@
     tuple(regs8.values()) +
     tuple(regs16.values()) +
     tuple(flags.values()) +
+    tuple(zx_next_mnemonics.values()) +
     tuple(preprocessor.values())
 )
 
@@ -162,7 +188,8 @@
     regs16.keys()).union(
     regs8.keys()).union(
     pseudo.keys()).union(
-    reserved_instructions.keys())
+    reserved_instructions.keys()).union(
+    zx_next_mnemonics.keys())
 
 
 def get_uniques(l):
@@ -273,6 +300,11 @@ def t_INITIAL_ID(self, t):
         if t.type is not None:
             return t
 
+        if OPTIONS.zxnext.value:
+            t.type = zx_next_mnemonics.get(id_)
+            if t.type is not None:
+                return t
+
         t.type = regs16.get(id_, 'ID')
         if t.type == 'ID':
             t.value = tmp  # Restores original value

asmparse.py

@@ -1455,7 +1455,12 @@ def assemble(input_):
     if MEMORY is None:
         MEMORY = Memory()
 
-    parser.parse(input_, lexer=LEXER, debug=OPTIONS.Debug.value > 2)
+    if OPTIONS.zxnext.value:
+        parser_ = zxnext_parser
+    else:
+        parser_ = parser
+
+    parser_.parse(input_, lexer=LEXER, debug=OPTIONS.Debug.value > 2)
     if len(MEMORY.scopes):
         error(MEMORY.scopes[-1], 'Missing ENDP to close this scope')
 
@@ -1541,4 +1546,13 @@ def main(argv):
     generate_binary(OPTIONS.outputFileName.value, OPTIONS.output_file_type)
 
 
-parser = api.utils.get_or_create('asmparse', lambda: yacc.yacc(debug=OPTIONS.Debug.value > 2))
+# Z80 only ASM parser
+parser = api.utils.get_or_create('asmparse',
+                                 lambda: yacc.yacc(start="start", debug=OPTIONS.Debug.value > 2))
+
+# needed for ply
+from zxnext import *  # noqa
+
+# ZXNEXT extended OPcodes parser
+zxnext_parser = api.utils.get_or_create('zxnext_asmparse',
+                                        lambda: yacc.yacc(start="start", debug=OPTIONS.Debug.value > 2))

parsetab/tabs.dbm.bak

@@ -1,3 +1,4 @@
 'zxbppparse', (0, 68810)
-'zxbparser', (69120, 707013)
-'asmparse', (776192, 250068)
+'asmparse', (69120, 250081)
+'zxnext_asmparse', (319488, 280962)
+'zxbparser', (600576, 707013)

parsetab/tabs.dbm.dat

@@ -1,3 +1,4 @@
 'zxbppparse', (0, 68810)
-'zxbparser', (69120, 707013)
-'asmparse', (776192, 250068)
+'asmparse', (69120, 250081)
+'zxnext_asmparse', (319488, 280962)
+'zxbparser', (600576, 707013)

parsetab/tabs.dbm.dir

@@ -73,4 +73,5 @@ def test_initted_values(self):
                                                                  'strict',
                                                                  'strictBool',
                                                                  'string_base',
-                                                                 'use_loader'])
+                                                                 'use_loader',
+                                                                 'zxnext'])

tests/api/test_config.py

@@ -0,0 +1,30 @@
+LDIX
+LDWS
+LDIRX
+LDDX
+LDDRX
+LDPIRX
+OUTINB
+MUL D,E
+ADD HL,A
+ADD DE,A
+ADD BC,A
+ADD HL,0201h
+ADD DE,0201h
+ADD BC,0201h
+SWAPNIB
+MIRROR
+PUSH 4321h
+NEXTREG 37h,38h
+NEXTREG 33h,A
+PIXELDN
+PIXELAD
+SETAE
+TEST 77h
+BSLA DE,B
+BSRA DE,B
+BSRL DE,B
+BSRF DE,B
+BRLC DE,B
+JP (C)
+

tests/functional/no_zxnext.asm

@@ -320,6 +320,8 @@ def testASM(fname, inline=None, cmdline_args=None):
             os.unlink(okfile)
 
     options = [fname, '-o', tfname] + prep
+    if fname.startswith('zxnext_'):
+        options.append('--zxnext')
     options.extend(cmdline_args)
 
     if inline:

tests/functional/test.py

@@ -12,7 +12,11 @@
 
 @pytest.mark.parametrize('fname', [os.path.join(TEST_PATH, f) for f in os.listdir(TEST_PATH) if f.endswith(".asm")])
 def test_asm(fname):
-    test.main(['-d', '-e', '/dev/null', fname])
+    options = ['-d', '-e', '/dev/null', fname]
+    if os.path.basename(fname).startswith('zxnext_'):
+        options.extend(['-O=-N'])
+
+    test.main(options)
     if test.COUNTER == 0:
         return