diff --git a/asm/z80/unlzsa1_fast_v1.asm b/asm/z80/unlzsa1_fast_v1.asm index 8e2bda7..66e0f35 100644 --- a/asm/z80/unlzsa1_fast_v1.asm +++ b/asm/z80/unlzsa1_fast_v1.asm @@ -1,146 +1,155 @@ -; -; Speed-optimized LZSA1 decompressor by spke (v.1 03.1-22/08/2019, 107 bytes); -; -; The data must be compressed using the command line compressor by Emmanuel Marty -; The compression is done as follows: -; -; lzsa.exe -f1 -r -; -; where option -r asks for the generation of raw (frame-less) data. -; -; The decompression is done in the standard way: -; -; ld hl,FirstByteOfCompressedData -; ld de,FirstByteOfMemoryForDecompressedData -; call DecompressLZSA1 -; -; Backward compression is also supported; you can compress files backward using: -; -; lzsa.exe -f1 -r -b -; -; and decompress the resulting files using: -; -; ld hl,LastByteOfCompressedData -; ld de,LastByteOfMemoryForDecompressedData -; call DecompressLZSA1 -; -; (do not forget to uncomment the BACKWARD_DECOMPRESS option in the decompressor). -; -; Of course, LZSA compression algorithms are (c) 2019 Emmanuel Marty, -; see https://github.com/emmanuel-marty/lzsa for more information -; -; Drop me an email if you have any comments/ideas/suggestions: zxintrospec@gmail.com -; -; This software is provided 'as-is', without any express or implied -; warranty. In no event will the authors be held liable for any damages -; arising from the use of this software. -; -; Permission is granted to anyone to use this software for any purpose, -; including commercial applications, and to alter it and redistribute it -; freely, subject to the following restrictions: -; -; 1. The origin of this software must not be misrepresented; you must not -; claim that you wrote the original software. If you use this software -; in a product, an acknowledgment in the product documentation would be -; appreciated but is not required. -; 2. Altered source versions must be plainly marked as such, and must not be -; misrepresented as being the original software. -; 3. This notice may not be removed or altered from any source distribution. - -; DEFINE BACKWARD_DECOMPRESS - - IFNDEF BACKWARD_DECOMPRESS - - MACRO NEXT_HL - inc hl - ENDM - - MACRO ADD_OFFSET - ex de,hl : add hl,de - ENDM - - MACRO BLOCKCOPY - ldir - ENDM - - ELSE - - MACRO NEXT_HL - dec hl - ENDM - - MACRO ADD_OFFSET - ex de,hl : ld a,e : sub l : ld l,a - ld a,d : sbc h : ld h,a ; 4*4+3*4 = 28t / 7 bytes - ENDM - - MACRO BLOCKCOPY - lddr - ENDM - - ENDIF - -@DecompressLZSA1: - ld b,0 : jr ReadToken - -NoLiterals: xor (hl) : NEXT_HL - push de : ld e,(hl) : jp m,LongOffset - - ; short matches have length 0+3..14+3 -ShortOffset: ld d,#FF : add 3 : cp 15+3 : jr nc,LongerMatch - - ; placed here this saves a JP per iteration -CopyMatch: ld c,a -.UseC NEXT_HL : ex (sp),hl ; BC = len, DE = offset, HL = dest, SP ->[dest,src] - ADD_OFFSET ; BC = len, DE = dest, HL = dest-offset, SP->[src] - BLOCKCOPY : pop hl ; BC = 0, DE = dest, HL = src - -ReadToken: ; first a byte token "O|LLL|MMMM" is read from the stream, - ; where LLL is the number of literals and MMMM is - ; a length of the match that follows after the literals - ld a,(hl) : and #70 : jr z,NoLiterals - - cp #70 : jr z,MoreLiterals ; LLL=7 means 7+ literals... - rrca : rrca : rrca : rrca ; LLL<7 means 0..6 literals... - - ld c,a : ld a,(hl) : NEXT_HL - BLOCKCOPY - - ; next we read the first byte of the offset - push de : ld e,(hl) - ; the top bit of token is set if the offset contains two bytes - and #8F : jp p,ShortOffset - -LongOffset: ; read second byte of the offset - NEXT_HL : ld d,(hl) - add -128+3 : cp 15+3 : jp c,CopyMatch - - ; MMMM=15 indicates a multi-byte number of literals -LongerMatch: NEXT_HL : add (hl) : jr nc,CopyMatch - - ; the codes are designed to overflow; - ; the overflow value 1 means read 1 extra byte - ; and overflow value 0 means read 2 extra bytes -.code1 NEXT_HL : ld b,a : ld c,(hl) : jr nz,CopyMatch.UseC -.code0 NEXT_HL : ld b,(hl) - - ; the two-byte match length equal to zero - ; designates the end-of-data marker - ld a,b : or c : jr nz,CopyMatch.UseC - pop de : ret - -MoreLiterals: ; there are three possible situations here - xor (hl) : NEXT_HL : exa - ld a,7 : add (hl) : NEXT_HL : jr c,ManyLiterals - -CopyLiterals: ld c,a -.UseC BLOCKCOPY - - push de : ld e,(hl) - exa : jp p,ShortOffset : jr LongOffset - -ManyLiterals: -.code1 ld b,a : ld c,(hl) : NEXT_HL : jr nz,CopyLiterals.UseC -.code0 ld b,(hl) : NEXT_HL : jr CopyLiterals.UseC - - +; +; Speed-optimized LZSA1 decompressor by spke (v.2 03/04/2019-27/08/2019; 111 bytes); +; with improvements by uniabis (30/07/2019,22/08/2019; -3 bytes, +3% speed). +; +; The data must be compressed using the command line compressor by Emmanuel Marty +; The compression is done as follows: +; +; lzsa.exe -f1 -r +; +; where option -r asks for the generation of raw (frame-less) data. +; +; The decompression is done in the standard way: +; +; ld hl,FirstByteOfCompressedData +; ld de,FirstByteOfMemoryForDecompressedData +; call DecompressLZSA1 +; +; Backward compression is also supported; you can compress files backward using: +; +; lzsa.exe -f1 -r -b +; +; and decompress the resulting files using: +; +; ld hl,LastByteOfCompressedData +; ld de,LastByteOfMemoryForDecompressedData +; call DecompressLZSA1 +; +; (do not forget to uncomment the BACKWARD_DECOMPRESS option in the decompressor). +; +; Of course, LZSA compression algorithms are (c) 2019 Emmanuel Marty, +; see https://github.com/emmanuel-marty/lzsa for more information +; +; Drop me an email if you have any comments/ideas/suggestions: zxintrospec@gmail.com +; +; This software is provided 'as-is', without any express or implied +; warranty. In no event will the authors be held liable for any damages +; arising from the use of this software. +; +; Permission is granted to anyone to use this software for any purpose, +; including commercial applications, and to alter it and redistribute it +; freely, subject to the following restrictions: +; +; 1. The origin of this software must not be misrepresented; you must not +; claim that you wrote the original software. If you use this software +; in a product, an acknowledgment in the product documentation would be +; appreciated but is not required. +; 2. Altered source versions must be plainly marked as such, and must not be +; misrepresented as being the original software. +; 3. This notice may not be removed or altered from any source distribution. + +; DEFINE BACKWARD_DECOMPRESS + + IFNDEF BACKWARD_DECOMPRESS + + MACRO NEXT_HL + inc hl + ENDM + + MACRO ADD_OFFSET + ex de,hl : add hl,de + ENDM + + MACRO COPY_MATCH + ldi : ldi : ldir + ENDM + + MACRO BLOCKCOPY + ldir + ENDM + + ELSE + + MACRO NEXT_HL + dec hl + ENDM + + MACRO ADD_OFFSET + ex de,hl : ld a,e : sub l : ld l,a + ld a,d : sbc h : ld h,a ; 4*4+3*4 = 28t / 7 bytes + ENDM + + MACRO COPY_MATCH + ldd : ldd : lddr + ENDM + + MACRO BLOCKCOPY + lddr + ENDM + + ENDIF + +@DecompressLZSA1: + ld b,0 : jr ReadToken + +NoLiterals: xor (hl) + push de : NEXT_HL : ld e,(hl) : jp m,LongOffset + + ; short matches have length 0+3..14+3 +ShortOffset: ld d,#FF : add 3 : cp 15+3 : jr nc,LongerMatch + + ; placed here this saves a JP per iteration +CopyMatch: ld c,a +.UseC NEXT_HL : ex (sp),hl ; BC = len, DE = offset, HL = dest, SP ->[dest,src] + ADD_OFFSET ; BC = len, DE = dest, HL = dest-offset, SP->[src] + COPY_MATCH : pop hl ; BC = 0, DE = dest, HL = src + +ReadToken: ; first a byte token "O|LLL|MMMM" is read from the stream, + ; where LLL is the number of literals and MMMM is + ; a length of the match that follows after the literals + ld a,(hl) : and #70 : jr z,NoLiterals + + cp #70 : jr z,MoreLiterals ; LLL=7 means 7+ literals... + rrca : rrca : rrca : rrca ; LLL<7 means 0..6 literals... + + ld c,a : ld a,(hl) + NEXT_HL : BLOCKCOPY + + ; next we read the first byte of the offset + push de : ld e,(hl) + ; the top bit of token is set if the offset contains two bytes + and #8F : jp p,ShortOffset + +LongOffset: ; read second byte of the offset + NEXT_HL : ld d,(hl) + add -128+3 : cp 15+3 : jp c,CopyMatch + + ; MMMM=15 indicates a multi-byte number of literals +LongerMatch: NEXT_HL : add (hl) : jr nc,CopyMatch + + ; the codes are designed to overflow; + ; the overflow value 1 means read 1 extra byte + ; and overflow value 0 means read 2 extra bytes +.code1 ld b,a : NEXT_HL : ld c,(hl) : jr nz,CopyMatch.UseC +.code0 NEXT_HL : ld b,(hl) + + ; the two-byte match length equal to zero + ; designates the end-of-data marker + ld a,b : or c : jr nz,CopyMatch.UseC + pop de : ret + +MoreLiterals: ; there are three possible situations here + xor (hl) : exa + ld a,7 : NEXT_HL : add (hl) : jr c,ManyLiterals + +CopyLiterals: ld c,a +.UseC NEXT_HL : BLOCKCOPY + + push de : ld e,(hl) + exa : jp p,ShortOffset : jr LongOffset + +ManyLiterals: +.code1 ld b,a : NEXT_HL : ld c,(hl) : jr nz,CopyLiterals.UseC +.code0 NEXT_HL : ld b,(hl) : jr CopyLiterals.UseC + + diff --git a/asm/z80/unlzsa1_small_v1.asm b/asm/z80/unlzsa1_small_v1.asm index 60541ce..3b3f55c 100644 --- a/asm/z80/unlzsa1_small_v1.asm +++ b/asm/z80/unlzsa1_small_v1.asm @@ -1,129 +1,129 @@ -; -; Size-optimized LZSA1 decompressor by spke (v.1 23/04/2019, 67 bytes); -; with improvements by uniabis (30/07/2019, -1 byte, +3% speed). -; -; The data must be compressed using the command line compressor by Emmanuel Marty -; The compression is done as follows: -; -; lzsa.exe -f1 -r -; -; where option -r asks for the generation of raw (frame-less) data. -; -; The decompression is done in the standard way: -; -; ld hl,FirstByteOfCompressedData -; ld de,FirstByteOfMemoryForDecompressedData -; call DecompressLZSA1 -; -; Backward compression is also supported; you can compress files backward using: -; -; lzsa.exe -f1 -r -b -; -; and decompress the resulting files using: -; -; ld hl,LastByteOfCompressedData -; ld de,LastByteOfMemoryForDecompressedData -; call DecompressLZSA1 -; -; (do not forget to uncomment the BACKWARD_DECOMPRESS option in the decompressor). -; -; Of course, LZSA compression algorithms are (c) 2019 Emmanuel Marty, -; see https://github.com/emmanuel-marty/lzsa for more information -; -; Drop me an email if you have any comments/ideas/suggestions: zxintrospec@gmail.com -; -; This software is provided 'as-is', without any express or implied -; warranty. In no event will the authors be held liable for any damages -; arising from the use of this software. -; -; Permission is granted to anyone to use this software for any purpose, -; including commercial applications, and to alter it and redistribute it -; freely, subject to the following restrictions: -; -; 1. The origin of this software must not be misrepresented; you must not -; claim that you wrote the original software. If you use this software -; in a product, an acknowledgment in the product documentation would be -; appreciated but is not required. -; 2. Altered source versions must be plainly marked as such, and must not be -; misrepresented as being the original software. -; 3. This notice may not be removed or altered from any source distribution. - -; DEFINE BACKWARD_DECOMPRESS - - IFNDEF BACKWARD_DECOMPRESS - - MACRO NEXT_HL - inc hl - ENDM - - MACRO ADD_OFFSET - ex de,hl : add hl,de - ENDM - - MACRO BLOCKCOPY - ldir - ENDM - - ELSE - - MACRO NEXT_HL - dec hl - ENDM - - MACRO ADD_OFFSET - push hl : or a : sbc hl,de : pop de ; 11+4+15+10 = 40t / 5 bytes - ENDM - - MACRO BLOCKCOPY - lddr - ENDM - - ENDIF - -@DecompressLZSA1: - ld b,0 - - ; first a byte token "O|LLL|MMMM" is read from the stream, - ; where LLL is the number of literals and MMMM is - ; a length of the match that follows after the literals -ReadToken: ld a,(hl) : NEXT_HL : push af - and #70 : jr z,NoLiterals - - rrca : rrca : rrca : rrca ; LLL<7 means 0..6 literals... - cp #07 : call z,ReadLongBA ; LLL=7 means 7+ literals... - - ld c,a : BLOCKCOPY - - ; next we read the low byte of the -offset -NoLiterals: pop af : push de : ld e,(hl) : NEXT_HL : ld d,#FF - ; the top bit of token is set if - ; the offset contains the high byte as well - or a : jp p,ShortOffset - -LongOffset: ld d,(hl) : NEXT_HL - - ; last but not least, the match length is read -ShortOffset: and #0F : add 3 ; MMMM<15 means match lengths 0+3..14+3 - cp 15+3 : call z,ReadLongBA ; MMMM=15 means lengths 14+3+ - ld c,a - - ex (sp),hl ; BC = len, DE = -offset, HL = dest, SP -> [src] - ADD_OFFSET ; BC = len, DE = dest, HL = dest+(-offset), SP -> [src] - BLOCKCOPY ; BC = 0, DE = dest - pop hl : jr ReadToken ; HL = src - - ; a standard routine to read extended codes - ; into registers B (higher byte) and A (lower byte). -ReadLongBA: add (hl) : NEXT_HL : ret nc - - ; the codes are designed to overflow; - ; the overflow value 1 means read 1 extra byte - ; and overflow value 0 means read 2 extra bytes -.code1: ld b,a : ld a,(hl) : NEXT_HL : ret nz -.code0: ld c,a : ld b,(hl) : NEXT_HL - - ; the two-byte match length equal to zero - ; designates the end-of-data marker - or b : ld a,c : ret nz - pop de : pop de : ret - +; +; Size-optimized LZSA1 decompressor by spke (v.1 23/04/2019, 68 bytes); +; with improvements by uniabis (30/07/2019, -1 byte, +3% speed). +; +; The data must be compressed using the command line compressor by Emmanuel Marty +; The compression is done as follows: +; +; lzsa.exe -f1 -r +; +; where option -r asks for the generation of raw (frame-less) data. +; +; The decompression is done in the standard way: +; +; ld hl,FirstByteOfCompressedData +; ld de,FirstByteOfMemoryForDecompressedData +; call DecompressLZSA1 +; +; Backward compression is also supported; you can compress files backward using: +; +; lzsa.exe -f1 -r -b +; +; and decompress the resulting files using: +; +; ld hl,LastByteOfCompressedData +; ld de,LastByteOfMemoryForDecompressedData +; call DecompressLZSA1 +; +; (do not forget to uncomment the BACKWARD_DECOMPRESS option in the decompressor). +; +; Of course, LZSA compression algorithms are (c) 2019 Emmanuel Marty, +; see https://github.com/emmanuel-marty/lzsa for more information +; +; Drop me an email if you have any comments/ideas/suggestions: zxintrospec@gmail.com +; +; This software is provided 'as-is', without any express or implied +; warranty. In no event will the authors be held liable for any damages +; arising from the use of this software. +; +; Permission is granted to anyone to use this software for any purpose, +; including commercial applications, and to alter it and redistribute it +; freely, subject to the following restrictions: +; +; 1. The origin of this software must not be misrepresented; you must not +; claim that you wrote the original software. If you use this software +; in a product, an acknowledgment in the product documentation would be +; appreciated but is not required. +; 2. Altered source versions must be plainly marked as such, and must not be +; misrepresented as being the original software. +; 3. This notice may not be removed or altered from any source distribution. + +; DEFINE BACKWARD_DECOMPRESS + + IFNDEF BACKWARD_DECOMPRESS + + MACRO NEXT_HL + inc hl + ENDM + + MACRO ADD_OFFSET + ex de,hl : add hl,de + ENDM + + MACRO BLOCKCOPY + ldir + ENDM + + ELSE + + MACRO NEXT_HL + dec hl + ENDM + + MACRO ADD_OFFSET + push hl : or a : sbc hl,de : pop de ; 11+4+15+10 = 40t / 5 bytes + ENDM + + MACRO BLOCKCOPY + lddr + ENDM + + ENDIF + +@DecompressLZSA1: + ld b,0 + + ; first a byte token "O|LLL|MMMM" is read from the stream, + ; where LLL is the number of literals and MMMM is + ; a length of the match that follows after the literals +ReadToken: ld a,(hl) : exa : ld a,(hl) : NEXT_HL + and #70 : jr z,NoLiterals + + rrca : rrca : rrca : rrca ; LLL<7 means 0..6 literals... + cp #07 : call z,ReadLongBA ; LLL=7 means 7+ literals... + + ld c,a : BLOCKCOPY + + ; next we read the low byte of the -offset +NoLiterals: push de : ld e,(hl) : NEXT_HL : ld d,#FF + ; the top bit of token is set if + ; the offset contains the high byte as well + exa : or a : jp p,ShortOffset + +LongOffset: ld d,(hl) : NEXT_HL + + ; last but not least, the match length is read +ShortOffset: and #0F : add 3 ; MMMM<15 means match lengths 0+3..14+3 + cp 15+3 : call z,ReadLongBA ; MMMM=15 means lengths 14+3+ + ld c,a + + ex (sp),hl ; BC = len, DE = -offset, HL = dest, SP -> [src] + ADD_OFFSET ; BC = len, DE = dest, HL = dest+(-offset), SP -> [src] + BLOCKCOPY ; BC = 0, DE = dest + pop hl : jr ReadToken ; HL = src + + ; a standard routine to read extended codes + ; into registers B (higher byte) and A (lower byte). +ReadLongBA: add (hl) : NEXT_HL : ret nc + + ; the codes are designed to overflow; + ; the overflow value 1 means read 1 extra byte + ; and overflow value 0 means read 2 extra bytes +.code1: ld b,a : ld a,(hl) : NEXT_HL : ret nz +.code0: ld c,a : ld b,(hl) : NEXT_HL + + ; the two-byte match length equal to zero + ; designates the end-of-data marker + or b : ld a,c : ret nz + pop de : pop de : ret +