Include conditional assembly to build the ZIP v1 and v2 interpreters.

Makefile

@@ -1,17 +1,45 @@
-all: zip.lst zip.bin check
+all: zip1.lst zip1.bin zip1-check \
+     zip2.lst zip2.bin zip2-check \
+     zip3.lst zip3.bin zip3-check
 
 %.p %.lst: %.asm
 	asl $< -o $*.p -L
 
-zip.bin: zip.p
-	p2bin -r '$$0800-$$21ff' zip.p
 
-check: zip.bin
-	echo "2050236bf501794d01b7610288eafcaf54a739f5caaf77c17a253e75f4928f1a zip.bin" | sha256sum -c -
+zip1.p zip1.lst: zip.asm
+	asl zip.asm -o zip1.p -L -OLIST zip1.lst -D iver=1
+
+zip1.bin: zip1.p
+	p2bin -r '$$0800-$$21ff' zip1.p
+
+zip1-check: zip1.bin
+	echo "f8794ae41175b27a80af3a11a049d2696b16b560541b20be03d64efc0278286f zip1.bin" | sha256sum -c -
+
+
+zip2.p zip2.lst: zip.asm
+	asl zip.asm -o zip2.p -L -OLIST zip2.lst -D iver=2
+
+zip2.bin: zip2.p
+	p2bin -r '$$0800-$$21ff' zip2.p
+
+zip2-check: zip2.bin
+	echo "137bc760bf92fe1ab0054c03e0d253d8d21933a24ff23f09c88db851bbd18762 zip2.bin" | sha256sum -c -
+
+
+zip3.p zip3.lst: zip.asm
+	asl zip.asm -o zip3.p -L -OLIST zip3.lst -D iver=3
+
+zip3.bin: zip3.p
+	p2bin -r '$$0800-$$21ff' zip3.p
+
+zip3-check: zip3.bin
+	echo "2050236bf501794d01b7610288eafcaf54a739f5caaf77c17a253e75f4928f1a zip3.bin" | sha256sum -c -
+
+
+
 
 clean:
-	rm liron-if.bin *.p *.lst
+	rm -f zip[23].{p,lst,bin}
 
-check:
 
 .PRECIOUS: %.lst

zipmac.inc

@@ -466,6 +466,23 @@ rtsmi	macro	adr
 label:
 	endm
 
+
+rtop:	macro
+	if	iver<iver3
+	jmp	mnloop
+	else
+	rts
+	endif
+	endm
+
+
+rtopeq:	macro
+	bne	label
+	rtop
+label:
+	endm
+
+
 dtst	macro	addr
 	lda	addr+1
 	ora	addr
@@ -716,6 +733,11 @@ cmpre	macro	adr1
 	rtseq
 	endm
 
+cmprn	macro	adr1
+	cmp	adr1
+	rtsne
+	endm
+
 cpxbe	macro	adr1,adr2
 	cpx	adr1
 	beq	adr2
@@ -735,3 +757,13 @@ cpybn	macro	adr1,adr2
 	cpy	adr1
 	bne	adr2
 	endm
+
+fillto	macro	addr, val
+	while	* < addr
+size	set	addr-*
+	if	size > 256
+size	set	256
+	endif
+	fcb	[size] val
+	endm
+	endm