WebSVN – Kolibri OS – Diff – /programs/fs/kfar/trunk/zlib/deflate.asm

 	cmp dword[edi+deflate_state.prev],Z_NULL
 	je .end3
 	cmp dword[edi+deflate_state.head],Z_NULL
 	je .end3
 	cmp dword[edi+deflate_state.pending_buf],Z_NULL
-	je .end3
-		jmp @f
+	jne @f
 	.end3: ;if (..==0 || ..==0 || ..==0 || ..==0)
 		mov dword[edi+deflate_state.status],FINISH_STATE
 		ERR_MSG Z_MEM_ERROR
 		mov [ebx+z_stream.msg],eax
 		stdcall deflateEnd, ebx
 ;int (strm, dictionary, dictLength)
 ;    z_streamp strm
 ;    const Bytef *dictionary
 ;    uInt  dictLength
 align 4
-proc deflateSetDictionary uses ebx edi, strm:dword, dictionary:dword, dictLength:dword
+proc deflateSetDictionary uses ebx ecx edx edi esi, strm:dword, dictionary:dword, dictLength:dword
 locals
-;    uInt str, n;
 	wrap  dd ? ;int
 	avail dd ? ;unsigned
 	next  dd ? ;unsigned char*
 endl
 	mov ebx,[strm]
 	je @f
 	mov edi,[ebx+z_stream.state]
 	cmp edi,Z_NULL
 	je @f
 	cmp dword[dictionary],Z_NULL
-	je @f ;if (..==0 || ..==0 || ..==0)
+	jne .end0 ;if (..==0 || ..==0 || ..==0)
-		jmp .end0
 	@@:
 		mov eax,Z_STREAM_ERROR
 		jmp .end_f
 	.end0:
 	; if dictionary would fill window, just replace the history
 	mov eax,[edi+deflate_state.w_size]
 	cmp [dictLength],eax
+	jl .end2 ;if (..>=..)
-	jl .end2 ;if (..>=..)
+		cmp dword[wrap],0
-;        if (wrap == 0) {            /* already empty otherwise */
+		jne @f ;if (..==0) ;already empty otherwise
-;            CLEAR_HASH(s);
+			CLEAR_HASH edi
-;            s->strstart = 0;
+			mov dword[edi+deflate_state.strstart],0
-;            s->block_start = 0L;
+			mov dword[edi+deflate_state.block_start],0
-;            s->insert = 0;
+			mov dword[edi+deflate_state.insert],0
+		@@:
+		mov eax,[dictLength]
-;        }
+		sub eax,[edi+deflate_state.w_size]
-;        dictionary += dictLength - s->w_size;  /* use the tail */
+		add [dictionary],eax ;use the tail
 		mov eax,[edi+deflate_state.w_size]
 		mov [dictLength],eax
 	.end2:
+	; insert dictionary into window and hash
-	; insert dictionary into window and hash
+	mov eax,[ebx+z_stream.avail_in]
+	mov [avail],eax
-;    avail = strm->avail_in;
+	mov eax,[ebx+z_stream.next_in]
+	mov [next],eax
-;    next = strm->next_in;
+	mov eax,[dictLength]
+	mov [ebx+z_stream.avail_in],eax
-;    strm->avail_in = dictLength;
+	mov eax,[dictionary]
+	mov [ebx+z_stream.next_in],eax
-;    strm->next_in = (z_const Bytef *)dictionary;
+	stdcall fill_window, edi
+	.cycle0: ;while (..>=..)
+		mov ecx,[edi+deflate_state.lookahead]
-;    fill_window(s);
+		cmp ecx,MIN_MATCH
+		jl .cycle0end
-;    while (s->lookahead >= MIN_MATCH) {
+		mov esi,[edi+deflate_state.strstart]
+		;esi = str
+		sub ecx,MIN_MATCH-1
-;        str = s->strstart;
+		.cycle1: ;do
+			mov eax,[edi+deflate_state.window]
+			add eax,esi
-;        n = s->lookahead - (MIN_MATCH-1);
+			add eax,MIN_MATCH-1
-;        do {
+			movzx eax,byte[eax]
+			UPDATE_HASH edi, [edi+deflate_state.ins_h], eax
+if FASTEST eq 0
+			mov edx,[edi+deflate_state.ins_h]
-;            UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]);
+			shl edx,2
+			add edx,[edi+deflate_state.head]
+			mov edx,[edx] ;edx = s.head[s.ins_h]
+			mov eax,esi
+			and eax,[edi+deflate_state.w_mask]
+			shl eax,2
-if FASTEST eq 0
+			add eax,[edi+deflate_state.prev]
+			mov [eax],edx
+end if
+			mov edx,[edi+deflate_state.ins_h]
-;            s->prev[str & s->w_mask] = s->head[s->ins_h];
+			shl edx,2
-end if
+			add edx,[edi+deflate_state.head]
+			mov [edx],esi ;s.head[s.ins_h] = str
-;            s->head[s->ins_h] = (Pos)str;
+			inc esi
-;            str++;
+			dec ecx
-;        } while (--n);
+			jnz .cycle1 ;while (--..)
-;        s->strstart = str;
+		mov [edi+deflate_state.strstart],esi
+		mov [edi+deflate_state.lookahead],MIN_MATCH-1
-;        s->lookahead = MIN_MATCH-1;
+		stdcall fill_window, edi
+		jmp .cycle0
+align 4
-;        fill_window(s);
+	.cycle0end:
+	mov eax,[edi+deflate_state.strstart]
-;    }
+	add eax,[edi+deflate_state.lookahead]
-;    s->strstart += s->lookahead;
+	mov [edi+deflate_state.strstart],eax
-;    s->block_start = (long)s->strstart;
+	mov [edi+deflate_state.block_start],eax
 	mov eax,[edi+deflate_state.lookahead]
 	mov [edi+deflate_state.insert],eax
 	mov dword[edi+deflate_state.lookahead],0
 	cmp edi,Z_NULL
 	je @f
 	cmp dword[ebx+z_stream.zalloc],0
 	je @f
 	cmp dword[ebx+z_stream.zfree],0
-	je @f ;if (..==0 || ..==0 || ..==0 || ..==0)
+	jne .end0 ;if (..==0 || ..==0 || ..==0 || ..==0)
-		jmp .end0
 	@@:
 		mov eax,Z_STREAM_ERROR
 		jmp .end_f
 	.end0:
 	mov eax,[edi+deflate_state.pending_buf]
 	mov [edi+deflate_state.pending_out],eax
 	cmp dword[edi+deflate_state.wrap],0
-	jge @f ;if (..<0)
-		neg dword[edi+deflate_state.wrap]
+	jge @f ;if (..<0)
-		inc dword[edi+deflate_state.wrap] ;was made negative by deflate(..., Z_FINISH)
+		neg dword[edi+deflate_state.wrap] ;was made negative by deflate(..., Z_FINISH)
 	@@:
 	mov eax,BUSY_STATE
 	cmp dword[edi+deflate_state.wrap],0
 	je @f
 	.end17:
 	stdcall flush_pending, ebx
 	; If avail_out is zero, the application will call deflate again
 	; to flush the rest.
-	cmp dword[edi+deflate_state.pending],0
+	cmp dword[edi+deflate_state.wrap],0
 	jle @f ;if (..>0) ;write the trailer only once!
-		neg dword[edi+deflate_state.pending]
-		inc dword[edi+deflate_state.pending]
+		neg dword[edi+deflate_state.wrap]
 	@@:
 	mov eax,Z_OK
 	cmp dword[edi+deflate_state.pending],0
-	je .end_f
+	jne .end_f
 		mov eax,Z_STREAM_END
-.end_f:
-zlib_debug '  deflate.ret = %d',eax
+.end_f:
 	ret
 endp
 	.end0:
 	add [ebx+z_stream.next_in],eax
 	add [ebx+z_stream.total_in],eax
-.end_f:
-;zlib_debug '  read_buf.ret = %d',eax
+.end_f:
 	ret
 endp
 		mov eax,[eax] ;eax = prev[cur_match & wmask]
 		mov [cur_match],eax
 		cmp eax,[limit]
 		jle .cycle0end
 		dec dword[chain_length]
-		cmp dword[chain_length],0
-		jne .cycle0
+		jnz .cycle0
 align 4
 	.cycle0end: ;while (..>.. && ..!=0)
 	mov eax,[edx+deflate_state.lookahead]
 			cmp dword[bflush],0
 			je .cycle0 ;if (..)
 				FLUSH_BLOCK edi, 0
+			jmp .cycle0
-			jmp .cycle0
+align 4
 		.end2: ;else if (..)
 		cmp dword[edi+deflate_state.match_available],0
 		je .end3
 			; If there was no match at the previous position, output a
 			mov eax,[edi+deflate_state.strm]
 			cmp dword[eax+z_stream.avail_out],0
 			jne .cycle0 ;if (..==0) return ..
 				mov eax,need_more
 				jmp .end_f
-			jmp .cycle0 ;.end4
+align 4
 		.end3: ;else
 			; There is no previous match to compare with, wait for
 			; the next step to decide.
 			mov dword[edi+deflate_state.match_available],1
 			inc dword[edi+deflate_state.strstart]
-			dec dword[edi+deflate_state.lookahead]
-		;.end4:
+			dec dword[edi+deflate_state.lookahead]
 		jmp .cycle0
 align 4
 	.cycle0end:
 	cmp dword[flush],Z_NO_FLUSH
 				sub edi,[edx+deflate_state.window]
 				sub edi,[edx+deflate_state.strstart]
 				mov [edx+deflate_state.match_length],edi
 				mov eax,[edx+deflate_state.lookahead]
 				cmp [edx+deflate_state.match_length],eax
-				jle .end2
+				jle .end2 ;if (..>..)
 					mov [edx+deflate_state.match_length],eax
 			.end2:
 			mov eax,[edx+deflate_state.window_size]
 			dec eax
 			add eax,[edx+deflate_state.window]
 		Tracevv eax,
 		_tr_tally_lit edi, eax, [bflush]
 		dec dword[edi+deflate_state.lookahead]
 		inc dword[edi+deflate_state.strstart]
 		cmp dword[bflush],0
-		je @f ;if (..)
+		je .cycle0 ;if (..)
 			FLUSH_BLOCK edi, 0
-		@@:
 		jmp .cycle0
 align 4
 	.cycle0end:
 	mov dword[edi+deflate_state.insert],0
 	cmp dword[flush],Z_FINISH

Subversion Repositories Kolibri OS

(root)/programs/fs/kfar/trunk/zlib/deflate.asm @ 6851 – Rev 6801 → 6819