Add --zxnext option to the compiler

Author: boriel

tests/functional/no_zxnext.asm

@@ -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/test_cmdline.txt

@@ -10,8 +10,23 @@ usage: zxb [-h] [-d] [-O OPTIMIZE] [-o OUTPUT_FILE] [-T] [-t] [-B] [-a] [-A]
            [-D DEFINES] [-M MEMORY_MAP] [-i] [-I INCLUDE_PATH] [--strict]
            [--headerless] [--version] [--parse-only]
            [--append-binary APPEND_BINARY]
-           [--append-headless-binary APPEND_HEADLESS_BINARY]
+           [--append-headless-binary APPEND_HEADLESS_BINARY] [-N]
            PROGRAM
 zxb: error: Option --asm and --mmap cannot be used together
 
 >>> process_file('arrbase1.bas', ['-q', '-S', '-O -D EMPTY_MACRO'])
+
+>>> process_file('use_zxnext_asm.bas')
+
+>>> process_file('no_zxnext.asm')
+no_zxnext.asm:8: Syntax error. Unexpected token 'D' [D]
+no_zxnext.asm:9: Syntax error. Unexpected token 'A' [A]
+no_zxnext.asm:12: Syntax error. Unexpected token '513' [INTEGER]
+no_zxnext.asm:17: Syntax error. Unexpected token '17185' [INTEGER]
+no_zxnext.asm:23: Syntax error. Unexpected token '119' [INTEGER]
+no_zxnext.asm:29: Syntax error. Unexpected token 'C' [C]
+
+>>> process_file('no_zxnext.asm', ['-q', '-S', '-O --zxnext'])
+
+>>> process_file('zxnext_all.asm')
+

tests/functional/use_zxnext_asm.asm

@@ -0,0 +1,65 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+#line 0
+		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)
+#line 29
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	exx
+	pop iy
+	pop ix
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+ZXBASIC_USER_DATA:
+; Defines DATA END --> HEAP size is 0
+ZXBASIC_USER_DATA_END:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	END

tests/functional/use_zxnext_asm.bas

@@ -0,0 +1,33 @@
+#pragma zxnext = TRUE
+ASM
+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)
+END ASM
+

zxb.py

@@ -150,6 +150,8 @@ def main(args=None):
                         help='Appends binary to tape file (only works with -t or -T)')
     parser.add_argument('--append-headless-binary', default=[], action='append',
                         help='Appends binary to tape file (only works with -t or -T)')
+    parser.add_argument('-N', '--zxnext', action='store_true',
+                        help='Enables ZX Next asm extended opcodes')
 
     options = parser.parse_args(args=args)
 
@@ -174,6 +176,7 @@ def main(args=None):
     OPTIONS.memory_map.value = options.memory_map
     OPTIONS.strict.value = options.strict
     OPTIONS.headerless.value = options.headerless
+    OPTIONS.zxnext.value = options.zxnext
 
     OPTIONS.org.value = api.utils.parse_int(options.org)
     if OPTIONS.org.value is None: