From 62391aa514ccf9967fc6eb90e39882047ff97f77 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sun, 25 Feb 2018 01:08:14 -0500
Subject: [PATCH] chiptune_player: implemented stepwise lz4

better, but still not acceptable
---
 asm_routines/lz4_decode_step.s      | 219 ++++++++++++++++++++++++++++
 chiptune_player/Makefile            |   2 +-
 chiptune_player/TODO                |   2 +
 chiptune_player/chiptune_player.dsk | Bin 143360 -> 143360 bytes
 chiptune_player/chiptune_player.s   |  32 +++-
 chiptune_player/interrupt_handler.s |  28 +++-
 chiptune_player/zp.inc              |  12 +-
 gr-sim/lz4d_verbose.c               |   6 +-
 8 files changed, 279 insertions(+), 22 deletions(-)
 create mode 100644 asm_routines/lz4_decode_step.s

diff --git a/asm_routines/lz4_decode_step.s b/asm_routines/lz4_decode_step.s
new file mode 100644
index 00000000..a0a30b06
--- /dev/null
+++ b/asm_routines/lz4_decode_step.s
@@ -0,0 +1,219 @@
+; Stepwise LZ4 data decompressor for Apple II
+; Only decodes X tokens before returning
+
+; Code by Peter Ferrie (qkumba) (peter.ferrie@gmail.com)
+; "LZ4 unpacker in 143 bytes (6502 version) (2013)"
+;    http://pferrie.host22.com/misc/appleii.htm
+; This is that code, but with comments and labels added for clarity.
+; I also found a bug when decoding with runs of multiples of 256
+;   which has since been fixed upstream.
+
+; For LZ4 reference see
+; https://github.com/lz4/lz4/wiki/lz4_Frame_format.md
+
+; LZ4 summary:
+;
+; HEADER:
+;       Should: check for magic number 04 22 4d 18
+;	FLG: 64 in our case (01=version, block.index=1, block.checksum=0
+;		size=0, checksum=1, reserved
+;	MAX Blocksize: 40 (64kB)
+;	HEADER CHECKSUM: a7
+;	BLOCK HEADER: 4 bytes (le)  If highest bit set, uncompressed!
+; BLOCKS:
+;	Token byte.  High 4-bits literal length, low 4-bits copy length
+;	+ If literal length==15, then following byte gets added to length
+;	  If that byte was 255, then keep adding bytes until not 255
+;       + The literal bytes follow.  There may be zero of them
+;	+ Next is block copy info.  little-endian 2-byte offset to
+;	  be subtracted from current read position indicating source
+;	+ The low 4-bits of the token are the copy length, which needs
+;         4 added to it.  As with the literal length, if it is 15 then
+;	  you read a byte and add (and if that byte is 255, keep adding)
+
+;LZ4_SRC	EQU $00
+;LZ4_DST	EQU $02
+;LZ4_END	EQU $04
+;COUNT		EQU $06
+;DELTA		EQU $08
+
+;UNPACK_BUFFER	EQU $5E00	; offset of first unpacked byte
+
+
+	;======================
+	; LZ4 decode
+	;======================
+	; input buffer in LZ4_SRC
+        ; output buffer hardcoded still
+	; size in ENDH:ENDL
+
+lz4_decode_setup:
+
+	lda	LZ4_SRC	 		; packed data offset
+	clc
+	adc	LZ4_END
+	sta	LZ4_END
+	lda	LZ4_SRC+1
+	adc	LZ4_END+1
+	sta	LZ4_END+1
+
+	lda	#>UNPACK_BUFFER		; original unpacked data offset
+	sta	LZ4_DST+1
+	lda	#<UNPACK_BUFFER
+	sta	LZ4_DST
+
+	rts
+
+lz4_decode_step:
+	ldy	#0			; used to index, always zero
+
+parsetoken:
+	jsr	getsrc			; get next token
+	pha				; save for later (need bottom 4 bits)
+
+	lsr				; number of literals in top 4 bits
+	lsr				; so shift into place
+	lsr
+	lsr
+	beq	copymatches		; if zero, then no literals
+					; jump ahead and copy
+
+	jsr	buildcount		; add up all the literal sizes
+					; result is in ram[count+1]-1:A
+	tax				; now in ram[count+1]-1:X
+	jsr	docopy			; copy the literals
+
+	lda	LZ4_SRC			; 16-bit compare
+	cmp	LZ4_END			; to see if we have reached the end
+	lda	LZ4_SRC+1
+	sbc	LZ4_END+1
+	bcs	done
+
+copymatches:
+	jsr	getsrc			; get 16-bit delta value
+	sta	DELTA
+	jsr	getsrc
+	sta	DELTA+1
+
+	pla				; restore token
+	and	#$0f			; get bottom 4 bits
+					; match count.  0 means 4
+					; 15 means 19+, must be calculated
+
+	jsr	buildcount		; add up count bits, in ram[count+1]-:A
+
+	clc
+	adc	#4			; adjust count by 4 (minmatch)
+
+	tax				; now in ramp[count+1]-1:X
+
+	beq	copy_no_adjust		; BUGFIX, don't increment if
+					;	exactly a multiple of 0x100
+	bcc	copy_no_adjust
+
+	inc	COUNT+1			; increment if we overflowed
+copy_no_adjust:
+
+	lda	LZ4_SRC+1			; save src on stack
+	pha
+	lda	LZ4_SRC
+	pha
+
+	sec				; subtract delta
+	lda	LZ4_DST			; from destination, make new src
+	sbc	DELTA
+	sta	LZ4_SRC
+	lda	LZ4_DST+1
+	sbc	DELTA+1
+	sta	LZ4_SRC+1
+
+	jsr	docopy			; do the copy
+
+	pla				; restore the src
+	sta	LZ4_SRC
+	pla
+	sta	LZ4_SRC+1
+
+	clc				; c==0 means not done
+
+	rts
+
+;	jmp	parsetoken		; back to parsing tokens
+
+done:
+	pla
+	sec				; c=1 means done
+
+	rts
+
+
+
+	;=========
+	; getsrc
+	;=========
+	; gets byte from src into A, increments pointer
+getsrc:
+	lda	(LZ4_SRC), Y		; get a byte from src
+	inc	LZ4_SRC			; increment pointer
+	bne	done_getsrc		; update 16-bit pointer
+	inc	LZ4_SRC+1			; on 8-bit overflow
+done_getsrc:
+	rts
+
+	;============
+	; buildcount
+	;============
+buildcount:
+	ldx	#1			; high count starts at 1
+	stx	COUNT+1			; (loops at zero?)
+	cmp	#$0f			; if LITERAL_COUNT < 15, we are done
+	bne	done_buildcount
+buildcount_loop:
+	sta	COUNT			; save LITERAL_COUNT (15)
+	jsr	getsrc			; get the next byte
+	tax				; put in X
+	clc
+	adc	COUNT			; add new byte to old value
+	bcc	bc_8bit_oflow		; if overflow, increment high byte
+	inc	COUNT+1
+bc_8bit_oflow:
+	inx				; check if read value was 255
+	beq	buildcount_loop		; if it was, keep looping and adding
+done_buildcount:
+	rts
+
+	;============
+	; getput
+	;============
+	; gets a byte, then puts the byte
+getput:
+	jsr	getsrc
+	; fallthrough to putdst
+
+	;=============
+	; putdst
+	;=============
+	; store A into destination
+putdst:
+	sta 	(LZ4_DST), Y		; store A into destination
+	inc	LZ4_DST			; increment 16-bit pointer
+	bne	putdst_end		; if overflow, increment top byte
+	inc	LZ4_DST+1
+putdst_end:
+	rts
+
+	;=============================
+	; docopy
+	;=============================
+	; copies ram[count+1]-1:X bytes
+	; from src to dst
+docopy:
+
+docopy_loop:
+	jsr	getput			; get/put byte
+	dex				; decrement count
+	bne	docopy_loop		; if not zero, loop
+	dec	COUNT+1			; if zero, decrement high byte
+	bne	docopy_loop		; if not zero, loop
+
+	rts
diff --git a/chiptune_player/Makefile b/chiptune_player/Makefile
index 25b3a82b..1302dac2 100644
--- a/chiptune_player/Makefile
+++ b/chiptune_player/Makefile
@@ -32,7 +32,7 @@ CHIPTUNE_PLAYER:	chiptune_player.o
 chiptune_player.o:	chiptune_player.s \
 	../asm_routines/mockingboard.s \
 	../asm_routines/dos33_routines.s \
-	../asm_routines/lz4_decode.s \
+	../asm_routines/lz4_decode_step.s \
 	rasterbars.s volume_bars.s interrupt_handler.s \
 	chip_title.inc zp.inc
 	ca65 -o chiptune_player.o chiptune_player.s -l chiptune_player.lst
diff --git a/chiptune_player/TODO b/chiptune_player/TODO
index c46209fc..020c4f33 100644
--- a/chiptune_player/TODO
+++ b/chiptune_player/TODO
@@ -2,3 +2,5 @@
 + Right/Left arrows on screen
 + Keyboard, Right/Left/Pause
 + Calculate maximum decode time for songs
+
++ Put graphics update in interrupt routine, put debug in normal space
diff --git a/chiptune_player/chiptune_player.dsk b/chiptune_player/chiptune_player.dsk
index d5d8f4ed3c4a6646178e2254db79a7ff937661f8..73af1967cec1d0f34c5968a4f5e5815c715b9c00 100644
GIT binary patch
delta 2946
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

delta 1967
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
bWabNuZiL6HxfIvHm{)L<H$sO;r{#YEI7Osi

diff --git a/chiptune_player/chiptune_player.s b/chiptune_player/chiptune_player.s
index 617d02ed..b06713f6 100644
--- a/chiptune_player/chiptune_player.s
+++ b/chiptune_player/chiptune_player.s
@@ -293,12 +293,9 @@ read_size	EQU	$4000
 	adc	#0
 	sta	LZ4_SRC+1
 
-	; Fall through to next_subsong
 
-	;=================
-	; next sub-song
-	;=================
-next_subsong:
+	; Decompress first chunks
+
 	lda	#$0
 	sta	COPY_OFFSET
 	lda	#$3
@@ -306,6 +303,27 @@ next_subsong:
 	lda	#$20
 	sta	DECODER_STATE
 
+	jsr	setup_next_subsong
+
+	jsr	lz4_decode_setup
+
+our_lz4_loop:
+	jsr	lz4_decode_step
+	bcc	our_lz4_loop
+
+	rts
+
+	;=================
+	; next sub-song
+	;=================
+setup_next_subsong:
+;	lda	#$0
+;	sta	COPY_OFFSET
+;	lda	#$3
+;	sta	CHUNKSIZE
+;	lda	#$20
+;	sta	DECODER_STATE
+
 	ldy	#0
 
 	lda	(LZ4_SRC),Y		; get next size value
@@ -322,7 +340,7 @@ next_subsong:
 	adc	#0
 	sta	LZ4_SRC+1
 
-	jsr	lz4_decode		; decode
+;	jsr	lz4_decode		; decode
 
 					; tail-call?
 
@@ -430,7 +448,7 @@ krw_file:
 .include	"../asm_routines/gr_setpage.s"
 .include	"../asm_routines/dos33_routines.s"
 .include	"../asm_routines/gr_hlin.s"
-.include	"../asm_routines/lz4_decode.s"
+.include	"../asm_routines/lz4_decode_step.s"
 .include	"rasterbars.s"
 .include	"volume_bars.s"
 .include	"interrupt_handler.s"
diff --git a/chiptune_player/interrupt_handler.s b/chiptune_player/interrupt_handler.s
index 4b42fc2e..7442338c 100644
--- a/chiptune_player/interrupt_handler.s
+++ b/chiptune_player/interrupt_handler.s
@@ -166,7 +166,12 @@ handle_copy:
 	jmp	increment_offset					; 3
 
 decompress_step:
-	; TODO
+	lda	LZ4_DONE
+	bne	increment_offset
+
+	jsr	lz4_decode_step
+	bcc	increment_offset
+	inc	LZ4_DONE
 
 	;==============================================
 	; incremement offset.  If 0 move to next chunk
@@ -193,13 +198,22 @@ increment_offset:
 start_c:
 	lda	#1
 	sta	CHUNKSIZE
+
+	; setup next three chunks of song
+	jsr	setup_next_subsong		; and decompress next	; 6
+	jsr	lz4_decode_setup
+	lda	#0
+	sta	LZ4_DONE
+
 	jmp	back_to_first_reg
 
 wraparound_to_a:
-	; setup next three chunks of song
-
-	jsr	next_subsong		; and decompress next		; 6
-
+	lda	#$0
+	sta	COPY_OFFSET
+	lda	#$3
+	sta	CHUNKSIZE
+	lda	#$20
+	sta	DECODER_STATE
 
 	;==============================
 	; After 14th reg, reset back to
@@ -224,12 +238,12 @@ back_to_first_reg_a:
 back_to_first_reg_c:
 	lda	#>(UNPACK_BUFFER+$2A00)	; in proper chunk (1 of 3)	; 2
 
+update_r0_pointer:
+	sta	INH		; update r0 pointer			; 3
 
 								;============
 								;        18
 
-update_r0_pointer:
-	sta	INH		; update r0 pointer			; 3
 
 	;=================================
 	; Finally done with this interrupt
diff --git a/chiptune_player/zp.inc b/chiptune_player/zp.inc
index f62ae018..3bdfda40 100644
--- a/chiptune_player/zp.inc
+++ b/chiptune_player/zp.inc
@@ -1,11 +1,10 @@
 .define EQU =
 
-LZ4_SRC	EQU $00
-LZ4_DST	EQU $02
-LZ4_END	EQU $04
-COUNT	EQU $06
-DELTA	EQU $08
-
+LZ4_SRC		EQU $00
+LZ4_DST		EQU $02
+LZ4_END		EQU $04
+COUNT		EQU $06
+DELTA		EQU $08
 
 ;; Zero page monitor routines addresses
 
@@ -85,6 +84,7 @@ DECODER_STATE	EQU $7F
 				;NUM1L		EQU $7E
 				;NUM1H		EQU $7F
 CHUNKSIZE	EQU $80
+LZ4_DONE	EQU $81
 
 A_COLOR		EQU $83
 B_COLOR		EQU $84
diff --git a/gr-sim/lz4d_verbose.c b/gr-sim/lz4d_verbose.c
index fbd9ce59..114cbdfc 100644
--- a/gr-sim/lz4d_verbose.c
+++ b/gr-sim/lz4d_verbose.c
@@ -109,6 +109,7 @@ int main(int argc, char **argv) {
 	FILE *fff;
 	int size;
 	short orgoff,paksize,pakoff;
+	int token_count=0;
 
 	init_6502();
 
@@ -186,7 +187,8 @@ int main(int argc, char **argv) {
 	y=0;				// used for offset	//ldy	#0
 
 parsetoken:
-	printf("LOAD TOKEN: ");
+	token_count++;
+	printf("LOAD TOKEN %d: ",token_count);
 	getsrc();						// jsr	getsrc
 					// get token
 	pha();				// save for later	// pha
@@ -290,6 +292,8 @@ done:
 
 	printf("Out size=%d\n",out_size);
 
+	printf("Total tokens: %d\n",token_count);
+
 	fwrite(&ram[ORGOFFSET],1,out_size,fff);
 
 	fclose(fff);