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

 		mov cx,[edi+deflate_state.bi_buf]
 		put_short edi, cx
 		mov eax,[value]
 		mov ecx,Buf_size
 		sub ecx,[edi+deflate_state.bi_valid]
-		shr eax,cl
+		sar eax,cl
 		mov [edi+deflate_state.bi_buf],ax
 		mov eax,[length]
 		sub eax,Buf_size
 		jmp .end0
 	@@: ;else
 	xor ecx,ecx
 	.cycle0:
 		cmp ecx,[blcodes]
 		jge .cycle0end ;for (..;..<..;..)
 ;        Tracev((stderr, "\nbl code %2d ", bl_order[ecx]));
-		mov eax,ecx
-		add eax,bl_order
-		movzx eax,byte[eax]
+		movzx eax,byte[ecx+bl_order]
-		imul eax,sizeof.ct_data
-		add eax,edi
-		movzx eax,word[eax+deflate_state.bl_tree+Len]
+		movzx eax,word[edi+sizeof.ct_data*eax+deflate_state.bl_tree+Len]
 		stdcall send_bits, edi, eax, 3
 		inc ecx
 		jmp .cycle0
 align 4
 	.cycle0end:
 ;        Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
 ;                opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
 ;                s->last_lit));
 		cmp eax,[opt_lenb]
-		jg .end1 ;if (..<=..)
+		ja .end1 ;if (..<=..)
 			mov [opt_lenb],eax
 		jmp .end1
 	.end0: ;else
 		cmp dword[buf],0
 	je .end2 ;if (..!=0) ;force stored block
 else
 	mov eax,[stored_len]
 	add eax,4
 	cmp eax,[opt_lenb]
-	jg .end2
+	ja .end2
 	cmp dword[buf],0
 	je .end2 ;if (..<=.. && ..!=0)
 		;4: two words for the lengths
 end if
 		; The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
 ;    unsigned dist ;distance of matched string
 ;    unsigned lc   ;match length-MIN_MATCH or unmatched char (if dist==0)
 align 4
 proc _tr_tally uses ebx edi, s:dword, dist:dword, lc:dword
 	mov edi,[s]
-	zlib_debug '_tr_tally'
 	mov eax,[edi+deflate_state.last_lit]
 	shl eax,1
 	add eax,[edi+deflate_state.d_buf]
 	mov ebx,[dist]
 	mov word[eax],bx
 	inc dword[edi+deflate_state.last_lit]
 	cmp dword[dist],0
 	jne @f ;if (..==0)
 		; lc is the unmatched char
 		mov eax,[lc]
-		imul eax,sizeof.ct_data
-		add eax,edi
-		inc word[eax+deflate_state.dyn_ltree+Freq]
+		inc word[edi+sizeof.ct_data*eax+deflate_state.dyn_ltree+Freq]
 		jmp .end0
 align 4
 	@@: ;else
 		inc dword[edi+deflate_state.matches]
 		; Here, lc is the match length - MIN_MATCH
 		@@:
 			zlib_assert '_tr_tally: bad match' ;Assert(..<.. && ..<=.. && ..<..)
 		.end2:
 		mov eax,[lc]
 		movzx eax,byte[eax+_length_code]
-		add eax,LITERALS+1
-		imul eax,sizeof.ct_data
-		inc word[edi+eax+deflate_state.dyn_ltree+Freq]
+		inc word[edi+sizeof.ct_data*eax+deflate_state.dyn_ltree+sizeof.ct_data*(LITERALS+1)+Freq]
 		d_code [dist]
-		imul eax,sizeof.ct_data
-		inc word[edi+eax+deflate_state.dyn_dtree+Freq]
+		inc word[edi+sizeof.ct_data*eax+deflate_state.dyn_dtree+Freq]
 	.end0:
 if TRUNCATE_BLOCK eq 1
 	; Try to guess if it is profitable to stop the current block here
 ;               s->last_lit, in_length, out_length,
 ;               100L - out_length*100L/in_length));
 ;        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
 	.end1:
 end if
-	mov ebx,[edi+deflate_state.last_lit]
-	mov edi,[edi+deflate_state.lit_bufsize]
+	mov ebx,[edi+deflate_state.lit_bufsize]
-	dec edi
+	dec ebx
 	xor eax,eax
-	cmp ebx,edi
+	cmp [edi+deflate_state.last_lit],ebx
-	jne @f
-		inc eax ;return (..==..)
+	sete al ;return (..==..)
-	@@:
 	; We avoid equality with lit_bufsize because of wraparound at 64K
 	; on 16 bit machines and because stored blocks are restricted to
 	; 64K-1 bytes.
 	ret
 endp
 		jl @f
 			zlib_assert 'pendingBuf overflow' ;Assert(..<..)
 		@@:
 		mov eax,[edi+deflate_state.last_lit]
 		cmp [lx],eax
-		jl .cycle0 ;while (..<..)
+		jb .cycle0 ;while (..<..)
 align 4
 	.end0:
 	send_code edi, END_BLOCK, [ltree]
 ; - The following partially-portable control characters form a
 ;   "gray list" that is ignored in this detection algorithm:
 ;   (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}).
 ; IN assertion: the fields Freq of dyn_ltree are set.
-;int (s)
-;    deflate_state* s
+;int (deflate_state* s)
 align 4
 proc detect_data_type uses ebx ecx edi, s:dword
 	; black_mask is the bit mask of black-listed bytes
 	; set bits 0..6, 14..25, and 28..31
 	; 0xf3ffc07f = binary 11110011111111111100000001111111
 locals
 	black_mask dd 0xf3ffc07f
 endl
-	mov edi,[s]
-	zlib_debug 'detect_data_type'
+	mov edi,[s]
 	; Check for non-textual ("black-listed") bytes.
 	xor ecx,ecx
 endp
 ; ===========================================================================
-; Flush the bit buffer, keeping at most 7 bits in it.
+; Flush the bit buffer, keeping at most 7 bits in it.
 ;void (s)
-;    deflate_state* s
+;void (deflate_state* s)
 align 4
 proc bi_flush uses eax ecx edi, s:dword
 	mov edi,[s]
 	mov ecx,[len]
 	shl ecx,3
 	add [edi+deflate_state.bits_sent],ecx
 end if
 	mov ecx,[len]
+;	test ecx,ecx
+;	jz .end_f
 	mov esi,[buf]
 	jmp .end0
 align 4
 	@@: ;while (len--)
 		lodsb
 		mov bl,al
 		put_byte edi, bl
 	.end0:
 		loop @b
+;	.end_f:
 	ret
 endp

Subversion Repositories Kolibri OS

(root)/programs/fs/kfar/trunk/zlib/trees.asm – Rev 6847 → 6851