Fix wrong opcode allowed

This fixes issue #172

Author: boriel

src/libzxbasm/asmlex.py

@@ -18,7 +18,7 @@
 from src.api.errmsg import error
 
 _tokens = ('STRING', 'NEWLINE', 'CO',
-           'ID', 'COMMA', 'PLUS', 'MINUS', 'LP', 'RP', 'LPP', 'RPP', 'MUL', 'DIV', 'POW', 'MOD',
+           'ID', 'COMMA', 'PLUS', 'MINUS', 'LB', 'RB', 'LP', 'RP', 'LPP', 'RPP', 'MUL', 'DIV', 'POW', 'MOD',
            'UMINUS', 'APO', 'INTEGER', 'ADDR',
            'LSHIFT', 'RSHIFT', 'BAND', 'BOR', 'BXOR'
            )
@@ -325,14 +325,22 @@ def t_ADDR(self, t):
         r'\$'
         return t
 
+    def t_LB(self, t):
+        r'\['
+        return t
+
+    def t_RB(self, t):
+        r'\]'
+        return t
+
     def t_LP(self, t):
-        r'[\[(]'
+        r'\('
         if t.value != '[' and OPTIONS.bracket:
             t.type = 'LPP'
         return t
 
     def t_RP(self, t):
-        r'[])]'
+        r'\)'
         if t.value != ']' and OPTIONS.bracket:
             t.type = 'RPP'
         return t

src/libzxbasm/asmparse.py

@@ -825,6 +825,7 @@ def p_asm_ldr8_ind(p):
 
 def p_reg8_hl(p):
     """ reg8_hl : LP HL RP
+                | LB HL RB
     """
     p[0] = '(HL)'
 
@@ -836,6 +837,12 @@ def p_ind8_I(p):
                | LP IX MINUS pexpr RP
                | LP IY PLUS pexpr RP
                | LP IY MINUS pexpr RP
+               | LB IX expr RB
+               | LB IY expr RB
+               | LB IX PLUS pexpr RB
+               | LB IX MINUS pexpr RB
+               | LB IY PLUS pexpr RB
+               | LB IY MINUS pexpr RB
     """
     if len(p) == 6:
         expr = p[4]
@@ -965,9 +972,10 @@ def p_LD_regI_val(p):
 def p_JP_hl(p):
     """ asm : JP reg8_hl
             | JP LP reg16i RP
+            | JP LB reg16i RB
     """
     s = 'JP '
-    if p[2] == '(HL)':
+    if p[2] in ('(HL)', '[HL]'):
         s += p[2]
     else:
         s += '(%s)' % p[3]
@@ -1073,6 +1081,9 @@ def p_LD_addr_reg(p):  # Load address,reg
     """ asm : LD pexpr COMMA A
             | LD pexpr COMMA reg16
             | LD pexpr COMMA SP
+            | LD mem_indir COMMA A
+            | LD mem_indir reg16
+            | LD mem_indir SP
     """
     p[0] = Asm(p.lineno(1), 'LD (NN),%s' % p[4], p[2])
 
@@ -1081,6 +1092,9 @@ def p_LD_reg_addr(p):  # Load address,reg
     """ asm : LD A COMMA pexpr
             | LD reg16 COMMA pexpr
             | LD SP COMMA pexpr
+            | LD A COMMA mem_indir
+            | LD reg16 COMMA mem_indir
+            | LD SP COMMA mem_indir
     """
     p[0] = Asm(p.lineno(1), 'LD %s,(NN)' % p[2], p[4])
 
@@ -1410,6 +1424,12 @@ def p_expr_lprp(p):
     p[0] = p[2]
 
 
+def p_mem_indir(p):
+    """ mem_indir : LB expr RB
+    """
+    p[0] = p[2]
+
+
 def p_expr_uminus(p):
     """ expr : MINUS expr %prec UMINUS
              | PLUS expr %prec UMINUS

src/parsetab/tabs.dbm.bak

@@ -1,4 +1,4 @@
 'zxbpp', (0, 72580)
-'asmparse', (72704, 254311)
-'zxnext_asmparse', (327168, 285299)
-'zxbparser', (612864, 711440)
+'asmparse', (72704, 270388)
+'zxnext_asmparse', (343552, 301035)
+'zxbparser', (644608, 711440)

src/parsetab/tabs.dbm.dat

@@ -1,4 +1,4 @@
 'zxbpp', (0, 72580)
-'asmparse', (72704, 254311)
-'zxnext_asmparse', (327168, 285299)
-'zxbparser', (612864, 711440)
+'asmparse', (72704, 270388)
+'zxnext_asmparse', (343552, 301035)
+'zxbparser', (644608, 711440)

src/parsetab/tabs.dbm.dir

@@ -0,0 +1,7 @@
+
+LD a, [ix + 0]
+LD [ix + 0], a
+
+LD a, [iy + 0]
+LD [iy + 0], a
+

tests/functional/asm_lb_ix_rb.asm

@@ -0,0 +1,5 @@
+
+ld d, [.c]
+
+.c:
+

tests/functional/asm_lb_ix_rb.bin

@@ -0,0 +1,10 @@
+
+JP (HL)
+JP [HL]
+
+JP (IX)
+JP [IX]
+
+JP (IY)
+JP [IY]
+

tests/functional/asm_wrong_opcode.asm

@@ -0,0 +1 @@
+����������