Merge pull request #310 from boriel/feature/refactorize_z80

Move z80 opcodes listing into zxbasm

Author: boriel

arch/zx48k/optimizer/asm.py

@@ -2,7 +2,7 @@
 
 from .patterns import RE_OUTC, RE_INDIR16
 from .helpers import single_registers
-import z80
+from zxbasm import z80
 
 # Dict of patterns to normalized instructions. I.e. 'ld a, 5' -> 'LD A,N'
 Z80_PATTERN = {}

zxbasm/asm.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # vim: ts=4:et:sw=4
 
-from z80 import Opcode, Z80SET
+from zxbasm.z80 import Opcode, Z80SET
 from api.errors import Error
 import re
 

zxbasm/asmparse.py

@@ -13,7 +13,7 @@
 
 import os
 import re
-from zxbasm import asmlex
+from zxbasm import asmlex, basic
 import ply.yacc as yacc
 
 from zxbasm.asmlex import tokens  # noqa
@@ -1501,7 +1501,6 @@ def generate_binary(outputfname, format_, progname='', binary_files=None, headle
         progname = os.path.basename(outputfname)[:10]
 
     if OPTIONS.use_loader.value:
-        import basic  # Minimalist basic tokenizer
 
         program = basic.Basic()
         if org > 16383:  # Only for zx48k: CLEAR if above 16383