510Connectbot: src/com/jcraft/jzlib/InfCodes.java annotate

annotate src/com/jcraft/jzlib/InfCodes.java @ 392:7ac1a0b02f44

add test buffer changed when input stream runs dry, similar to async test

author	Carl Byington <carl@five-ten-sg.com>
date	Tue, 16 Sep 2014 16:22:41 -0700
parents	46c2115ae1c8
children

rev	line source
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	1 /* --mode:java; c-basic-offset:2; -- */
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	2 /*
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	3 Copyright (c) 2000,2001,2002,2003 ymnk, JCraft,Inc. All rights reserved.
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	4
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	5 Redistribution and use in source and binary forms, with or without
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	6 modification, are permitted provided that the following conditions are met:
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	7
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	8 1. Redistributions of source code must retain the above copyright notice,
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	9 this list of conditions and the following disclaimer.
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	10
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	11 2. Redistributions in binary form must reproduce the above copyright
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	12 notice, this list of conditions and the following disclaimer in
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	13 the documentation and/or other materials provided with the distribution.
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	14
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	15 3. The names of the authors may not be used to endorse or promote products
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	16 derived from this software without specific prior written permission.
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	17
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	18 THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	19 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	20 FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	21 INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	22 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	23 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	24 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	25 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	26 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	27 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	28 */
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	29 /*
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	30 * This program is based on zlib-1.1.3, so all credit should go authors
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	31 * Jean-loup Gailly(jloup@gzip.org) and Mark Adler(madler@alumni.caltech.edu)
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	32 * and contributors of zlib.
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	33 */
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	34
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	35 package com.jcraft.jzlib;
0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	36
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	37 final class InfCodes{
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	38
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	39 static final private int[] inflate_mask = {
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	40 0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000f,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	41 0x0000001f, 0x0000003f, 0x0000007f, 0x000000ff, 0x000001ff,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	42 0x000003ff, 0x000007ff, 0x00000fff, 0x00001fff, 0x00003fff,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	43 0x00007fff, 0x0000ffff
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	44 };
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	45
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	46 static final private int Z_OK=0;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	47 static final private int Z_STREAM_END=1;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	48 static final private int Z_NEED_DICT=2;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	49 static final private int Z_ERRNO=-1;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	50 static final private int Z_STREAM_ERROR=-2;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	51 static final private int Z_DATA_ERROR=-3;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	52 static final private int Z_MEM_ERROR=-4;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	53 static final private int Z_BUF_ERROR=-5;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	54 static final private int Z_VERSION_ERROR=-6;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	55
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	56 // waiting for "i:"=input,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	57 // "o:"=output,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	58 // "x:"=nothing
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	59 static final private int START=0; // x: set up for LEN
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	60 static final private int LEN=1; // i: get length/literal/eob next
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	61 static final private int LENEXT=2; // i: getting length extra (have base)
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	62 static final private int DIST=3; // i: get distance next
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	63 static final private int DISTEXT=4;// i: getting distance extra
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	64 static final private int COPY=5; // o: copying bytes in window, waiting for space
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	65 static final private int LIT=6; // o: got literal, waiting for output space
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	66 static final private int WASH=7; // o: got eob, possibly still output waiting
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	67 static final private int END=8; // x: got eob and all data flushed
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	68 static final private int BADCODE=9;// x: got error
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	69
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	70 int mode; // current inflate_codes mode
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	71
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	72 // mode dependent information
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	73 int len;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	74
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	75 int[] tree; // pointer into tree
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	76 int tree_index=0;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	77 int need; // bits needed
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	78
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	79 int lit;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	80
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	81 // if EXT or COPY, where and how much
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	82 int get; // bits to get for extra
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	83 int dist; // distance back to copy from
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	84
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	85 byte lbits; // ltree bits decoded per branch
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	86 byte dbits; // dtree bits decoder per branch
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	87 int[] ltree; // literal/length/eob tree
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	88 int ltree_index; // literal/length/eob tree
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	89 int[] dtree; // distance tree
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	90 int dtree_index; // distance tree
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	91
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	92 private final ZStream z;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	93 private final InfBlocks s;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	94 InfCodes(ZStream z, InfBlocks s){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	95 this.z=z;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	96 this.s=s;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	97 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	98
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	99 void init(int bl, int bd,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	100 int[] tl, int tl_index,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	101 int[] td, int td_index){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	102 mode=START;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	103 lbits=(byte)bl;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	104 dbits=(byte)bd;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	105 ltree=tl;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	106 ltree_index=tl_index;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	107 dtree = td;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	108 dtree_index=td_index;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	109 tree=null;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	110 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	111
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	112 int proc(int r){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	113 int j; // temporary storage
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	114 int[] t; // temporary pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	115 int tindex; // temporary pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	116 int e; // extra bits or operation
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	117 int b=0; // bit buffer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	118 int k=0; // bits in bit buffer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	119 int p=0; // input data pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	120 int n; // bytes available there
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	121 int q; // output window write pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	122 int m; // bytes to end of window or read pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	123 int f; // pointer to copy strings from
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	124
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	125 // copy input/output information to locals (UPDATE macro restores)
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	126 p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	127 q=s.write;m=q<s.read?s.read-q-1:s.end-q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	128
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	129 // process input and output based on current state
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	130 while (true){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	131 switch (mode){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	132 // waiting for "i:"=input, "o:"=output, "x:"=nothing
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	133 case START: // x: set up for LEN
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	134 if (m >= 258 && n >= 10){
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	135
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	136 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	137 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	138 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	139 r = inflate_fast(lbits, dbits,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	140 ltree, ltree_index,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	141 dtree, dtree_index,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	142 s, z);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	143
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	144 p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	145 q=s.write;m=q<s.read?s.read-q-1:s.end-q;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	146
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	147 if (r != Z_OK){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	148 mode = r == Z_STREAM_END ? WASH : BADCODE;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	149 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	150 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	151 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	152 need = lbits;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	153 tree = ltree;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	154 tree_index=ltree_index;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	155
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	156 mode = LEN;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	157 case LEN: // i: get length/literal/eob next
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	158 j = need;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	159
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	160 while(k<(j)){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	161 if(n!=0)r=Z_OK;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	162 else{
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	163
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	164 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	165 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	166 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	167 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	168 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	169 n--;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	170 b\|=(z.next_in[p++]&0xff)<<k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	171 k+=8;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	172 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	173
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	174 tindex=(tree_index+(b&inflate_mask[j]))*3;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	175
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	176 b>>>=(tree[tindex+1]);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	177 k-=(tree[tindex+1]);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	178
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	179 e=tree[tindex];
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	180
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	181 if(e == 0){ // literal
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	182 lit = tree[tindex+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	183 mode = LIT;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	184 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	185 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	186 if((e & 16)!=0 ){ // length
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	187 get = e & 15;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	188 len = tree[tindex+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	189 mode = LENEXT;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	190 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	191 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	192 if ((e & 64) == 0){ // next table
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	193 need = e;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	194 tree_index = tindex/3+tree[tindex+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	195 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	196 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	197 if ((e & 32)!=0){ // end of block
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	198 mode = WASH;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	199 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	200 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	201 mode = BADCODE; // invalid code
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	202 z.msg = "invalid literal/length code";
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	203 r = Z_DATA_ERROR;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	204
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	205 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	206 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	207 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	208 return s.inflate_flush(r);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	209
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	210 case LENEXT: // i: getting length extra (have base)
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	211 j = get;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	212
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	213 while(k<(j)){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	214 if(n!=0)r=Z_OK;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	215 else{
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	216
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	217 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	218 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	219 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	220 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	221 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	222 n--; b\|=(z.next_in[p++]&0xff)<<k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	223 k+=8;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	224 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	225
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	226 len += (b & inflate_mask[j]);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	227
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	228 b>>=j;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	229 k-=j;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	230
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	231 need = dbits;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	232 tree = dtree;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	233 tree_index=dtree_index;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	234 mode = DIST;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	235 case DIST: // i: get distance next
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	236 j = need;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	237
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	238 while(k<(j)){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	239 if(n!=0)r=Z_OK;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	240 else{
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	241
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	242 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	243 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	244 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	245 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	246 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	247 n--; b\|=(z.next_in[p++]&0xff)<<k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	248 k+=8;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	249 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	250
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	251 tindex=(tree_index+(b & inflate_mask[j]))*3;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	252
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	253 b>>=tree[tindex+1];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	254 k-=tree[tindex+1];
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	255
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	256 e = (tree[tindex]);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	257 if((e & 16)!=0){ // distance
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	258 get = e & 15;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	259 dist = tree[tindex+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	260 mode = DISTEXT;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	261 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	262 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	263 if ((e & 64) == 0){ // next table
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	264 need = e;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	265 tree_index = tindex/3 + tree[tindex+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	266 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	267 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	268 mode = BADCODE; // invalid code
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	269 z.msg = "invalid distance code";
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	270 r = Z_DATA_ERROR;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	271
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	272 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	273 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	274 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	275 return s.inflate_flush(r);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	276
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	277 case DISTEXT: // i: getting distance extra
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	278 j = get;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	279
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	280 while(k<(j)){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	281 if(n!=0)r=Z_OK;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	282 else{
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	283
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	284 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	285 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	286 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	287 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	288 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	289 n--; b\|=(z.next_in[p++]&0xff)<<k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	290 k+=8;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	291 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	292
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	293 dist += (b & inflate_mask[j]);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	294
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	295 b>>=j;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	296 k-=j;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	297
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	298 mode = COPY;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	299 case COPY: // o: copying bytes in window, waiting for space
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	300 f = q - dist;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	301 while(f < 0){ // modulo window size-"while" instead
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	302 f += s.end; // of "if" handles invalid distances
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	303 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	304 while (len!=0){
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	305
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	306 if(m==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	307 if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	308 if(m==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	309 s.write=q; r=s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	310 q=s.write;m=q<s.read?s.read-q-1:s.end-q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	311
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	312 if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	313
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	314 if(m==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	315 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	316 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	317 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	318 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	319 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	320 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	321 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	322
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	323 s.window[q++]=s.window[f++]; m--;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	324
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	325 if (f == s.end)
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	326 f = 0;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	327 len--;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	328 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	329 mode = START;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	330 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	331 case LIT: // o: got literal, waiting for output space
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	332 if(m==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	333 if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	334 if(m==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	335 s.write=q; r=s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	336 q=s.write;m=q<s.read?s.read-q-1:s.end-q;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	337
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	338 if(q==s.end&&s.read!=0){q=0;m=q<s.read?s.read-q-1:s.end-q;}
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	339 if(m==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	340 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	341 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	342 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	343 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	344 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	345 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	346 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	347 r=Z_OK;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	348
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	349 s.window[q++]=(byte)lit; m--;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	350
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	351 mode = START;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	352 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	353 case WASH: // o: got eob, possibly more output
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	354 if (k > 7){ // return unused byte, if any
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	355 k -= 8;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	356 n++;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	357 p--; // can always return one
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	358 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	359
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	360 s.write=q; r=s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	361 q=s.write;m=q<s.read?s.read-q-1:s.end-q;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	362
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	363 if (s.read != s.write){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	364 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	365 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	366 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	367 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	368 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	369 mode = END;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	370 case END:
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	371 r = Z_STREAM_END;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	372 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	373 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	374 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	375 return s.inflate_flush(r);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	376
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	377 case BADCODE: // x: got error
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	378
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	379 r = Z_DATA_ERROR;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	380
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	381 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	382 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	383 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	384 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	385
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	386 default:
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	387 r = Z_STREAM_ERROR;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	388
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	389 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	390 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	391 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	392 return s.inflate_flush(r);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	393 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	394 }
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	395 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	396
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	397 void free(ZStream z){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	398 // ZFREE(z, c);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	399 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	400
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	401 // Called with number of bytes left to write in window at least 258
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	402 // (the maximum string length) and number of input bytes available
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	403 // at least ten. The ten bytes are six bytes for the longest length/
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	404 // distance pair plus four bytes for overloading the bit buffer.
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	405
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	406 int inflate_fast(int bl, int bd,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	407 int[] tl, int tl_index,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	408 int[] td, int td_index,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	409 InfBlocks s, ZStream z){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	410 int t; // temporary pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	411 int[] tp; // temporary pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	412 int tp_index; // temporary pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	413 int e; // extra bits or operation
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	414 int b; // bit buffer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	415 int k; // bits in bit buffer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	416 int p; // input data pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	417 int n; // bytes available there
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	418 int q; // output window write pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	419 int m; // bytes to end of window or read pointer
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	420 int ml; // mask for literal/length tree
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	421 int md; // mask for distance tree
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	422 int c; // bytes to copy
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	423 int d; // distance back to copy from
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	424 int r; // copy source pointer
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	425
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	426 int tp_index_t_3; // (tp_index+t)*3
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	427
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	428 // load input, output, bit values
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	429 p=z.next_in_index;n=z.avail_in;b=s.bitb;k=s.bitk;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	430 q=s.write;m=q<s.read?s.read-q-1:s.end-q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	431
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	432 // initialize masks
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	433 ml = inflate_mask[bl];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	434 md = inflate_mask[bd];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	435
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	436 // do until not enough input or output space for fast loop
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	437 do { // assume called with m >= 258 && n >= 10
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	438 // get literal/length code
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	439 while(k<(20)){ // max bits for literal/length code
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	440 n--;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	441 b\|=(z.next_in[p++]&0xff)<<k;k+=8;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	442 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	443
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	444 t= b&ml;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	445 tp=tl;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	446 tp_index=tl_index;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	447 tp_index_t_3=(tp_index+t)*3;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	448 if ((e = tp[tp_index_t_3]) == 0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	449 b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	450
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	451 s.window[q++] = (byte)tp[tp_index_t_3+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	452 m--;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	453 continue;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	454 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	455 do {
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	456
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	457 b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	458
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	459 if((e&16)!=0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	460 e &= 15;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	461 c = tp[tp_index_t_3+2] + ((int)b & inflate_mask[e]);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	462
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	463 b>>=e; k-=e;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	464
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	465 // decode distance base of block to copy
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	466 while(k<(15)){ // max bits for distance code
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	467 n--;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	468 b\|=(z.next_in[p++]&0xff)<<k;k+=8;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	469 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	470
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	471 t= b&md;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	472 tp=td;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	473 tp_index=td_index;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	474 tp_index_t_3=(tp_index+t)*3;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	475 e = tp[tp_index_t_3];
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	476
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	477 do {
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	478
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	479 b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	480
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	481 if((e&16)!=0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	482 // get extra bits to add to distance base
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	483 e &= 15;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	484 while(k<(e)){ // get extra bits (up to 13)
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	485 n--;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	486 b\|=(z.next_in[p++]&0xff)<<k;k+=8;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	487 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	488
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	489 d = tp[tp_index_t_3+2] + (b&inflate_mask[e]);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	490
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	491 b>>=(e); k-=(e);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	492
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	493 // do the copy
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	494 m -= c;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	495 if (q >= d){ // offset before dest
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	496 // just copy
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	497 r=q-d;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	498 if(q-r>0 && 2>(q-r)){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	499 s.window[q++]=s.window[r++]; // minimum count is three,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	500 s.window[q++]=s.window[r++]; // so unroll loop a little
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	501 c-=2;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	502 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	503 else{
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	504 System.arraycopy(s.window, r, s.window, q, 2);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	505 q+=2; r+=2; c-=2;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	506 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	507 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	508 else{ // else offset after destination
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	509 r=q-d;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	510 do{
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	511 r+=s.end; // force pointer in window
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	512 }while(r<0); // covers invalid distances
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	513 e=s.end-r;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	514 if(c>e){ // if source crosses,
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	515 c-=e; // wrapped copy
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	516 if(q-r>0 && e>(q-r)){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	517 do{s.window[q++] = s.window[r++];}
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	518 while(--e!=0);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	519 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	520 else{
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	521 System.arraycopy(s.window, r, s.window, q, e);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	522 q+=e; r+=e; e=0;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	523 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	524 r = 0; // copy rest from start of window
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	525 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	526
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	527 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	528
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	529 // copy all or what's left
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	530 if(q-r>0 && c>(q-r)){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	531 do{s.window[q++] = s.window[r++];}
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	532 while(--c!=0);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	533 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	534 else{
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	535 System.arraycopy(s.window, r, s.window, q, c);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	536 q+=c; r+=c; c=0;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	537 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	538 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	539 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	540 else if((e&64)==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	541 t+=tp[tp_index_t_3+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	542 t+=(b&inflate_mask[e]);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	543 tp_index_t_3=(tp_index+t)*3;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	544 e=tp[tp_index_t_3];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	545 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	546 else{
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	547 z.msg = "invalid distance code";
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	548
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	549 c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	550
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	551 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	552 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	553 s.write=q;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	554
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	555 return Z_DATA_ERROR;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	556 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	557 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	558 while(true);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	559 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	560 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	561
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	562 if((e&64)==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	563 t+=tp[tp_index_t_3+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	564 t+=(b&inflate_mask[e]);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	565 tp_index_t_3=(tp_index+t)*3;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	566 if((e=tp[tp_index_t_3])==0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	567
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	568 b>>=(tp[tp_index_t_3+1]); k-=(tp[tp_index_t_3+1]);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	569
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	570 s.window[q++]=(byte)tp[tp_index_t_3+2];
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	571 m--;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	572 break;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	573 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	574 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	575 else if((e&32)!=0){
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	576
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	577 c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	578
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	579 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	580 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	581 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	582
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	583 return Z_STREAM_END;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	584 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	585 else{
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	586 z.msg="invalid literal/length code";
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	587
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	588 c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	589
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	590 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	591 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	592 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	593
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	594 return Z_DATA_ERROR;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	595 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	596 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	597 while(true);
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	598 }
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	599 while(m>=258 && n>= 10);
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	600
357 46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	601 // not enough input or output--restore pointers and return
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	602 c=z.avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	603
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	604 s.bitb=b;s.bitk=k;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	605 z.avail_in=n;z.total_in+=p-z.next_in_index;z.next_in_index=p;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	606 s.write=q;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	607
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	608 return Z_OK;
46c2115ae1c8 update jzlib to a21be20213d66eff15904d925e9b721956a01ef7 Carl Byington <carl@five-ten-sg.com> parents: 0 diff changeset	609 }
0 0ce5cc452d02 initial version Carl Byington <carl@five-ten-sg.com> parents: diff changeset	610 }

Mercurial > 510Connectbot

annotate src/com/jcraft/jzlib/InfCodes.java @ 392:7ac1a0b02f44