forked from KolibriOS/kolibrios
small fix in header
git-svn-id: svn://kolibrios.org@6652 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
parent
e35a30e7cd
commit
55fd6e5922
@ -934,8 +934,7 @@ zlib_debug 'deflate strm = %d',ebx
|
|||||||
cmp dword[flush],Z_BLOCK
|
cmp dword[flush],Z_BLOCK
|
||||||
jg @f
|
jg @f
|
||||||
cmp dword[flush],0
|
cmp dword[flush],0
|
||||||
jl @f ;if (..==0 || ..==0 || ..>.. || ..<0)
|
jge .end10 ;if (..==0 || ..==0 || ..>.. || ..<0)
|
||||||
jmp .end10
|
|
||||||
@@:
|
@@:
|
||||||
mov eax,Z_STREAM_ERROR
|
mov eax,Z_STREAM_ERROR
|
||||||
jmp .end_f
|
jmp .end_f
|
||||||
@ -951,7 +950,7 @@ zlib_debug 'deflate strm = %d',ebx
|
|||||||
jne .end0
|
jne .end0
|
||||||
cmp dword[flush],Z_FINISH
|
cmp dword[flush],Z_FINISH
|
||||||
je .end0
|
je .end0
|
||||||
.beg0: ;if (..==0 || (..==0 && ..!=0) || (..=.. && ..!=..))
|
.beg0: ;if (..==0 || (..==0 && ..!=0) || (..==.. && ..!=..))
|
||||||
ERR_RETURN ebx, Z_STREAM_ERROR
|
ERR_RETURN ebx, Z_STREAM_ERROR
|
||||||
jmp .end_f
|
jmp .end_f
|
||||||
.end0:
|
.end0:
|
||||||
@ -1068,12 +1067,13 @@ end if
|
|||||||
|
|
||||||
mov esi,3
|
mov esi,3
|
||||||
cmp word[edi+deflate_state.strategy],Z_HUFFMAN_ONLY
|
cmp word[edi+deflate_state.strategy],Z_HUFFMAN_ONLY
|
||||||
jl @f
|
jge @f
|
||||||
cmp word[edi+deflate_state.level],2
|
cmp word[edi+deflate_state.level],2
|
||||||
jge @f ;if (..>=.. || ..<..)
|
jge .end30 ;if (..>=.. || ..<..)
|
||||||
|
@@:
|
||||||
xor esi,esi
|
xor esi,esi
|
||||||
jmp .end4
|
jmp .end4
|
||||||
@@:
|
.end30:
|
||||||
cmp word[edi+deflate_state.level],6
|
cmp word[edi+deflate_state.level],6
|
||||||
jge @f ;else if (..<..)
|
jge @f ;else if (..<..)
|
||||||
mov esi,1
|
mov esi,1
|
||||||
@ -1391,16 +1391,14 @@ end if
|
|||||||
cmp edx,finish_started
|
cmp edx,finish_started
|
||||||
je @f
|
je @f
|
||||||
cmp edx,finish_done
|
cmp edx,finish_done
|
||||||
je @f
|
jne .end18
|
||||||
jmp .end18
|
|
||||||
@@: ;if (..==.. || ..==..)
|
@@: ;if (..==.. || ..==..)
|
||||||
mov dword[edi+deflate_state.status],FINISH_STATE
|
mov dword[edi+deflate_state.status],FINISH_STATE
|
||||||
.end18:
|
.end18:
|
||||||
cmp edx,need_more
|
cmp edx,need_more
|
||||||
je @f
|
je @f
|
||||||
cmp edx,finish_started
|
cmp edx,finish_started
|
||||||
je @f
|
jne .end19
|
||||||
jmp .end19
|
|
||||||
@@: ;if (..==.. || ..==..)
|
@@: ;if (..==.. || ..==..)
|
||||||
cmp word[ebx+z_stream.avail_out],0
|
cmp word[ebx+z_stream.avail_out],0
|
||||||
jne @f ;if (..==0)
|
jne @f ;if (..==0)
|
||||||
@ -2747,11 +2745,10 @@ align 4
|
|||||||
proc deflate_rle uses ecx edx edi esi, s:dword, flush:dword
|
proc deflate_rle uses ecx edx edi esi, s:dword, flush:dword
|
||||||
locals
|
locals
|
||||||
bflush dd ? ;int ;set if current block must be flushed
|
bflush dd ? ;int ;set if current block must be flushed
|
||||||
; uInt prev; /* byte at distance one to match */
|
|
||||||
; Bytef *scan, *strend; /* scan goes up to strend for length of run */
|
|
||||||
endl
|
endl
|
||||||
mov edx,[s]
|
mov edx,[s]
|
||||||
zlib_debug 'deflate_rle'
|
zlib_debug 'deflate_rle'
|
||||||
|
align 4
|
||||||
.cycle0: ;for (;;)
|
.cycle0: ;for (;;)
|
||||||
; Make sure that we always have enough lookahead, except
|
; Make sure that we always have enough lookahead, except
|
||||||
; at the end of the input file. We need MAX_MATCH bytes
|
; at the end of the input file. We need MAX_MATCH bytes
|
||||||
@ -2789,8 +2786,8 @@ align 4
|
|||||||
jnz .end2
|
jnz .end2
|
||||||
scasb
|
scasb
|
||||||
jnz .end2 ;if (..==.. && ..==.. && ..==..)
|
jnz .end2 ;if (..==.. && ..==.. && ..==..)
|
||||||
;edi = scan
|
;edi = scan ;scan goes up to strend for length of run
|
||||||
; al = prev
|
; al = prev ;byte at distance one to match
|
||||||
;ecx = strend-scan
|
;ecx = strend-scan
|
||||||
mov ecx,MAX_MATCH-2
|
mov ecx,MAX_MATCH-2
|
||||||
repz scasb
|
repz scasb
|
||||||
@ -2873,6 +2870,7 @@ locals
|
|||||||
endl
|
endl
|
||||||
mov edi,[s]
|
mov edi,[s]
|
||||||
zlib_debug 'deflate_huff'
|
zlib_debug 'deflate_huff'
|
||||||
|
align 4
|
||||||
.cycle0: ;for (;;)
|
.cycle0: ;for (;;)
|
||||||
; Make sure that we have a literal to write.
|
; Make sure that we have a literal to write.
|
||||||
cmp dword[edi+deflate_state.lookahead],0
|
cmp dword[edi+deflate_state.lookahead],0
|
||||||
@ -2881,12 +2879,10 @@ zlib_debug 'deflate_huff'
|
|||||||
cmp dword[edi+deflate_state.lookahead],0
|
cmp dword[edi+deflate_state.lookahead],0
|
||||||
jne .end0 ;if (..==0)
|
jne .end0 ;if (..==0)
|
||||||
cmp dword[flush],Z_NO_FLUSH
|
cmp dword[flush],Z_NO_FLUSH
|
||||||
jne @f ;if (..==..)
|
jne .cycle0end ;if (..==..)
|
||||||
mov eax,need_more
|
mov eax,need_more
|
||||||
jmp .end_f
|
jmp .end_f
|
||||||
align 4
|
;flush the current block
|
||||||
@@:
|
|
||||||
jmp .cycle0end ;flush the current block
|
|
||||||
align 4
|
align 4
|
||||||
.end0:
|
.end0:
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user