Eric Lee / linux-smarc-t335x-v3.2

Commit 4f3865fb57a04db7cca068fed1c15badc064a302

Authored by Richard Purdie 2006-06-23 05:47:34 +0800

Committed by Linus Torvalds 2006-06-23 06:05:58 +0800

Exists in master and in 4 other branches

[PATCH] zlib_inflate: Upgrade library code to a recent version

Upgrade the zlib_inflate implementation in the kernel from a patched
version 1.1.3/4 to a patched 1.2.3.

The code in the kernel is about seven years old and I noticed that the
external zlib library's inflate performance was significantly faster (~50%)
than the code in the kernel on ARM (and faster again on x86_32).

For comparison the newer deflate code is 20% slower on ARM and 50% slower
on x86_32 but gives an approx 1% compression ratio improvement.  I don't
consider this to be an improvement for kernel use so have no plans to
change the zlib_deflate code.

Various changes have been made to the zlib code in the kernel, the most
significant being the extra functions/flush option used by ppp_deflate.
This update reimplements the features PPP needs to ensure it continues to
work.

This code has been tested on ARM under both JFFS2 (with zlib compression
enabled) and ppp_deflate and on x86_32.  JFFS2 sees an approx.  10% real
world file read speed improvement.

This patch also removes ZLIB_VERSION as it no longer has a correct value.
We don't need version checks anyway as the kernel's module handling will
take care of that for us.  This removal is also more in keeping with the
zlib author's wishes (http://www.zlib.net/zlib_faq.html#faq24) and I've
added something to the zlib.h header to note its a modified version.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Acked-by: Joern Engel <joern@wh.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 24 changed files with 1877 additions and 2006 deletions Inline Diff

arch/powerpc/boot/Makefile

Diff comments View file @ 4f3865f

arch/ppc/boot/lib/Makefile

Diff comments View file @ 4f3865f

1	#	1	#
2	# Makefile for some libs needed by zImage.	2	# Makefile for some libs needed by zImage.
3	#	3	#
4		4
5	CFLAGS_kbd.o := -Idrivers/char	5	CFLAGS_kbd.o := -Idrivers/char
6	CFLAGS_vreset.o := -Iarch/ppc/boot/include	6	CFLAGS_vreset.o := -Iarch/ppc/boot/include
7		7
8	zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c	8	zlib := inffast.c inflate.c inftrees.c
9		9
10	lib-y += $(zlib:.c=.o) div64.o	10	lib-y += $(zlib:.c=.o) div64.o
11	lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o	11	lib-$(CONFIG_VGA_CONSOLE) += vreset.o kbd.o
12		12
13		13
14	# zlib files needs header from their original place	14	# zlib files needs header from their original place
15	EXTRA_CFLAGS += -Ilib/zlib_inflate	15	EXTRA_CFLAGS += -Ilib/zlib_inflate
16		16
17	quiet_cmd_copy_zlib = COPY $@	17	quiet_cmd_copy_zlib = COPY $@
18	cmd_copy_zlib = cat $< > $@	18	cmd_copy_zlib = cat $< > $@
19		19
20	$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%	20	$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
21	$(call cmd,copy_zlib)	21	$(call cmd,copy_zlib)
22		22
23	clean-files := $(zlib)	23	clean-files := $(zlib)
24		24

arch/xtensa/boot/lib/Makefile

Diff comments View file @ 4f3865f

1	#	1	#
2	# Makefile for some libs needed by zImage.	2	# Makefile for some libs needed by zImage.
3	#	3	#
4		4
5	zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c	5	zlib := inffast.c inflate.c inftrees.c
6		6
7	lib-y += $(zlib:.c=.o) zmem.o	7	lib-y += $(zlib:.c=.o) zmem.o
8		8
9	EXTRA_CFLAGS += -Ilib/zlib_inflate	9	EXTRA_CFLAGS += -Ilib/zlib_inflate
10		10
11	quiet_cmd_copy_zlib = COPY $@	11	quiet_cmd_copy_zlib = COPY $@
12	cmd_copy_zlib = cat $< > $@	12	cmd_copy_zlib = cat $< > $@
13		13
14	$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%	14	$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
15	$(call cmd,copy_zlib)	15	$(call cmd,copy_zlib)
16		16
17	clean-files := $(zlib)	17	clean-files := $(zlib)
18		18

include/linux/zconf.h

Diff comments View file @ 4f3865f

 /* zconf.h -- configuration of the zlib compression library
  * Copyright (C) 1995-1998 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 /* @(#) $Id$ */
 #ifndef _ZCONF_H
 #define _ZCONF_H
 /* The memory requirements for deflate are (in bytes):
             (1 << (windowBits+2)) +  (1 << (memLevel+9))
  that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
  plus a few kilobytes for small objects. For example, if you want to reduce
  the default memory requirements from 256K to 128K, compile with
      make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
  Of course this will generally degrade compression (there's no free lunch).
    The memory requirements for inflate are (in bytes) 1 << windowBits
  that is, 32K for windowBits=15 (default value) plus a few kilobytes
  for small objects.
 */
 /* Maximum value for memLevel in deflateInit2 */
 #ifndef MAX_MEM_LEVEL
 #  define MAX_MEM_LEVEL 8
 #endif
 /* Maximum value for windowBits in deflateInit2 and inflateInit2.
  * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
  * created by gzip. (Files created by minigzip can still be extracted by
  * gzip.)
  */
 #ifndef MAX_WBITS
 #  define MAX_WBITS   15 /* 32K LZ77 window */
 #endif
+/* default windowBits for decompression. MAX_WBITS is for compression only */
+#ifndef DEF_WBITS
+#  define DEF_WBITS MAX_WBITS
+#endif
+/* default memLevel */
+#if MAX_MEM_LEVEL >= 8
+#  define DEF_MEM_LEVEL 8
+#else
+#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
+#endif
                         /* Type declarations */
 typedef unsigned char  Byte;  /* 8 bits */
 typedef unsigned int   uInt;  /* 16 bits or more */
 typedef unsigned long  uLong; /* 32 bits or more */
 typedef void     *voidp;
 #endif /* _ZCONF_H */

include/linux/zlib.h

Diff comments View file @ 4f3865f

 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.3, July 9th, 1998
-  Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
   arising from the use of this software.
   Permission is granted to anyone to use this software for any purpose,
   including commercial applications, and to alter it and redistribute it
   freely, subject to the following restrictions:
   1. The origin of this software must not be misrepresented; you must not
      claim that you wrote the original software. If you use this software
      in a product, an acknowledgment in the product documentation would be
      appreciated but is not required.
   2. Altered source versions must be plainly marked as such, and must not be
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
   Jean-loup Gailly        Mark Adler
   jloup@gzip.org          madler@alumni.caltech.edu
   The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
   (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
 */
 #ifndef _ZLIB_H
 #define _ZLIB_H
 #include <linux/zconf.h>
-#define ZLIB_VERSION "1.1.3"
+/* zlib deflate based on ZLIB_VERSION "1.1.3" */
+/* zlib inflate based on ZLIB_VERSION "1.2.3" */
+/*
+  This is a modified version of zlib for use inside the Linux kernel.
+  The main changes are to perform all memory allocation in advance.
+  Inflation Changes:
+    * Z_PACKET_FLUSH is added and used by ppp_deflate. Before returning
+      this checks there is no more input data available and the next data
+      is a STORED block. It also resets the mode to be read for the next
+      data, all as per PPP requirements.
+    * Addition of zlib_inflateIncomp which copies incompressible data into
+      the history window and adjusts the accoutning without calling
+      zlib_inflate itself to inflate the data.
+*/
 /*
      The 'zlib' compression library provides in-memory compression and
   decompression functions, including integrity checks of the uncompressed
   data.  This version of the library supports only one compression method
   (deflation) but other algorithms will be added later and will have the same
   stream interface.
      Compression can be done in a single step if the buffers are large
   enough (for example if an input file is mmap'ed), or can be done by
   repeated calls of the compression function.  In the latter case, the
   application must provide more input and/or consume the output
   (providing more output space) before each call.
+     The compressed data format used by default by the in-memory functions is
+  the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped
+  around a deflate stream, which is itself documented in RFC 1951.
      The library also supports reading and writing files in gzip (.gz) format
   with an interface similar to that of stdio.
+     The zlib format was designed to be compact and fast for use in memory
+  and on communications channels.  The gzip format was designed for single-
+  file compression on file systems, has a larger header than zlib to maintain
+  directory information, and uses a different, slower check method than zlib.
      The library does not install any signal handler. The decoder checks
   the consistency of the compressed data, so the library should never
   crash even in case of corrupted input.
 */
 struct internal_state;
 typedef struct z_stream_s {
     Byte    *next_in;   /* next input byte */
     uInt     avail_in;  /* number of bytes available at next_in */
     uLong    total_in;  /* total nb of input bytes read so far */
     Byte    *next_out;  /* next output byte should be put there */
     uInt     avail_out; /* remaining free space at next_out */
     uLong    total_out; /* total nb of bytes output so far */
     char     *msg;      /* last error message, NULL if no error */
     struct internal_state *state; /* not visible by applications */
     void     *workspace; /* memory allocated for this stream */
     int     data_type;  /* best guess about the data type: ascii or binary */
     uLong   adler;      /* adler32 value of the uncompressed data */
     uLong   reserved;   /* reserved for future use */
 } z_stream;
 typedef z_stream *z_streamp;
 /*
    The application must update next_in and avail_in when avail_in has
    dropped to zero. It must update next_out and avail_out when avail_out
    has dropped to zero. The application must initialize zalloc, zfree and
    opaque before calling the init function. All other fields are set by the
    compression library and must not be updated by the application.
    The opaque value provided by the application will be passed as the first
    parameter for calls of zalloc and zfree. This can be useful for custom
    memory management. The compression library attaches no meaning to the
    opaque value.
    zalloc must return NULL if there is not enough memory for the object.
    If zlib is used in a multi-threaded application, zalloc and zfree must be
    thread safe.
    On 16-bit systems, the functions zalloc and zfree must be able to allocate
    exactly 65536 bytes, but will not be required to allocate more than this
    if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
    pointers returned by zalloc for objects of exactly 65536 bytes *must*
    have their offset normalized to zero. The default allocation function
    provided by this library ensures this (see zutil.c). To reduce memory
    requirements and avoid any allocation of 64K objects, at the expense of
    compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
    The fields total_in and total_out can be used for statistics or
    progress reports. After compression, total_in holds the total size of
    the uncompressed data and may be saved for use in the decompressor
    (particularly if the decompressor wants to decompress everything in
    a single step).
 */
                         /* constants */
 #define Z_NO_FLUSH      0
 #define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
 #define Z_PACKET_FLUSH  2
 #define Z_SYNC_FLUSH    3
 #define Z_FULL_FLUSH    4
 #define Z_FINISH        5
-/* Allowed flush values; see deflate() below for details */
+#define Z_BLOCK         6 /* Only for inflate at present */
+/* Allowed flush values; see deflate() and inflate() below for details */
 #define Z_OK            0
 #define Z_STREAM_END    1
 #define Z_NEED_DICT     2
 #define Z_ERRNO        (-1)
 #define Z_STREAM_ERROR (-2)
 #define Z_DATA_ERROR   (-3)
 #define Z_MEM_ERROR    (-4)
 #define Z_BUF_ERROR    (-5)
 #define Z_VERSION_ERROR (-6)
 /* Return codes for the compression/decompression functions. Negative
  * values are errors, positive values are used for special but normal events.
  */
 #define Z_NO_COMPRESSION         0
 #define Z_BEST_SPEED             1
 #define Z_BEST_COMPRESSION       9
 #define Z_DEFAULT_COMPRESSION  (-1)
 /* compression levels */
 #define Z_FILTERED            1
 #define Z_HUFFMAN_ONLY        2
 #define Z_DEFAULT_STRATEGY    0
 /* compression strategy; see deflateInit2() below for details */
 #define Z_BINARY   0
 #define Z_ASCII    1
 #define Z_UNKNOWN  2
 /* Possible values of the data_type field */
 #define Z_DEFLATED   8
 /* The deflate compression method (the only one supported in this version) */
                         /* basic functions */
-extern const char * zlib_zlibVersion (void);
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
 extern int zlib_deflate_workspacesize (void);
 /*
    Returns the number of bytes that needs to be allocated for a per-
    stream workspace.  A pointer to this number of bytes should be
    returned in stream->workspace before calling zlib_deflateInit().
 */
 /*
 extern int deflateInit (z_streamp strm, int level);
      Initializes the internal stream state for compression. The fields
    zalloc, zfree and opaque must be initialized before by the caller.
    If zalloc and zfree are set to NULL, deflateInit updates them to
    use default allocation functions.
      The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
    1 gives best speed, 9 gives best compression, 0 gives no compression at
    all (the input data is simply copied a block at a time).
    Z_DEFAULT_COMPRESSION requests a default compromise between speed and
    compression (currently equivalent to level 6).
      deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if level is not a valid compression level,
    Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
    with the version assumed by the caller (ZLIB_VERSION).
    msg is set to null if there is no error message.  deflateInit does not
    perform any compression: this will be done by deflate().
 */
 extern int zlib_deflate (z_streamp strm, int flush);
 /*
     deflate compresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full. It may introduce some
   output latency (reading input without producing any output) except when
   forced to flush.
     The detailed semantics are as follows. deflate performs one or both of the
   following actions:
   - Compress more input starting at next_in and update next_in and avail_in
     accordingly. If not all input can be processed (because there is not
     enough room in the output buffer), next_in and avail_in are updated and
     processing will resume at this point for the next call of deflate().
   - Provide more output starting at next_out and update next_out and avail_out
     accordingly. This action is forced if the parameter flush is non zero.
     Forcing flush frequently degrades the compression ratio, so this parameter
     should be set only when necessary (in interactive applications).
     Some output may be provided even if flush is not set.
   Before the call of deflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming
   more output, and updating avail_in or avail_out accordingly; avail_out
   should never be zero before the call. The application can consume the
   compressed output when it wants, for example when the output buffer is full
   (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
   and with zero avail_out, it must be called again after making room in the
   output buffer because there might be more output pending.
     If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
   flushed to the output buffer and the output is aligned on a byte boundary, so
   that the decompressor can get all input data available so far. (In particular
   avail_in is zero after the call if enough output space has been provided
   before the call.)  Flushing may degrade compression for some compression
   algorithms and so it should be used only when necessary.
     If flush is set to Z_FULL_FLUSH, all output is flushed as with
   Z_SYNC_FLUSH, and the compression state is reset so that decompression can
   restart from this point if previous compressed data has been damaged or if
   random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
   the compression.
     If deflate returns with avail_out == 0, this function must be called again
   with the same value of the flush parameter and more output space (updated
   avail_out), until the flush is complete (deflate returns with non-zero
   avail_out).
     If the parameter flush is set to Z_FINISH, pending input is processed,
   pending output is flushed and deflate returns with Z_STREAM_END if there
   was enough output space; if deflate returns with Z_OK, this function must be
   called again with Z_FINISH and more output space (updated avail_out) but no
   more input data, until it returns with Z_STREAM_END or an error. After
   deflate has returned Z_STREAM_END, the only possible operations on the
   stream are deflateReset or deflateEnd.
     Z_FINISH can be used immediately after deflateInit if all the compression
   is to be done in a single step. In this case, avail_out must be at least
   0.1% larger than avail_in plus 12 bytes.  If deflate does not return
   Z_STREAM_END, then it must be called again as described above.
     deflate() sets strm->adler to the adler32 checksum of all input read
   so far (that is, total_in bytes).
     deflate() may update data_type if it can make a good guess about
   the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
   binary. This field is only for information purposes and does not affect
   the compression algorithm in any manner.
     deflate() returns Z_OK if some progress has been made (more input
   processed or more output produced), Z_STREAM_END if all input has been
   consumed and all output has been produced (only when flush is set to
   Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
   if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
   (for example avail_in or avail_out was zero).
 */
 extern int zlib_deflateEnd (z_streamp strm);
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any
    pending output.
      deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
    stream state was inconsistent, Z_DATA_ERROR if the stream was freed
    prematurely (some input or output was discarded). In the error case,
    msg may be set but then points to a static string (which must not be
    deallocated).
 */
 extern int zlib_inflate_workspacesize (void);
 /*
    Returns the number of bytes that needs to be allocated for a per-
    stream workspace.  A pointer to this number of bytes should be
    returned in stream->workspace before calling zlib_inflateInit().
 */
 /*
 extern int zlib_inflateInit (z_streamp strm);
      Initializes the internal stream state for decompression. The fields
    next_in, avail_in, and workspace must be initialized before by
    the caller. If next_in is not NULL and avail_in is large enough (the exact
    value depends on the compression method), inflateInit determines the
    compression method from the zlib header and allocates all data structures
    accordingly; otherwise the allocation will be deferred to the first call of
    inflate.  If zalloc and zfree are set to NULL, inflateInit updates them to
    use default allocation functions.
      inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
    version assumed by the caller.  msg is set to null if there is no error
    message. inflateInit does not perform any decompression apart from reading
    the zlib header if present: this will be done by inflate().  (So next_in and
    avail_in may be modified, but next_out and avail_out are unchanged.)
 */
 extern int zlib_inflate (z_streamp strm, int flush);
 /*
     inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may some
+  buffer becomes empty or the output buffer becomes full. It may introduce
-  introduce some output latency (reading input without producing any output)
+  some output latency (reading input without producing any output) except when
-  except when forced to flush.
+  forced to flush.
   The detailed semantics are as follows. inflate performs one or both of the
   following actions:
   - Decompress more input starting at next_in and update next_in and avail_in
     accordingly. If not all input can be processed (because there is not
     enough room in the output buffer), next_in is updated and processing
     will resume at this point for the next call of inflate().
   - Provide more output starting at next_out and update next_out and avail_out
     accordingly.  inflate() provides as much output as possible, until there
     is no more input data or no more space in the output buffer (see below
     about the flush parameter).
   Before the call of inflate(), the application should ensure that at least
   one of the actions is possible, by providing more input and/or consuming
   more output, and updating the next_* and avail_* values accordingly.
   The application can consume the uncompressed output when it wants, for
   example when the output buffer is full (avail_out == 0), or after each
   call of inflate(). If inflate returns Z_OK and with zero avail_out, it
   must be called again after making room in the output buffer because there
   might be more output pending.
-    If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
+    The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH,
-  output as possible to the output buffer. The flushing behavior of inflate is
+  Z_FINISH, or Z_BLOCK. Z_SYNC_FLUSH requests that inflate() flush as much
-  not specified for values of the flush parameter other than Z_SYNC_FLUSH
+  output as possible to the output buffer. Z_BLOCK requests that inflate() stop
-  and Z_FINISH, but the current implementation actually flushes as much output
+  if and when it gets to the next deflate block boundary. When decoding the
-  as possible anyway.
+  zlib or gzip format, this will cause inflate() to return immediately after
+  the header and before the first block. When doing a raw inflate, inflate()
+  will go ahead and process the first block, and will return when it gets to
+  the end of that block, or when it runs out of data.
+    The Z_BLOCK option assists in appending to or combining deflate streams.
+  Also to assist in this, on return inflate() will set strm->data_type to the
+  number of unused bits in the last byte taken from strm->next_in, plus 64
+  if inflate() is currently decoding the last block in the deflate stream,
+  plus 128 if inflate() returned immediately after decoding an end-of-block
+  code or decoding the complete header up to just before the first byte of the
+  deflate stream. The end-of-block will not be indicated until all of the
+  uncompressed data from that block has been written to strm->next_out.  The
+  number of unused bits may in general be greater than seven, except when
+  bit 7 of data_type is set, in which case the number of unused bits will be
+  less than eight.
     inflate() should normally be called until it returns Z_STREAM_END or an
   error. However if all decompression is to be performed in a single step
   (a single call of inflate), the parameter flush should be set to
   Z_FINISH. In this case all pending input is processed and all pending
   output is flushed; avail_out must be large enough to hold all the
   uncompressed data. (The size of the uncompressed data may have been saved
   by the compressor for this purpose.) The next operation on this stream must
   be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster routine
+  is never required, but can be used to inform inflate that a faster approach
   may be used for the single inflate() call.
-     If a preset dictionary is needed at this point (see inflateSetDictionary
+     In this implementation, inflate() always flushes as much output as
-  below), inflate sets strm-adler to the adler32 checksum of the
+  possible to the output buffer, and always uses the faster approach on the
-  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise
+  first call. So the only effect of the flush parameter in this implementation
-  it sets strm->adler to the adler32 checksum of all output produced
+  is on the return value of inflate(), as noted below, or when it returns early
-  so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
+  because Z_BLOCK is used.
-  an error code as described below. At the end of the stream, inflate()
-  checks that its computed adler32 checksum is equal to that saved by the
-  compressor and returns Z_STREAM_END only if the checksum is correct.
+     If a preset dictionary is needed after this call (see inflateSetDictionary
+  below), inflate sets strm->adler to the adler32 checksum of the dictionary
+  chosen by the compressor and returns Z_NEED_DICT; otherwise it sets
+  strm->adler to the adler32 checksum of all output produced so far (that is,
+  total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described
+  below. At the end of the stream, inflate() checks that its computed adler32
+  checksum is equal to that saved by the compressor and returns Z_STREAM_END
+  only if the checksum is correct.
+    inflate() will decompress and check either zlib-wrapped or gzip-wrapped
+  deflate data.  The header type is detected automatically.  Any information
+  contained in the gzip header is not retained, so applications that need that
+  information should instead use raw inflate, see inflateInit2() below, or
+  inflateBack() and perform their own processing of the gzip header and
+  trailer.
     inflate() returns Z_OK if some progress has been made (more input processed
   or more output produced), Z_STREAM_END if the end of the compressed data has
   been reached and all uncompressed output has been produced, Z_NEED_DICT if a
   preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect
+  corrupted (input stream not conforming to the zlib format or incorrect check
-  adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
+  value), Z_STREAM_ERROR if the stream structure was inconsistent (for example
-  (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
+  if next_in or next_out was NULL), Z_MEM_ERROR if there was not enough memory,
-  enough memory, Z_BUF_ERROR if no progress is possible or if there was not
+  Z_BUF_ERROR if no progress is possible or if there was not enough room in the
-  enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
+  output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and
-  case, the application may then call inflateSync to look for a good
+  inflate() can be called again with more input and more output space to
-  compression block.
+  continue decompressing. If Z_DATA_ERROR is returned, the application may then
+  call inflateSync() to look for a good compression block if a partial recovery
+  of the data is desired.
 */
 extern int zlib_inflateEnd (z_streamp strm);
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any
    pending output.
      inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
    was inconsistent. In the error case, msg may be set but then points to a
    static string (which must not be deallocated).
 */
                         /* Advanced functions */
 /*
     The following functions are needed only in some special applications.
 */
 /*
 extern int deflateInit2 (z_streamp strm,
                                      int  level,
                                      int  method,
                                      int  windowBits,
                                      int  memLevel,
                                      int  strategy);
      This is another version of deflateInit with more compression options. The
    fields next_in, zalloc, zfree and opaque must be initialized before by
    the caller.
      The method parameter is the compression method. It must be Z_DEFLATED in
    this version of the library.
      The windowBits parameter is the base two logarithm of the window size
    (the size of the history buffer).  It should be in the range 8..15 for this
    version of the library. Larger values of this parameter result in better
    compression at the expense of memory usage. The default value is 15 if
    deflateInit is used instead.
      The memLevel parameter specifies how much memory should be allocated
    for the internal compression state. memLevel=1 uses minimum memory but
    is slow and reduces compression ratio; memLevel=9 uses maximum memory
    for optimal speed. The default value is 8. See zconf.h for total memory
    usage as a function of windowBits and memLevel.
      The strategy parameter is used to tune the compression algorithm. Use the
    value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
    filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
    string match).  Filtered data consists mostly of small values with a
    somewhat random distribution. In this case, the compression algorithm is
    tuned to compress them better. The effect of Z_FILTERED is to force more
    Huffman coding and less string matching; it is somewhat intermediate
    between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
    the compression ratio but not the correctness of the compressed output even
    if it is not set appropriately.
       deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
    memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
    method). msg is set to null if there is no error message.  deflateInit2 does
    not perform any compression: this will be done by deflate().
 */
 #if 0
 extern int zlib_deflateSetDictionary (z_streamp strm,
 						     const Byte *dictionary,
 						     uInt  dictLength);
 #endif
 /*
      Initializes the compression dictionary from the given byte sequence
    without producing any compressed output. This function must be called
    immediately after deflateInit, deflateInit2 or deflateReset, before any
    call of deflate. The compressor and decompressor must use exactly the same
    dictionary (see inflateSetDictionary).
      The dictionary should consist of strings (byte sequences) that are likely
    to be encountered later in the data to be compressed, with the most commonly
    used strings preferably put towards the end of the dictionary. Using a
    dictionary is most useful when the data to be compressed is short and can be
    predicted with good accuracy; the data can then be compressed better than
    with the default empty dictionary.
      Depending on the size of the compression data structures selected by
    deflateInit or deflateInit2, a part of the dictionary may in effect be
    discarded, for example if the dictionary is larger than the window size in
    deflate or deflate2. Thus the strings most likely to be useful should be
    put at the end of the dictionary, not at the front.
      Upon return of this function, strm->adler is set to the Adler32 value
    of the dictionary; the decompressor may later use this value to determine
    which dictionary has been used by the compressor. (The Adler32 value
    applies to the whole dictionary even if only a subset of the dictionary is
    actually used by the compressor.)
      deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
    parameter is invalid (such as NULL dictionary) or the stream state is
    inconsistent (for example if deflate has already been called for this stream
    or if the compression method is bsort). deflateSetDictionary does not
    perform any compression: this will be done by deflate().
 */
 #if 0
 extern int zlib_deflateCopy (z_streamp dest, z_streamp source);
 #endif
 /*
      Sets the destination stream as a complete copy of the source stream.
      This function can be useful when several compression strategies will be
    tried, for example when there are several ways of pre-processing the input
    data with a filter. The streams that will be discarded should then be freed
    by calling deflateEnd.  Note that deflateCopy duplicates the internal
    compression state which can be quite large, so this strategy is slow and
    can consume lots of memory.
      deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
    enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
    (such as zalloc being NULL). msg is left unchanged in both source and
    destination.
 */
 extern int zlib_deflateReset (z_streamp strm);
 /*
      This function is equivalent to deflateEnd followed by deflateInit,
    but does not free and reallocate all the internal compression state.
    The stream will keep the same compression level and any other attributes
    that may have been set by deflateInit2.
       deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 static inline unsigned long deflateBound(unsigned long s)
 {
 	return s + ((s + 7) >> 3) + ((s + 63) >> 6) + 11;
 }
 #if 0
 extern int zlib_deflateParams (z_streamp strm, int level, int strategy);
 #endif
 /*
      Dynamically update the compression level and compression strategy.  The
    interpretation of level and strategy is as in deflateInit2.  This can be
    used to switch between compression and straight copy of the input data, or
    to switch to a different kind of input data requiring a different
    strategy. If the compression level is changed, the input available so far
    is compressed with the old level (and may be flushed); the new level will
    take effect only at the next call of deflate().
      Before the call of deflateParams, the stream state must be set as for
    a call of deflate(), since the currently available input may have to
    be compressed and flushed. In particular, strm->avail_out must be non-zero.
      deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
    stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
    if strm->avail_out was zero.
 */
 /*
 extern int inflateInit2 (z_streamp strm, int  windowBits);
      This is another version of inflateInit with an extra parameter. The
    fields next_in, avail_in, zalloc, zfree and opaque must be initialized
    before by the caller.
      The windowBits parameter is the base two logarithm of the maximum window
    size (the size of the history buffer).  It should be in the range 8..15 for
    this version of the library. The default value is 15 if inflateInit is used
-   instead. If a compressed stream with a larger window size is given as
+   instead. windowBits must be greater than or equal to the windowBits value
-   input, inflate() will return with the error code Z_DATA_ERROR instead of
+   provided to deflateInit2() while compressing, or it must be equal to 15 if
-   trying to allocate a larger window.
+   deflateInit2() was not used. If a compressed stream with a larger window
+   size is given as input, inflate() will return with the error code
+   Z_DATA_ERROR instead of trying to allocate a larger window.
-      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+     windowBits can also be -8..-15 for raw inflate. In this case, -windowBits
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
+   determines the window size. inflate() will then process raw deflate data,
-   memLevel). msg is set to null if there is no error message.  inflateInit2
+   not looking for a zlib or gzip header, not generating a check value, and not
-   does not perform any decompression apart from reading the zlib header if
+   looking for any check values for comparison at the end of the stream. This
-   present: this will be done by inflate(). (So next_in and avail_in may be
+   is for use with other formats that use the deflate compressed data format
-   modified, but next_out and avail_out are unchanged.)
+   such as zip.  Those formats provide their own check values. If a custom
+   format is developed using the raw deflate format for compressed data, it is
+   recommended that a check value such as an adler32 or a crc32 be applied to
+   the uncompressed data as is done in the zlib, gzip, and zip formats.  For
+   most applications, the zlib format should be used as is. Note that comments
+   above on the use in deflateInit2() applies to the magnitude of windowBits.
+     windowBits can also be greater than 15 for optional gzip decoding. Add
+   32 to windowBits to enable zlib and gzip decoding with automatic header
+   detection, or add 16 to decode only the gzip format (the zlib format will
+   return a Z_DATA_ERROR).  If a gzip stream is being decoded, strm->adler is
+   a crc32 instead of an adler32.
+     inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
+   memory, Z_STREAM_ERROR if a parameter is invalid (such as a null strm). msg
+   is set to null if there is no error message.  inflateInit2 does not perform
+   any decompression apart from reading the zlib header if present: this will
+   be done by inflate(). (So next_in and avail_in may be modified, but next_out
+   and avail_out are unchanged.)
 */
 extern int zlib_inflateSetDictionary (z_streamp strm,
 						     const Byte *dictionary,
 						     uInt  dictLength);
 /*
      Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate
+   sequence. This function must be called immediately after a call of inflate,
-   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
+   if that call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the Adler32 value returned by this call of
+   can be determined from the adler32 value returned by that call of inflate.
-   inflate. The compressor and decompressor must use exactly the same
+   The compressor and decompressor must use exactly the same dictionary (see
-   dictionary (see deflateSetDictionary).
+   deflateSetDictionary).  For raw inflate, this function can be called
+   immediately after inflateInit2() or inflateReset() and before any call of
+   inflate() to set the dictionary.  The application must insure that the
+   dictionary that was used for compression is provided.
      inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
    parameter is invalid (such as NULL dictionary) or the stream state is
    inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler32 value). inflateSetDictionary does not
+   expected one (incorrect adler32 value). inflateSetDictionary does not
    perform any decompression: this will be done by subsequent calls of
    inflate().
 */
 #if 0
 extern int zlib_inflateSync (z_streamp strm);
 #endif
 /*
     Skips invalid compressed data until a full flush point (see above the
   description of deflate with Z_FULL_FLUSH) can be found, or until all
   available input is skipped. No output is provided.
     inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
   if no more input was provided, Z_DATA_ERROR if no flush point has been found,
   or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
   case, the application may save the current current value of total_in which
   indicates where valid compressed data was found. In the error case, the
   application may repeatedly call inflateSync, providing more input each time,
   until success or end of the input data.
 */
 extern int zlib_inflateReset (z_streamp strm);
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
    but does not free and reallocate all the internal decompression state.
    The stream will keep attributes that may have been set by inflateInit2.
       inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 extern int zlib_inflateIncomp (z_stream *strm);
 /*
      This function adds the data at next_in (avail_in bytes) to the output
    history without performing any output.  There must be no pending output,
    and the decompressor must be expecting to see the start of a block.
    Calling this function is equivalent to decompressing a stored block
    containing the data at next_in (except that the data is not output).
 */
-                        /* various hacks, don't look :) */
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-extern int zlib_deflateInit_ (z_streamp strm, int level,

include/linux/zutil.h

Diff comments View file @ 4f3865f

 /* zutil.h -- internal interface and configuration of the compression library
  * Copyright (C) 1995-1998 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 /* WARNING: this file should *not* be used by applications. It is
    part of the implementation of the compression library and is
    subject to change. Applications should only use zlib.h.
  */
 /* @(#) $Id: zutil.h,v 1.1 2000/01/01 03:32:23 davem Exp $ */
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
 #include <linux/zlib.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
 typedef unsigned char  uch;
 typedef unsigned short ush;
 typedef unsigned long  ulg;
         /* common constants */
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
 #define STORED_BLOCK 0
 #define STATIC_TREES 1
 #define DYN_TREES    2
 /* The three kinds of block type */
 #define MIN_MATCH  3
 #define MAX_MATCH  258
 /* The minimum and maximum match lengths */
 #define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
         /* target dependencies */
         /* Common defaults */
 #ifndef OS_CODE
 #  define OS_CODE  0x03  /* assume Unix */
 #endif
          /* functions */
 typedef uLong (*check_func) (uLong check, const Byte *buf,
 				       uInt len);
                         /* checksum functions */
 #define BASE 65521L /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
 #define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
 #define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
 #define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
 #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
 #define DO16(buf)   DO8(buf,0); DO8(buf,8);
 /* ========================================================================= */
 /*
      Update a running Adler-32 checksum with the bytes buf[0..len-1] and
    return the updated checksum. If buf is NULL, this function returns
    the required initial value for the checksum.
    An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
    much faster. Usage example:
      uLong adler = adler32(0L, NULL, 0);
      while (read_buffer(buffer, length) != EOF) {
        adler = adler32(adler, buffer, length);
      }
      if (adler != original_adler) error();
 */
 static inline uLong zlib_adler32(uLong adler,
 				 const Byte *buf,
 				 uInt len)
 {
     unsigned long s1 = adler & 0xffff;
     unsigned long s2 = (adler >> 16) & 0xffff;
     int k;
     if (buf == NULL) return 1L;
     while (len > 0) {
         k = len < NMAX ? len : NMAX;
         len -= k;
         while (k >= 16) {
             DO16(buf);
 	    buf += 16;
             k -= 16;
         }
         if (k != 0) do {
             s1 += *buf++;
 	    s2 += s1;
         } while (--k);
         s1 %= BASE;
         s2 %= BASE;
     }
     return (s2 << 16) | s1;
 }
 #endif /* _Z_UTIL_H */

lib/zlib_deflate/deflate.c

Diff comments View file @ 4f3865f

 /* +++ deflate.c */
 /* deflate.c -- compress data using the deflation algorithm
  * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 /*
  *  ALGORITHM
  *
  *      The "deflation" process depends on being able to identify portions
  *      of the input text which are identical to earlier input (within a
  *      sliding window trailing behind the input currently being processed).
  *
  *      The most straightforward technique turns out to be the fastest for
  *      most input files: try all possible matches and select the longest.
  *      The key feature of this algorithm is that insertions into the string
  *      dictionary are very simple and thus fast, and deletions are avoided
  *      completely. Insertions are performed at each input character, whereas
  *      string matches are performed only when the previous match ends. So it
  *      is preferable to spend more time in matches to allow very fast string
  *      insertions and avoid deletions. The matching algorithm for small
  *      strings is inspired from that of Rabin & Karp. A brute force approach
  *      is used to find longer strings when a small match has been found.
  *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
  *      (by Leonid Broukhis).
  *         A previous version of this file used a more sophisticated algorithm
  *      (by Fiala and Greene) which is guaranteed to run in linear amortized
  *      time, but has a larger average cost, uses more memory and is patented.
  *      However the F&G algorithm may be faster for some highly redundant
  *      files if the parameter max_chain_length (described below) is too large.
  *
  *  ACKNOWLEDGEMENTS
  *
  *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
  *      I found it in 'freeze' written by Leonid Broukhis.
  *      Thanks to many people for bug reports and testing.
  *
  *  REFERENCES
  *
  *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
  *      Available in ftp://ds.internic.net/rfc/rfc1951.txt
  *
  *      A description of the Rabin and Karp algorithm is given in the book
  *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
  *
  *      Fiala,E.R., and Greene,D.H.
  *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
  *
  */
 #include <linux/module.h>
 #include <linux/zutil.h>
 #include "defutil.h"
 /* ===========================================================================
  *  Function prototypes.
  */
 typedef enum {
     need_more,      /* block not completed, need more input or more output */
     block_done,     /* block flush performed */
     finish_started, /* finish started, need only more output at next deflate */
     finish_done     /* finish done, accept no more input or output */
 } block_state;
 typedef block_state (*compress_func) (deflate_state *s, int flush);
 /* Compression function. Returns the block state after the call. */
 static void fill_window    (deflate_state *s);
 static block_state deflate_stored (deflate_state *s, int flush);
 static block_state deflate_fast   (deflate_state *s, int flush);
 static block_state deflate_slow   (deflate_state *s, int flush);
 static void lm_init        (deflate_state *s);
 static void putShortMSB    (deflate_state *s, uInt b);
 static void flush_pending  (z_streamp strm);
 static int read_buf        (z_streamp strm, Byte *buf, unsigned size);
 static uInt longest_match  (deflate_state *s, IPos cur_match);
 #ifdef DEBUG_ZLIB
 static  void check_match (deflate_state *s, IPos start, IPos match,
                          int length);
 #endif
 /* ===========================================================================
  * Local data
  */
 #define NIL 0
 /* Tail of hash chains */
 #ifndef TOO_FAR
 #  define TOO_FAR 4096
 #endif
 /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
 #define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
 /* Minimum amount of lookahead, except at the end of the input file.
  * See deflate.c for comments about the MIN_MATCH+1.
  */
 /* Values for max_lazy_match, good_match and max_chain_length, depending on
  * the desired pack level (0..9). The values given below have been tuned to
  * exclude worst case performance for pathological files. Better values may be
  * found for specific files.
  */
 typedef struct config_s {
    ush good_length; /* reduce lazy search above this match length */
    ush max_lazy;    /* do not perform lazy search above this match length */
    ush nice_length; /* quit search above this match length */
    ush max_chain;
    compress_func func;
 } config;
 static const config configuration_table[10] = {
 /*      good lazy nice chain */
 /* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
 /* 1 */ {4,    4,  8,    4, deflate_fast}, /* maximum speed, no lazy matches */
 /* 2 */ {4,    5, 16,    8, deflate_fast},
 /* 3 */ {4,    6, 32,   32, deflate_fast},
 /* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
 /* 5 */ {8,   16, 32,   32, deflate_slow},
 /* 6 */ {8,   16, 128, 128, deflate_slow},
 /* 7 */ {8,   32, 128, 256, deflate_slow},
 /* 8 */ {32, 128, 258, 1024, deflate_slow},
 /* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* maximum compression */
 /* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
  * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
  * meaning.
  */
 #define EQUAL 0
 /* result of memcmp for equal strings */
 /* ===========================================================================
  * Update a hash value with the given input byte
  * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
  *    input characters, so that a running hash key can be computed from the
  *    previous key instead of complete recalculation each time.
  */
 #define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
 /* ===========================================================================
  * Insert string str in the dictionary and set match_head to the previous head
  * of the hash chain (the most recent string with same hash key). Return
  * the previous length of the hash chain.
  * IN  assertion: all calls to to INSERT_STRING are made with consecutive
  *    input characters and the first MIN_MATCH bytes of str are valid
  *    (except for the last MIN_MATCH-1 bytes of the input file).
  */
 #define INSERT_STRING(s, str, match_head) \
    (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
     s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
     s->head[s->ins_h] = (Pos)(str))
 /* ===========================================================================
  * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
  * prev[] will be initialized on the fly.
  */
 #define CLEAR_HASH(s) \
     s->head[s->hash_size-1] = NIL; \
     memset((char *)s->head, 0, (unsigned)(s->hash_size-1)*sizeof(*s->head));
 /* ========================================================================= */
-int zlib_deflateInit_(
+int zlib_deflateInit2(
 	z_streamp strm,
-	int level,
-	const char *version,
-	int stream_size
-)
-{
-    return zlib_deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS,
-			      DEF_MEM_LEVEL,
-			      Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-/* ========================================================================= */
-int zlib_deflateInit2_(
-	z_streamp strm,
 	int  level,
 	int  method,
 	int  windowBits,
 	int  memLevel,
-	int  strategy,
+	int  strategy
-	const char *version,
-	int stream_size
 )
 {
     deflate_state *s;
     int noheader = 0;
-    static char* my_version = ZLIB_VERSION;
     deflate_workspace *mem;
     ush *overlay;
     /* We overlay pending_buf and d_buf+l_buf. This works since the average
      * output size for (length,distance) codes is <= 24 bits.
      */
-    if (version == NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-	return Z_VERSION_ERROR;
-    }
     if (strm == NULL) return Z_STREAM_ERROR;
     strm->msg = NULL;
     if (level == Z_DEFAULT_COMPRESSION) level = 6;
     mem = (deflate_workspace *) strm->workspace;
     if (windowBits < 0) { /* undocumented feature: suppress zlib header */
         noheader = 1;
         windowBits = -windowBits;
     }
     if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
         windowBits < 9 || windowBits > 15 || level < 0 || level > 9 ||
 	strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
         return Z_STREAM_ERROR;
     }
     s = (deflate_state *) &(mem->deflate_memory);
     strm->state = (struct internal_state *)s;
     s->strm = strm;
     s->noheader = noheader;
     s->w_bits = windowBits;
     s->w_size = 1 << s->w_bits;
     s->w_mask = s->w_size - 1;
     s->hash_bits = memLevel + 7;
     s->hash_size = 1 << s->hash_bits;
     s->hash_mask = s->hash_size - 1;
     s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
     s->window = (Byte *) mem->window_memory;
     s->prev   = (Pos *)  mem->prev_memory;
     s->head   = (Pos *)  mem->head_memory;
     s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
     overlay = (ush *) mem->overlay_memory;
     s->pending_buf = (uch *) overlay;
     s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
     s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
     s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
     s->level = level;
     s->strategy = strategy;
     s->method = (Byte)method;
     return zlib_deflateReset(strm);
 }
 /* ========================================================================= */
 #if 0
 int zlib_deflateSetDictionary(
 	z_streamp strm,
 	const Byte *dictionary,
 	uInt  dictLength
 )
 {
     deflate_state *s;
     uInt length = dictLength;
     uInt n;
     IPos hash_head = 0;
     if (strm == NULL || strm->state == NULL || dictionary == NULL)
 	return Z_STREAM_ERROR;
     s = (deflate_state *) strm->state;
     if (s->status != INIT_STATE) return Z_STREAM_ERROR;
     strm->adler = zlib_adler32(strm->adler, dictionary, dictLength);
     if (length < MIN_MATCH) return Z_OK;
     if (length > MAX_DIST(s)) {
 	length = MAX_DIST(s);
 #ifndef USE_DICT_HEAD
 	dictionary += dictLength - length; /* use the tail of the dictionary */
 #endif
     }
     memcpy((char *)s->window, dictionary, length);
     s->strstart = length;
     s->block_start = (long)length;
     /* Insert all strings in the hash table (except for the last two bytes).
      * s->lookahead stays null, so s->ins_h will be recomputed at the next
      * call of fill_window.
      */
     s->ins_h = s->window[0];
     UPDATE_HASH(s, s->ins_h, s->window[1]);
     for (n = 0; n <= length - MIN_MATCH; n++) {
 	INSERT_STRING(s, n, hash_head);
     }
     if (hash_head) hash_head = 0;  /* to make compiler happy */
     return Z_OK;
 }
 #endif  /*  0  */
 /* ========================================================================= */
 int zlib_deflateReset(
 	z_streamp strm
 )
 {
     deflate_state *s;
     if (strm == NULL || strm->state == NULL)
         return Z_STREAM_ERROR;
     strm->total_in = strm->total_out = 0;
     strm->msg = NULL;
     strm->data_type = Z_UNKNOWN;
     s = (deflate_state *)strm->state;
     s->pending = 0;
     s->pending_out = s->pending_buf;
     if (s->noheader < 0) {
         s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
     }
     s->status = s->noheader ? BUSY_STATE : INIT_STATE;
     strm->adler = 1;
     s->last_flush = Z_NO_FLUSH;
     zlib_tr_init(s);
     lm_init(s);
     return Z_OK;
 }
 /* ========================================================================= */
 #if 0
 int zlib_deflateParams(
 	z_streamp strm,
 	int level,
 	int strategy
 )
 {
     deflate_state *s;
     compress_func func;
     int err = Z_OK;
     if (strm == NULL || strm->state == NULL) return Z_STREAM_ERROR;
     s = (deflate_state *) strm->state;
     if (level == Z_DEFAULT_COMPRESSION) {
 	level = 6;
     }
     if (level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
 	return Z_STREAM_ERROR;
     }
     func = configuration_table[s->level].func;
     if (func != configuration_table[level].func && strm->total_in != 0) {
 	/* Flush the last buffer: */
 	err = zlib_deflate(strm, Z_PARTIAL_FLUSH);
     }
     if (s->level != level) {
 	s->level = level;
 	s->max_lazy_match   = configuration_table[level].max_lazy;
 	s->good_match       = configuration_table[level].good_length;
 	s->nice_match       = configuration_table[level].nice_length;
 	s->max_chain_length = configuration_table[level].max_chain;
     }
     s->strategy = strategy;
     return err;
 }
 #endif  /*  0  */
 /* =========================================================================
  * Put a short in the pending buffer. The 16-bit value is put in MSB order.
  * IN assertion: the stream state is correct and there is enough room in
  * pending_buf.
  */
 static void putShortMSB(
 	deflate_state *s,
 	uInt b
 )
 {
     put_byte(s, (Byte)(b >> 8));
     put_byte(s, (Byte)(b & 0xff));
 }
 /* =========================================================================
  * Flush as much pending output as possible. All deflate() output goes
  * through this function so some applications may wish to modify it
  * to avoid allocating a large strm->next_out buffer and copying into it.
  * (See also read_buf()).
  */
 static void flush_pending(
 	z_streamp strm
 )
 {
     deflate_state *s = (deflate_state *) strm->state;
     unsigned len = s->pending;
     if (len > strm->avail_out) len = strm->avail_out;
     if (len == 0) return;
     if (strm->next_out != NULL) {
 	memcpy(strm->next_out, s->pending_out, len);
 	strm->next_out += len;
     }
     s->pending_out += len;
     strm->total_out += len;
     strm->avail_out  -= len;
     s->pending -= len;
     if (s->pending == 0) {
         s->pending_out = s->pending_buf;
     }
 }
 /* ========================================================================= */
 int zlib_deflate(
 	z_streamp strm,
 	int flush
 )
 {
     int old_flush; /* value of flush param for previous deflate call */
     deflate_state *s;
     if (strm == NULL || strm->state == NULL ||
 	flush > Z_FINISH || flush < 0) {
         return Z_STREAM_ERROR;
     }
     s = (deflate_state *) strm->state;
     if ((strm->next_in == NULL && strm->avail_in != 0) ||
 	(s->status == FINISH_STATE && flush != Z_FINISH)) {
         return Z_STREAM_ERROR;
     }
     if (strm->avail_out == 0) return Z_BUF_ERROR;
     s->strm = strm; /* just in case */
     old_flush = s->last_flush;
     s->last_flush = flush;
     /* Write the zlib header */
     if (s->status == INIT_STATE) {
         uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
         uInt level_flags = (s->level-1) >> 1;
         if (level_flags > 3) level_flags = 3;
         header |= (level_flags << 6);
 	if (s->strstart != 0) header |= PRESET_DICT;
         header += 31 - (header % 31);
         s->status = BUSY_STATE;
         putShortMSB(s, header);
 	/* Save the adler32 of the preset dictionary: */
 	if (s->strstart != 0) {
 	    putShortMSB(s, (uInt)(strm->adler >> 16));
 	    putShortMSB(s, (uInt)(strm->adler & 0xffff));
 	}
 	strm->adler = 1L;
     }
     /* Flush as much pending output as possible */
     if (s->pending != 0) {
         flush_pending(strm);
         if (strm->avail_out == 0) {
 	    /* Since avail_out is 0, deflate will be called again with
 	     * more output space, but possibly with both pending and
 	     * avail_in equal to zero. There won't be anything to do,
 	     * but this is not an error situation so make sure we
 	     * return OK instead of BUF_ERROR at next call of deflate:
              */
 	    s->last_flush = -1;
 	    return Z_OK;
 	}
     /* Make sure there is something to do and avoid duplicate consecutive
      * flushes. For repeated and useless calls with Z_FINISH, we keep
      * returning Z_STREAM_END instead of Z_BUFF_ERROR.
      */
     } else if (strm->avail_in == 0 && flush <= old_flush &&
 	       flush != Z_FINISH) {
         return Z_BUF_ERROR;
     }
     /* User must not provide more input after the first FINISH: */
     if (s->status == FINISH_STATE && strm->avail_in != 0) {
         return Z_BUF_ERROR;
     }
     /* Start a new block or continue the current one.
      */
     if (strm->avail_in != 0 || s->lookahead != 0 ||
         (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
         block_state bstate;
 	bstate = (*(configuration_table[s->level].func))(s, flush);
         if (bstate == finish_started || bstate == finish_done) {
             s->status = FINISH_STATE;
         }
         if (bstate == need_more || bstate == finish_started) {
 	    if (strm->avail_out == 0) {
 	        s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
 	    }
 	    return Z_OK;
 	    /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
 	     * of deflate should use the same flush parameter to make sure
 	     * that the flush is complete. So we don't have to output an
 	     * empty block here, this will be done at next call. This also
 	     * ensures that for a very small output buffer, we emit at most
 	     * one empty block.
 	     */
 	}
         if (bstate == block_done) {
             if (flush == Z_PARTIAL_FLUSH) {
                 zlib_tr_align(s);
 	    } else if (flush == Z_PACKET_FLUSH) {
 		/* Output just the 3-bit `stored' block type value,
 		   but not a zero length. */
 		zlib_tr_stored_type_only(s);
             } else { /* FULL_FLUSH or SYNC_FLUSH */
                 zlib_tr_stored_block(s, (char*)0, 0L, 0);
                 /* For a full flush, this empty block will be recognized
                  * as a special marker by inflate_sync().
                  */
                 if (flush == Z_FULL_FLUSH) {
                     CLEAR_HASH(s);             /* forget history */
                 }
             }
             flush_pending(strm);
 	    if (strm->avail_out == 0) {
 	      s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
 	      return Z_OK;
 	    }
         }
     }
     Assert(strm->avail_out > 0, "bug2");
     if (flush != Z_FINISH) return Z_OK;
     if (s->noheader) return Z_STREAM_END;
     /* Write the zlib trailer (adler32) */
     putShortMSB(s, (uInt)(strm->adler >> 16));
     putShortMSB(s, (uInt)(strm->adler & 0xffff));
     flush_pending(strm);
     /* If avail_out is zero, the application will call deflate again
      * to flush the rest.
      */
     s->noheader = -1; /* write the trailer only once! */
     return s->pending != 0 ? Z_OK : Z_STREAM_END;
 }
 /* ========================================================================= */
 int zlib_deflateEnd(
 	z_streamp strm
 )
 {
     int status;
     deflate_state *s;
     if (strm == NULL || strm->state == NULL) return Z_STREAM_ERROR;
     s = (deflate_state *) strm->state;
     status = s->status;
     if (status != INIT_STATE && status != BUSY_STATE &&
 	status != FINISH_STATE) {
       return Z_STREAM_ERROR;
     }
     strm->state = NULL;
     return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
 }
 /* =========================================================================
  * Copy the source state to the destination state.
  */
 #if 0
 int zlib_deflateCopy (
 	z_streamp dest,
 	z_streamp source
 )
 {
 #ifdef MAXSEG_64K
     return Z_STREAM_ERROR;
 #else
     deflate_state *ds;
     deflate_state *ss;
     ush *overlay;
     deflate_workspace *mem;
     if (source == NULL || dest == NULL || source->state == NULL) {
         return Z_STREAM_ERROR;
     }
     ss = (deflate_state *) source->state;
     *dest = *source;
     mem = (deflate_workspace *) dest->workspace;
     ds = &(mem->deflate_memory);
     dest->state = (struct internal_state *) ds;
     *ds = *ss;
     ds->strm = dest;
     ds->window = (Byte *) mem->window_memory;
     ds->prev   = (Pos *)  mem->prev_memory;
     ds->head   = (Pos *)  mem->head_memory;
     overlay = (ush *) mem->overlay_memory;
     ds->pending_buf = (uch *) overlay;
     memcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
     memcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
     memcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
     memcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
     ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
     ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
     ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
     ds->l_desc.dyn_tree = ds->dyn_ltree;
     ds->d_desc.dyn_tree = ds->dyn_dtree;
     ds->bl_desc.dyn_tree = ds->bl_tree;
     return Z_OK;
 #endif
 }
 #endif  /*  0  */
 /* ===========================================================================
  * Read a new buffer from the current input stream, update the adler32
  * and total number of bytes read.  All deflate() input goes through
  * this function so some applications may wish to modify it to avoid
  * allocating a large strm->next_in buffer and copying from it.
  * (See also flush_pending()).
  */
 static int read_buf(
 	z_streamp strm,
 	Byte *buf,
 	unsigned size
 )
 {
     unsigned len = strm->avail_in;
     if (len > size) len = size;
     if (len == 0) return 0;
     strm->avail_in  -= len;
     if (!((deflate_state *)(strm->state))->noheader) {
         strm->adler = zlib_adler32(strm->adler, strm->next_in, len);
     }
     memcpy(buf, strm->next_in, len);
     strm->next_in  += len;
     strm->total_in += len;
     return (int)len;
 }
 /* ===========================================================================
  * Initialize the "longest match" routines for a new zlib stream
  */
 static void lm_init(
 	deflate_state *s
 )
 {
     s->window_size = (ulg)2L*s->w_size;
     CLEAR_HASH(s);
     /* Set the default configuration parameters:
      */
     s->max_lazy_match   = configuration_table[s->level].max_lazy;
     s->good_match       = configuration_table[s->level].good_length;
     s->nice_match       = configuration_table[s->level].nice_length;
     s->max_chain_length = configuration_table[s->level].max_chain;
     s->strstart = 0;
     s->block_start = 0L;
     s->lookahead = 0;
     s->match_length = s->prev_length = MIN_MATCH-1;
     s->match_available = 0;
     s->ins_h = 0;
 }
 /* ===========================================================================
  * Set match_start to the longest match starting at the given string and
  * return its length. Matches shorter or equal to prev_length are discarded,
  * in which case the result is equal to prev_length and match_start is
  * garbage.
  * IN assertions: cur_match is the head of the hash chain for the current
  *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
  * OUT assertion: the match length is not greater than s->lookahead.
  */
 /* For 80x86 and 680x0, an optimized version will be provided in match.asm or
  * match.S. The code will be functionally equivalent.
  */
 static uInt longest_match(
 	deflate_state *s,
 	IPos cur_match			/* current match */
 )
 {
     unsigned chain_length = s->max_chain_length;/* max hash chain length */
     register Byte *scan = s->window + s->strstart; /* current string */
     register Byte *match;                       /* matched string */
     register int len;                           /* length of current match */
     int best_len = s->prev_length;              /* best match length so far */
     int nice_match = s->nice_match;             /* stop if match long enough */
     IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
         s->strstart - (IPos)MAX_DIST(s) : NIL;
     /* Stop when cur_match becomes <= limit. To simplify the code,
      * we prevent matches with the string of window index 0.
      */
     Pos *prev = s->prev;
     uInt wmask = s->w_mask;
 #ifdef UNALIGNED_OK
     /* Compare two bytes at a time. Note: this is not always beneficial.
      * Try with and without -DUNALIGNED_OK to check.
      */
     register Byte *strend = s->window + s->strstart + MAX_MATCH - 1;
     register ush scan_start = *(ush*)scan;
     register ush scan_end   = *(ush*)(scan+best_len-1);
 #else
     register Byte *strend = s->window + s->strstart + MAX_MATCH;
     register Byte scan_end1  = scan[best_len-1];
     register Byte scan_end   = scan[best_len];
 #endif
     /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
      * It is easy to get rid of this optimization if necessary.
      */
     Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
     /* Do not waste too much time if we already have a good match: */
     if (s->prev_length >= s->good_match) {
         chain_length >>= 2;
     }
     /* Do not look for matches beyond the end of the input. This is necessary
      * to make deflate deterministic.
      */
     if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
     Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
     do {
         Assert(cur_match < s->strstart, "no future");
         match = s->window + cur_match;
         /* Skip to next match if the match length cannot increase
          * or if the match length is less than 2:
          */
 #if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
         /* This code assumes sizeof(unsigned short) == 2. Do not use
          * UNALIGNED_OK if your compiler uses a different size.
          */
         if (*(ush*)(match+best_len-1) != scan_end ||
             *(ush*)match != scan_start) continue;
         /* It is not necessary to compare scan[2] and match[2] since they are
          * always equal when the other bytes match, given that the hash keys
          * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
          * strstart+3, +5, ... up to strstart+257. We check for insufficient
          * lookahead only every 4th comparison; the 128th check will be made
          * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
          * necessary to put more guard bytes at the end of the window, or
          * to check more often for insufficient lookahead.
          */
         Assert(scan[2] == match[2], "scan[2]?");
         scan++, match++;
         do {
         } while (*(ush*)(scan+=2) == *(ush*)(match+=2) &&
                  *(ush*)(scan+=2) == *(ush*)(match+=2) &&
                  *(ush*)(scan+=2) == *(ush*)(match+=2) &&
                  *(ush*)(scan+=2) == *(ush*)(match+=2) &&
                  scan < strend);
         /* The funny "do {}" generates better code on most compilers */
         /* Here, scan <= window+strstart+257 */
         Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
         if (*scan == *match) scan++;
         len = (MAX_MATCH - 1) - (int)(strend-scan);
         scan = strend - (MAX_MATCH-1);
 #else /* UNALIGNED_OK */
         if (match[best_len]   != scan_end  ||
             match[best_len-1] != scan_end1 ||
             *match            != *scan     ||
             *++match          != scan[1])      continue;
         /* The check at best_len-1 can be removed because it will be made
          * again later. (This heuristic is not always a win.)
          * It is not necessary to compare scan[2] and match[2] since they
          * are always equal when the other bytes match, given that
          * the hash keys are equal and that HASH_BITS >= 8.
          */
         scan += 2, match++;
         Assert(*scan == *match, "match[2]?");
         /* We check for insufficient lookahead only every 8th comparison;
          * the 256th check will be made at strstart+258.
          */
         do {
         } while (*++scan == *++match && *++scan == *++match &&
                  *++scan == *++match && *++scan == *++match &&
                  *++scan == *++match && *++scan == *++match &&
                  *++scan == *++match && *++scan == *++match &&
                  scan < strend);
         Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
         len = MAX_MATCH - (int)(strend - scan);
         scan = strend - MAX_MATCH;
 #endif /* UNALIGNED_OK */
         if (len > best_len) {
             s->match_start = cur_match;
             best_len = len;
             if (len >= nice_match) break;
 #ifdef UNALIGNED_OK
             scan_end = *(ush*)(scan+best_len-1);
 #else
             scan_end1  = scan[best_len-1];
             scan_end   = scan[best_len];
 #endif
         }
     } while ((cur_match = prev[cur_match & wmask]) > limit
              && --chain_length != 0);
     if ((uInt)best_len <= s->lookahead) return best_len;
     return s->lookahead;
 }
 #ifdef DEBUG_ZLIB
 /* ===========================================================================
  * Check that the match at match_start is indeed a match.
  */
 static void check_match(
 	deflate_state *s,
 	IPos start,
 	IPos match,
 	int length
 )
 {
     /* check that the match is indeed a match */
     if (memcmp((char *)s->window + match,
                 (char *)s->window + start, length) != EQUAL) {
         fprintf(stderr, " start %u, match %u, length %d\n",
 		start, match, length);
         do {
 	    fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
 	} while (--length != 0);
         z_error("invalid match");
     }
     if (z_verbose > 1) {
         fprintf(stderr,"\\[%d,%d]", start-match, length);
         do { putc(s->window[start++], stderr); } while (--length != 0);
     }
 }
 #else
 #  define check_match(s, start, match, length)
 #endif
 /* ===========================================================================
  * Fill the window when the lookahead becomes insufficient.
  * Updates strstart and lookahead.
  *
  * IN assertion: lookahead < MIN_LOOKAHEAD
  * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
  *    At least one byte has been read, or avail_in == 0; reads are
  *    performed for at least two bytes (required for the zip translate_eol
  *    option -- not supported here).
  */
 static void fill_window(
 	deflate_state *s
 )
 {
     register unsigned n, m;
     register Pos *p;
     unsigned more;    /* Amount of free space at the end of the window. */
     uInt wsize = s->w_size;
     do {
         more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
         /* Deal with !@#$% 64K limit: */
         if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
             more = wsize;
         } else if (more == (unsigned)(-1)) {
             /* Very unlikely, but possible on 16 bit machine if strstart == 0
              * and lookahead == 1 (input done one byte at time)
              */
             more--;
         /* If the window is almost full and there is insufficient lookahead,
          * move the upper half to the lower one to make room in the upper half.
          */
         } else if (s->strstart >= wsize+MAX_DIST(s)) {
             memcpy((char *)s->window, (char *)s->window+wsize,
                    (unsigned)wsize);
             s->match_start -= wsize;
             s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
             s->block_start -= (long) wsize;
             /* Slide the hash table (could be avoided with 32 bit values
                at the expense of memory usage). We slide even when level == 0
                to keep the hash table consistent if we switch back to level > 0
                later. (Using level 0 permanently is not an optimal usage of
                zlib, so we don't care about this pathological case.)
              */
             n = s->hash_size;
             p = &s->head[n];
             do {
                 m = *--p;
                 *p = (Pos)(m >= wsize ? m-wsize : NIL);
             } while (--n);
             n = wsize;
             p = &s->prev[n];
             do {
                 m = *--p;
                 *p = (Pos)(m >= wsize ? m-wsize : NIL);
                 /* If n is not on any hash chain, prev[n] is garbage but
                  * its value will never be used.
                  */
             } while (--n);
             more += wsize;
         }
         if (s->strm->avail_in == 0) return;
         /* If there was no sliding:
          *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
          *    more == window_size - lookahead - strstart
          * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
          * => more >= window_size - 2*WSIZE + 2
          * In the BIG_MEM or MMAP case (not yet supported),
          *   window_size == input_size + MIN_LOOKAHEAD  &&
          *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
          * Otherwise, window_size == 2*WSIZE so more >= 2.
          * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
          */
         Assert(more >= 2, "more < 2");
         n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
         s->lookahead += n;
         /* Initialize the hash value now that we have some input: */
         if (s->lookahead >= MIN_MATCH) {
             s->ins_h = s->window[s->strstart];
             UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
 #if MIN_MATCH != 3
             Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
         }
         /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
          * but this is not important since only literal bytes will be emitted.
          */
     } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
 }
 /* ===========================================================================
  * Flush the current block, with given end-of-file flag.
  * IN assertion: strstart is set to the end of the current match.
  */
 #define FLUSH_BLOCK_ONLY(s, eof) { \
    zlib_tr_flush_block(s, (s->block_start >= 0L ? \
                    (char *)&s->window[(unsigned)s->block_start] : \
                    NULL), \
 		(ulg)((long)s->strstart - s->block_start), \
 		(eof)); \
    s->block_start = s->strstart; \
    flush_pending(s->strm); \
    Tracev((stderr,"[FLUSH]")); \
 }
 /* Same but force premature exit if necessary. */
 #define FLUSH_BLOCK(s, eof) { \
    FLUSH_BLOCK_ONLY(s, eof); \
    if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
 }
 /* ===========================================================================
  * Copy without compression as much as possible from the input stream, return
  * the current block state.
  * This function does not insert new strings in the dictionary since
  * uncompressible data is probably not useful. This function is used
  * only for the level=0 compression option.
  * NOTE: this function should be optimized to avoid extra copying from
  * window to pending_buf.
  */
 static block_state deflate_stored(
 	deflate_state *s,
 	int flush
 )
 {
     /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
      * to pending_buf_size, and each stored block has a 5 byte header:
      */
     ulg max_block_size = 0xffff;
     ulg max_start;
     if (max_block_size > s->pending_buf_size - 5) {
         max_block_size = s->pending_buf_size - 5;
     }
     /* Copy as much as possible from input to output: */
     for (;;) {
         /* Fill the window as much as possible: */
         if (s->lookahead <= 1) {
             Assert(s->strstart < s->w_size+MAX_DIST(s) ||
 		   s->block_start >= (long)s->w_size, "slide too late");
             fill_window(s);
             if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
             if (s->lookahead == 0) break; /* flush the current block */
         }
 	Assert(s->block_start >= 0L, "block gone");
 	s->strstart += s->lookahead;
 	s->lookahead = 0;
 	/* Emit a stored block if pending_buf will be full: */
  	max_start = s->block_start + max_block_size;
         if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
 	    /* strstart == 0 is possible when wraparound on 16-bit machine */
 	    s->lookahead = (uInt)(s->strstart - max_start);
 	    s->strstart = (uInt)max_start;
             FLUSH_BLOCK(s, 0);
 	}
 	/* Flush if we may have to slide, otherwise block_start may become
          * negative and the data will be gone:
          */
         if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
             FLUSH_BLOCK(s, 0);
 	}
     }
     FLUSH_BLOCK(s, flush == Z_FINISH);
     return flush == Z_FINISH ? finish_done : block_done;
 }
 /* ===========================================================================
  * Compress as much as possible from the input stream, return the current
  * block state.
  * This function does not perform lazy evaluation of matches and inserts
  * new strings in the dictionary only for unmatched strings or for short
  * matches. It is used only for the fast compression options.
  */
 static block_state deflate_fast(
 	deflate_state *s,
 	int flush
 )
 {
     IPos hash_head = NIL; /* head of the hash chain */
     int bflush;           /* set if current block must be flushed */
     for (;;) {
         /* Make sure that we always have enough lookahead, except
          * at the end of the input file. We need MAX_MATCH bytes
          * for the next match, plus MIN_MATCH bytes to insert the
          * string following the next match.
          */
         if (s->lookahead < MIN_LOOKAHEAD) {
             fill_window(s);
             if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
 	        return need_more;
 	    }
             if (s->lookahead == 0) break; /* flush the current block */
         }
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         if (s->lookahead >= MIN_MATCH) {
             INSERT_STRING(s, s->strstart, hash_head);
         }
         /* Find the longest match, discarding those <= prev_length.
          * At this point we have always match_length < MIN_MATCH
          */
         if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
             /* To simplify the code, we prevent matches with the string
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
             if (s->strategy != Z_HUFFMAN_ONLY) {
                 s->match_length = longest_match (s, hash_head);
             }
             /* longest_match() sets match_start */
         }
         if (s->match_length >= MIN_MATCH) {
             check_match(s, s->strstart, s->match_start, s->match_length);
             bflush = zlib_tr_tally(s, s->strstart - s->match_start,
                                s->match_length - MIN_MATCH);
             s->lookahead -= s->match_length;
             /* Insert new strings in the hash table only if the match length
              * is not too large. This saves time but degrades compression.
              */
             if (s->match_length <= s->max_insert_length &&
                 s->lookahead >= MIN_MATCH) {
                 s->match_length--; /* string at strstart already in hash table */
                 do {
                     s->strstart++;
                     INSERT_STRING(s, s->strstart, hash_head);
                     /* strstart never exceeds WSIZE-MAX_MATCH, so there are
                      * always MIN_MATCH bytes ahead.
                      */
                 } while (--s->match_length != 0);
                 s->strstart++;
             } else {
                 s->strstart += s->match_length;
                 s->match_length = 0;
                 s->ins_h = s->window[s->strstart];
                 UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
 #if MIN_MATCH != 3
                 Call UPDATE_HASH() MIN_MATCH-3 more times
 #endif
                 /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
                  * matter since it will be recomputed at next deflate call.
                  */
             }
         } else {
             /* No match, output a literal byte */
             Tracevv((stderr,"%c", s->window[s->strstart]));
             bflush = zlib_tr_tally (s, 0, s->window[s->strstart]);
             s->lookahead--;
             s->strstart++;
         }
         if (bflush) FLUSH_BLOCK(s, 0);
     }
     FLUSH_BLOCK(s, flush == Z_FINISH);
     return flush == Z_FINISH ? finish_done : block_done;
 }
 /* ===========================================================================
  * Same as above, but achieves better compression. We use a lazy
  * evaluation for matches: a match is finally adopted only if there is
  * no better match at the next window position.
  */
 static block_state deflate_slow(
 	deflate_state *s,
 	int flush
 )
 {
     IPos hash_head = NIL;    /* head of hash chain */
     int bflush;              /* set if current block must be flushed */
     /* Process the input block. */
     for (;;) {
         /* Make sure that we always have enough lookahead, except
          * at the end of the input file. We need MAX_MATCH bytes
          * for the next match, plus MIN_MATCH bytes to insert the
          * string following the next match.
          */
         if (s->lookahead < MIN_LOOKAHEAD) {
             fill_window(s);
             if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
 	        return need_more;
 	    }
             if (s->lookahead == 0) break; /* flush the current block */
         }
         /* Insert the string window[strstart .. strstart+2] in the
          * dictionary, and set hash_head to the head of the hash chain:
          */
         if (s->lookahead >= MIN_MATCH) {
             INSERT_STRING(s, s->strstart, hash_head);
         }
         /* Find the longest match, discarding those <= prev_length.
          */
         s->prev_length = s->match_length, s->prev_match = s->match_start;
         s->match_length = MIN_MATCH-1;
         if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
             s->strstart - hash_head <= MAX_DIST(s)) {
             /* To simplify the code, we prevent matches with the string
              * of window index 0 (in particular we have to avoid a match
              * of the string with itself at the start of the input file).
              */
             if (s->strategy != Z_HUFFMAN_ONLY) {
                 s->match_length = longest_match (s, hash_head);
             }
             /* longest_match() sets match_start */
             if (s->match_length <= 5 && (s->strategy == Z_FILTERED ||
                  (s->match_length == MIN_MATCH &&
                   s->strstart - s->match_start > TOO_FAR))) {
                 /* If prev_match is also MIN_MATCH, match_start is garbage
                  * but we will ignore the current match anyway.
                  */
                 s->match_length = MIN_MATCH-1;
             }
         }
         /* If there was a match at the previous step and the current
          * match is not better, output the previous match:
          */
         if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
             uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
             /* Do not insert strings in hash table beyond this. */
             check_match(s, s->strstart-1, s->prev_match, s->prev_length);
             bflush = zlib_tr_tally(s, s->strstart -1 - s->prev_match,
 				   s->prev_length - MIN_MATCH);
             /* Insert in hash table all strings up to the end of the match.
              * strstart-1 and strstart are already inserted. If there is not
              * enough lookahead, the last two strings are not inserted in
              * the hash table.
              */
             s->lookahead -= s->prev_length-1;
             s->prev_length -= 2;
             do {
                 if (++s->strstart <= max_insert) {
                     INSERT_STRING(s, s->strstart, hash_head);
                 }
             } while (--s->prev_length != 0);
             s->match_available = 0;
             s->match_length = MIN_MATCH-1;
             s->strstart++;
             if (bflush) FLUSH_BLOCK(s, 0);
         } else if (s->match_available) {
             /* If there was no match at the previous position, output a
              * single literal. If there was a match but the current match
              * is longer, truncate the previous match to a single literal.
              */
             Tracevv((stderr,"%c", s->window[s->strstart-1]));
             if (zlib_tr_tally (s, 0, s->window[s->strstart-1])) {
                 FLUSH_BLOCK_ONLY(s, 0);
             }
             s->strstart++;
             s->lookahead--;
             if (s->strm->avail_out == 0) return need_more;
         } else {
             /* There is no previous match to compare with, wait for
              * the next step to decide.
              */
             s->match_available = 1;
             s->strstart++;
             s->lookahead--;
         }
     }
     Assert (flush != Z_NO_FLUSH, "no flush?");
     if (s->match_available) {
         Tracevv((stderr,"%c", s->window[s->strstart-1]));
         zlib_tr_tally (s, 0, s->window[s->strstart-1]);
         s->match_available = 0;
     }
     FLUSH_BLOCK(s, flush == Z_FINISH);
     return flush == Z_FINISH ? finish_done : block_done;
 }
 int zlib_deflate_workspacesize(void)
 {
     return sizeof(deflate_workspace);
 }

lib/zlib_deflate/deflate_syms.c

Diff comments View file @ 4f3865f

 /*
  * linux/lib/zlib_deflate/deflate_syms.c
  *
  * Exported symbols for the deflate functionality.
  *
  */
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/zlib.h>
 EXPORT_SYMBOL(zlib_deflate_workspacesize);
 EXPORT_SYMBOL(zlib_deflate);
-EXPORT_SYMBOL(zlib_deflateInit_);
+EXPORT_SYMBOL(zlib_deflateInit2);
-EXPORT_SYMBOL(zlib_deflateInit2_);
 EXPORT_SYMBOL(zlib_deflateEnd);
 EXPORT_SYMBOL(zlib_deflateReset);
 MODULE_LICENSE("GPL");

lib/zlib_inflate/Makefile

Diff comments View file @ 4f3865f

1	#	1	#
2	# This is a modified version of zlib, which does all memory	2	# This is a modified version of zlib, which does all memory
3	# allocation ahead of time.	3	# allocation ahead of time.
4	#	4	#
5	# This is only the decompression, see zlib_deflate for the	5	# This is only the decompression, see zlib_deflate for the
6	# the compression	6	# the compression
7	#	7	#
8	# Decompression needs to be serialized for each memory	8	# Decompression needs to be serialized for each memory
9	# allocation.	9	# allocation.
10	#	10	#
11	# (The upsides of the simplification is that you can't get in	11	# (The upsides of the simplification is that you can't get in
12	# any nasty situations wrt memory management, and that the	12	# any nasty situations wrt memory management, and that the
13	# uncompression can be done without blocking on allocation).	13	# uncompression can be done without blocking on allocation).
14	#	14	#
15		15
16	obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate.o	16	obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate.o
17		17
18	zlib_inflate-objs := infblock.o infcodes.o inffast.o inflate.o \	18	zlib_inflate-objs := inffast.o inflate.o \
19	inflate_sync.o inftrees.o infutil.o inflate_syms.o	19	inftrees.o inflate_syms.o
20		20

lib/zlib_inflate/infblock.c

View file @ 4f3865f

1	/* infblock.c -- interpret and process block types to last block		File was deleted
2	* Copyright (C) 1995-1998 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include <linux/zutil.h>
7	#include "infblock.h"
8	#include "inftrees.h"
9	#include "infcodes.h"
10	#include "infutil.h"
11
12	struct inflate_codes_state;
13
14	/* simplify the use of the inflate_huft type with some defines */
15	#define exop word.what.Exop
16	#define bits word.what.Bits
17
18	/* Table for deflate from PKZIP's appnote.txt. */
19	static const uInt border[] = { /* Order of the bit length code lengths */
20	16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
21
22	/*
23	Notes beyond the 1.93a appnote.txt:
24
25	1. Distance pointers never point before the beginning of the output
26	stream.
27	2. Distance pointers can point back across blocks, up to 32k away.
28	3. There is an implied maximum of 7 bits for the bit length table and
29	15 bits for the actual data.
30	4. If only one code exists, then it is encoded using one bit. (Zero
31	would be more efficient, but perhaps a little confusing.) If two
32	codes exist, they are coded using one bit each (0 and 1).
33	5. There is no way of sending zero distance codes--a dummy must be
34	sent if there are none. (History: a pre 2.0 version of PKZIP would
35	store blocks with no distance codes, but this was discovered to be
36	too harsh a criterion.) Valid only for 1.93a. 2.04c does allow
37	zero distance codes, which is sent as one code of zero bits in
38	length.
39	6. There are up to 286 literal/length codes. Code 256 represents the
40	end-of-block. Note however that the static length tree defines
41	288 codes just to fill out the Huffman codes. Codes 286 and 287
42	cannot be used though, since there is no length base or extra bits
43	defined for them. Similarily, there are up to 30 distance codes.
44	However, static trees define 32 codes (all 5 bits) to fill out the
45	Huffman codes, but the last two had better not show up in the data.
46	7. Unzip can check dynamic Huffman blocks for complete code sets.
47	The exception is that a single code would not be complete (see #4).
48	8. The five bits following the block type is really the number of
49	literal codes sent minus 257.
50	9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
51	(1+6+6). Therefore, to output three times the length, you output
52	three codes (1+1+1), whereas to output four times the same length,
53	you only need two codes (1+3). Hmm.
54	10. In the tree reconstruction algorithm, Code = Code + Increment
55	only if BitLength(i) is not zero. (Pretty obvious.)
56	11. Correction: 4 Bits: # of Bit Length codes - 4 (4 - 19)
57	12. Note: length code 284 can represent 227-258, but length code 285
58	really is 258. The last length deserves its own, short code
59	since it gets used a lot in very redundant files. The length
60	258 is special since 258 - 3 (the min match length) is 255.
61	13. The literal/length and distance code bit lengths are read as a
62	single stream of lengths. It is possible (and advantageous) for
63	a repeat code (16, 17, or 18) to go across the boundary between
64	the two sets of lengths.
65	*/
66
67
68	void zlib_inflate_blocks_reset(
69	inflate_blocks_statef *s,
70	z_streamp z,
71	uLong *c
72	)
73	{
74	if (c != NULL)
75	*c = s->check;
76	if (s->mode == CODES)
77	zlib_inflate_codes_free(s->sub.decode.codes, z);
78	s->mode = TYPE;
79	s->bitk = 0;
80	s->bitb = 0;
81	s->read = s->write = s->window;
82	if (s->checkfn != NULL)
83	z->adler = s->check = (*s->checkfn)(0L, NULL, 0);
84	}
85
86	inflate_blocks_statef *zlib_inflate_blocks_new(
87	z_streamp z,
88	check_func c,
89	uInt w
90	)
91	{
92	inflate_blocks_statef *s;
93
94	s = &WS(z)->working_blocks_state;
95	s->hufts = WS(z)->working_hufts;
96	s->window = WS(z)->working_window;
97	s->end = s->window + w;
98	s->checkfn = c;
99	s->mode = TYPE;
100	zlib_inflate_blocks_reset(s, z, NULL);
101	return s;
102	}
103
104
105	int zlib_inflate_blocks(
106	inflate_blocks_statef *s,
107	z_streamp z,
108	int r
109	)
110	{
111	uInt t; /* temporary storage */
112	uLong b; /* bit buffer */
113	uInt k; /* bits in bit buffer */
114	Byte p; / input data pointer */
115	uInt n; /* bytes available there */
116	Byte q; / output window write pointer */
117	uInt m; /* bytes to end of window or read pointer */
118
119	/* copy input/output information to locals (UPDATE macro restores) */
120	LOAD
121
122	/* process input based on current state */
123	while (1) switch (s->mode)
124	{
125	case TYPE:
126	NEEDBITS(3)
127	t = (uInt)b & 7;
128	s->last = t & 1;
129	switch (t >> 1)
130	{
131	case 0: /* stored */
132	DUMPBITS(3)
133	t = k & 7; /* go to byte boundary */
134	DUMPBITS(t)
135	s->mode = LENS; /* get length of stored block */
136	break;
137	case 1: /* fixed */
138	{
139	uInt bl, bd;
140	inflate_huft tl, td;
141
142	zlib_inflate_trees_fixed(&bl, &bd, &tl, &td, s->hufts, z);
143	s->sub.decode.codes = zlib_inflate_codes_new(bl, bd, tl, td, z);
144	if (s->sub.decode.codes == NULL)
145	{
146	r = Z_MEM_ERROR;
147	LEAVE
148	}
149	}
150	DUMPBITS(3)
151	s->mode = CODES;
152	break;
153	case 2: /* dynamic */
154	DUMPBITS(3)
155	s->mode = TABLE;
156	break;
157	case 3: /* illegal */
158	DUMPBITS(3)
159	s->mode = B_BAD;
160	z->msg = (char*)"invalid block type";
161	r = Z_DATA_ERROR;
162	LEAVE
163	}
164	break;
165	case LENS:
166	NEEDBITS(32)
167	if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
168	{
169	s->mode = B_BAD;
170	z->msg = (char*)"invalid stored block lengths";
171	r = Z_DATA_ERROR;
172	LEAVE
173	}
174	s->sub.left = (uInt)b & 0xffff;
175	b = k = 0; /* dump bits */
176	s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
177	break;
178	case STORED:
179	if (n == 0)
180	LEAVE
181	NEEDOUT
182	t = s->sub.left;
183	if (t > n) t = n;
184	if (t > m) t = m;
185	memcpy(q, p, t);
186	p += t; n -= t;
187	q += t; m -= t;
188	if ((s->sub.left -= t) != 0)
189	break;
190	s->mode = s->last ? DRY : TYPE;
191	break;
192	case TABLE:
193	NEEDBITS(14)
194	s->sub.trees.table = t = (uInt)b & 0x3fff;
195	#ifndef PKZIP_BUG_WORKAROUND
196	if ((t & 0x1f) > 29 \|\| ((t >> 5) & 0x1f) > 29)
197	{
198	s->mode = B_BAD;
199	z->msg = (char*)"too many length or distance symbols";
200	r = Z_DATA_ERROR;
201	LEAVE
202	}
203	#endif
204	{
205	s->sub.trees.blens = WS(z)->working_blens;
206	}
207	DUMPBITS(14)
208	s->sub.trees.index = 0;
209	s->mode = BTREE;
210	case BTREE:
211	while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
212	{
213	NEEDBITS(3)
214	s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
215	DUMPBITS(3)
216	}
217	while (s->sub.trees.index < 19)
218	s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
219	s->sub.trees.bb = 7;
220	t = zlib_inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
221	&s->sub.trees.tb, s->hufts, z);
222	if (t != Z_OK)
223	{
224	r = t;
225	if (r == Z_DATA_ERROR)
226	s->mode = B_BAD;
227	LEAVE
228	}
229	s->sub.trees.index = 0;
230	s->mode = DTREE;
231	case DTREE:
232	while (t = s->sub.trees.table,
233	s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
234	{
235	inflate_huft *h;
236	uInt i, j, c;
237
238	t = s->sub.trees.bb;
239	NEEDBITS(t)
240	h = s->sub.trees.tb + ((uInt)b & zlib_inflate_mask[t]);
241	t = h->bits;
242	c = h->base;
243	if (c < 16)
244	{
245	DUMPBITS(t)
246	s->sub.trees.blens[s->sub.trees.index++] = c;
247	}
248	else /* c == 16..18 */
249	{
250	i = c == 18 ? 7 : c - 14;
251	j = c == 18 ? 11 : 3;
252	NEEDBITS(t + i)
253	DUMPBITS(t)
254	j += (uInt)b & zlib_inflate_mask[i];
255	DUMPBITS(i)
256	i = s->sub.trees.index;
257	t = s->sub.trees.table;
258	if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) \|\|
259	(c == 16 && i < 1))
260	{
261	s->mode = B_BAD;
262	z->msg = (char*)"invalid bit length repeat";
263	r = Z_DATA_ERROR;
264	LEAVE
265	}
266	c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
267	do {
268	s->sub.trees.blens[i++] = c;
269	} while (--j);
270	s->sub.trees.index = i;
271	}
272	}
273	s->sub.trees.tb = NULL;
274	{
275	uInt bl, bd;
276	inflate_huft tl, td;
277	inflate_codes_statef *c;
278
279	bl = 9; /* must be <= 9 for lookahead assumptions */
280	bd = 6; /* must be <= 9 for lookahead assumptions */
281	t = s->sub.trees.table;
282	t = zlib_inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
283	s->sub.trees.blens, &bl, &bd, &tl, &td,
284	s->hufts, z);
285	if (t != Z_OK)
286	{
287	if (t == (uInt)Z_DATA_ERROR)
288	s->mode = B_BAD;
289	r = t;
290	LEAVE
291	}
292	if ((c = zlib_inflate_codes_new(bl, bd, tl, td, z)) == NULL)
293	{
294	r = Z_MEM_ERROR;
295	LEAVE
296	}
297	s->sub.decode.codes = c;
298	}
299	s->mode = CODES;
300	case CODES:
301	UPDATE
302	if ((r = zlib_inflate_codes(s, z, r)) != Z_STREAM_END)
303	return zlib_inflate_flush(s, z, r);
304	r = Z_OK;
305	zlib_inflate_codes_free(s->sub.decode.codes, z);
306	LOAD
307	if (!s->last)
308	{
309	s->mode = TYPE;
310	break;
311	}
312	s->mode = DRY;
313	case DRY:
314	FLUSH
315	if (s->read != s->write)
316	LEAVE
317	s->mode = B_DONE;
318	case B_DONE:
319	r = Z_STREAM_END;
320	LEAVE
321	case B_BAD:
322	r = Z_DATA_ERROR;
323	LEAVE
324	default:
325	r = Z_STREAM_ERROR;
326	LEAVE
327	}
328	}
329
330
331	int zlib_inflate_blocks_free(
332	inflate_blocks_statef *s,
333	z_streamp z
334	)
335	{
336	zlib_inflate_blocks_reset(s, z, NULL);
337	return Z_OK;
338	}
339
340
341	#if 0
342	void zlib_inflate_set_dictionary(
343	inflate_blocks_statef *s,
344	const Byte *d,
345	uInt n
346	)
347	{
348	memcpy(s->window, d, n);
349	s->read = s->write = s->window + n;
350	}
351	#endif /* 0 */
352
353
354	/* Returns true if inflate is currently at the end of a block generated
355	* by Z_SYNC_FLUSH or Z_FULL_FLUSH.
356	* IN assertion: s != NULL
357	*/
358	#if 0
359	int zlib_inflate_blocks_sync_point(
360	inflate_blocks_statef *s
361	)
362	{
363	return s->mode == LENS;
364	}
365	#endif /* 0 */
366		1	/* infblock.c -- interpret and process block types to last block

lib/zlib_inflate/infblock.h

View file @ 4f3865f

1	/* infblock.h -- header to use infblock.c		File was deleted
2	* Copyright (C) 1995-1998 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* WARNING: this file should not be used by applications. It is
7	part of the implementation of the compression library and is
8	subject to change. Applications should only use zlib.h.
9	*/
10
11	#ifndef _INFBLOCK_H
12	#define _INFBLOCK_H
13
14	struct inflate_blocks_state;
15	typedef struct inflate_blocks_state inflate_blocks_statef;
16
17	extern inflate_blocks_statef * zlib_inflate_blocks_new (
18	z_streamp z,
19	check_func c, /* check function */
20	uInt w); /* window size */
21
22	extern int zlib_inflate_blocks (
23	inflate_blocks_statef *,
24	z_streamp ,
25	int); /* initial return code */
26
27	extern void zlib_inflate_blocks_reset (
28	inflate_blocks_statef *,
29	z_streamp ,
30	uLong ); / check value on output */
31
32	extern int zlib_inflate_blocks_free (
33	inflate_blocks_statef *,
34	z_streamp);
35
36	#if 0
37	extern void zlib_inflate_set_dictionary (
38	inflate_blocks_statef *s,
39	const Byte d, / dictionary */
40	uInt n); /* dictionary length */
41	#endif /* 0 */
42
43	#if 0
44	extern int zlib_inflate_blocks_sync_point (
45	inflate_blocks_statef *s);
46	#endif /* 0 */
47
48	#endif /* _INFBLOCK_H */
49		1	/* infblock.h -- header to use infblock.c

lib/zlib_inflate/infcodes.c

View file @ 4f3865f

1	/* infcodes.c -- process literals and length/distance pairs		File was deleted
2	* Copyright (C) 1995-1998 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include <linux/zutil.h>
7	#include "inftrees.h"
8	#include "infblock.h"
9	#include "infcodes.h"
10	#include "infutil.h"
11	#include "inffast.h"
12
13	/* simplify the use of the inflate_huft type with some defines */
14	#define exop word.what.Exop
15	#define bits word.what.Bits
16
17	inflate_codes_statef *zlib_inflate_codes_new(
18	uInt bl,
19	uInt bd,
20	inflate_huft *tl,
21	inflate_huft td, / need separate declaration for Borland C++ */
22	z_streamp z
23	)
24	{
25	inflate_codes_statef *c;
26
27	c = &WS(z)->working_state;
28	{
29	c->mode = START;
30	c->lbits = (Byte)bl;
31	c->dbits = (Byte)bd;
32	c->ltree = tl;
33	c->dtree = td;
34	}
35	return c;
36	}
37
38
39	int zlib_inflate_codes(
40	inflate_blocks_statef *s,
41	z_streamp z,
42	int r
43	)
44	{
45	uInt j; /* temporary storage */
46	inflate_huft t; / temporary pointer */
47	uInt e; /* extra bits or operation */
48	uLong b; /* bit buffer */
49	uInt k; /* bits in bit buffer */
50	Byte p; / input data pointer */
51	uInt n; /* bytes available there */
52	Byte q; / output window write pointer */
53	uInt m; /* bytes to end of window or read pointer */
54	Byte f; / pointer to copy strings from */
55	inflate_codes_statef c = s->sub.decode.codes; / codes state */
56
57	/* copy input/output information to locals (UPDATE macro restores) */
58	LOAD
59
60	/* process input and output based on current state */
61	while (1) switch (c->mode)
62	{ /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
63	case START: /* x: set up for LEN */
64	#ifndef SLOW
65	if (m >= 258 && n >= 10)
66	{
67	UPDATE
68	r = zlib_inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
69	LOAD
70	if (r != Z_OK)
71	{
72	c->mode = r == Z_STREAM_END ? WASH : BADCODE;
73	break;
74	}
75	}
76	#endif /* !SLOW */
77	c->sub.code.need = c->lbits;
78	c->sub.code.tree = c->ltree;
79	c->mode = LEN;
80	case LEN: /* i: get length/literal/eob next */
81	j = c->sub.code.need;
82	NEEDBITS(j)
83	t = c->sub.code.tree + ((uInt)b & zlib_inflate_mask[j]);
84	DUMPBITS(t->bits)
85	e = (uInt)(t->exop);
86	if (e == 0) /* literal */
87	{
88	c->sub.lit = t->base;
89	c->mode = LIT;
90	break;
91	}
92	if (e & 16) /* length */
93	{
94	c->sub.copy.get = e & 15;
95	c->len = t->base;
96	c->mode = LENEXT;
97	break;
98	}
99	if ((e & 64) == 0) /* next table */
100	{
101	c->sub.code.need = e;
102	c->sub.code.tree = t + t->base;
103	break;
104	}
105	if (e & 32) /* end of block */
106	{
107	c->mode = WASH;
108	break;
109	}
110	c->mode = BADCODE; /* invalid code */
111	z->msg = (char*)"invalid literal/length code";
112	r = Z_DATA_ERROR;
113	LEAVE
114	case LENEXT: /* i: getting length extra (have base) */
115	j = c->sub.copy.get;
116	NEEDBITS(j)
117	c->len += (uInt)b & zlib_inflate_mask[j];
118	DUMPBITS(j)
119	c->sub.code.need = c->dbits;
120	c->sub.code.tree = c->dtree;
121	c->mode = DIST;
122	case DIST: /* i: get distance next */
123	j = c->sub.code.need;
124	NEEDBITS(j)
125	t = c->sub.code.tree + ((uInt)b & zlib_inflate_mask[j]);
126	DUMPBITS(t->bits)
127	e = (uInt)(t->exop);
128	if (e & 16) /* distance */
129	{
130	c->sub.copy.get = e & 15;
131	c->sub.copy.dist = t->base;
132	c->mode = DISTEXT;
133	break;
134	}
135	if ((e & 64) == 0) /* next table */
136	{
137	c->sub.code.need = e;
138	c->sub.code.tree = t + t->base;
139	break;
140	}
141	c->mode = BADCODE; /* invalid code */
142	z->msg = (char*)"invalid distance code";
143	r = Z_DATA_ERROR;
144	LEAVE
145	case DISTEXT: /* i: getting distance extra */
146	j = c->sub.copy.get;
147	NEEDBITS(j)
148	c->sub.copy.dist += (uInt)b & zlib_inflate_mask[j];
149	DUMPBITS(j)
150	c->mode = COPY;
151	case COPY: /* o: copying bytes in window, waiting for space */
152	f = q - c->sub.copy.dist;
153	while (f < s->window) /* modulo window size-"while" instead */
154	f += s->end - s->window; /* of "if" handles invalid distances */
155	while (c->len)
156	{
157	NEEDOUT
158	OUTBYTE(*f++)
159	if (f == s->end)
160	f = s->window;
161	c->len--;
162	}
163	c->mode = START;
164	break;
165	case LIT: /* o: got literal, waiting for output space */
166	NEEDOUT
167	OUTBYTE(c->sub.lit)
168	c->mode = START;
169	break;
170	case WASH: /* o: got eob, possibly more output */
171	if (k > 7) /* return unused byte, if any */
172	{
173	k -= 8;
174	n++;
175	p--; /* can always return one */
176	}
177	FLUSH
178	if (s->read != s->write)
179	LEAVE
180	c->mode = END;
181	case END:
182	r = Z_STREAM_END;
183	LEAVE
184	case BADCODE: /* x: got error */
185	r = Z_DATA_ERROR;
186	LEAVE
187	default:
188	r = Z_STREAM_ERROR;
189	LEAVE
190	}
191	#ifdef NEED_DUMMY_RETURN
192	return Z_STREAM_ERROR; /* Some dumb compilers complain without this */
193	#endif
194	}
195
196
197	void zlib_inflate_codes_free(
198	inflate_codes_statef *c,
199	z_streamp z
200	)
201	{
202	}
203		1	/* infcodes.c -- process literals and length/distance pairs

lib/zlib_inflate/infcodes.h

View file @ 4f3865f

1	/* infcodes.h -- header to use infcodes.c		File was deleted
2	* Copyright (C) 1995-1998 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* WARNING: this file should not be used by applications. It is
7	part of the implementation of the compression library and is
8	subject to change. Applications should only use zlib.h.
9	*/
10
11	#ifndef _INFCODES_H
12	#define _INFCODES_H
13
14	#include "infblock.h"
15
16	struct inflate_codes_state;
17	typedef struct inflate_codes_state inflate_codes_statef;
18
19	extern inflate_codes_statef *zlib_inflate_codes_new (
20	uInt, uInt,
21	inflate_huft , inflate_huft ,
22	z_streamp );
23
24	extern int zlib_inflate_codes (
25	inflate_blocks_statef *,
26	z_streamp ,
27	int);
28
29	extern void zlib_inflate_codes_free (
30	inflate_codes_statef *,
31	z_streamp );
32
33	#endif /* _INFCODES_H */
34		1	/* infcodes.h -- header to use infcodes.c

lib/zlib_inflate/inffast.c

Diff comments View file @ 4f3865f

1	/* inffast.c -- process literals and length/distance pairs fast	1	/* inffast.c -- fast decoding
2	* Copyright (C) 1995-1998 Mark Adler	2	* Copyright (C) 1995-2004 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/	4	*/
5		5
6	#include <linux/zutil.h>	6	#include <linux/zutil.h>
7	#include "inftrees.h"	7	#include "inftrees.h"
8	#include "infblock.h"	8	#include "inflate.h"
9	#include "infcodes.h"
10	#include "infutil.h"
11	#include "inffast.h"	9	#include "inffast.h"
12		10
13	struct inflate_codes_state;	11	#ifndef ASMINF
14		12
15	/* simplify the use of the inflate_huft type with some defines */	13	/* Allow machine dependent optimization for post-increment or pre-increment.
16	#define exop word.what.Exop	14	Based on testing to date,
17	#define bits word.what.Bits	15	Pre-increment preferred for:
		16	- PowerPC G3 (Adler)
		17	- MIPS R5000 (Randers-Pehrson)
		18	Post-increment preferred for:
		19	- none
		20	No measurable difference:
		21	- Pentium III (Anderson)
		22	- M68060 (Nikl)
		23	*/
		24	#ifdef POSTINC
		25	# define OFF 0
		26	# define PUP(a) *(a)++
		27	#else
		28	# define OFF 1
		29	# define PUP(a) *++(a)
		30	#endif
18		31
19	/* macros for bit input with no checking and for returning unused bytes */	32	/*
20	#define GRABBITS(j) {while(k<(j)){b\|=((uLong)NEXTBYTE)<<k;k+=8;}}	33	Decode literal, length, and distance codes and write out the resulting
21	#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}	34	literal and match bytes until either not enough input or output is
		35	available, an end-of-block is encountered, or a data error is encountered.
		36	When large enough input and output buffers are supplied to inflate(), for
		37	example, a 16K input buffer and a 64K output buffer, more than 95% of the
		38	inflate execution time is spent in this routine.
22		39
23	/* Called with number of bytes left to write in window at least 258	40	Entry assumptions:
24	(the maximum string length) and number of input bytes available
25	at least ten. The ten bytes are six bytes for the longest length/
26	distance pair plus four bytes for overloading the bit buffer. */
27		41
28	int zlib_inflate_fast(	42	state->mode == LEN
29	uInt bl,	43	strm->avail_in >= 6
30	uInt bd,	44	strm->avail_out >= 258
31	inflate_huft *tl,	45	start >= strm->avail_out
32	inflate_huft td, / need separate declaration for Borland C++ */	46	state->bits < 8
33	inflate_blocks_statef *s,
34	z_streamp z
35	)
36	{
37	inflate_huft t; / temporary pointer */
38	uInt e; /* extra bits or operation */
39	uLong b; /* bit buffer */
40	uInt k; /* bits in bit buffer */
41	Byte p; / input data pointer */
42	uInt n; /* bytes available there */
43	Byte q; / output window write pointer */
44	uInt m; /* bytes to end of window or read pointer */
45	uInt ml; /* mask for literal/length tree */
46	uInt md; /* mask for distance tree */
47	uInt c; /* bytes to copy */
48	uInt d; /* distance back to copy from */
49	Byte r; / copy source pointer */
50		47
51	/* load input, output, bit values */	48	On return, state->mode is one of:
52	LOAD
53		49
54	/* initialize masks */	50	LEN -- ran out of enough output space or enough available input
55	ml = zlib_inflate_mask[bl];	51	TYPE -- reached end of block code, inflate() to interpret next block
56	md = zlib_inflate_mask[bd];	52	BAD -- error in block data
57		53
58	/* do until not enough input or output space for fast loop */	54	Notes:
59	do { /* assume called with m >= 258 && n >= 10 */
60	/* get literal/length code */
61	GRABBITS(20) /* max bits for literal/length code */
62	if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
63	{
64	DUMPBITS(t->bits)
65	*q++ = (Byte)t->base;
66	m--;
67	continue;
68	}
69	do {
70	DUMPBITS(t->bits)
71	if (e & 16)
72	{
73	/* get extra bits for length */
74	e &= 15;
75	c = t->base + ((uInt)b & zlib_inflate_mask[e]);
76	DUMPBITS(e)
77		55
78	/* decode distance base of block to copy */	56	- The maximum input bits used by a length/distance pair is 15 bits for the
79	GRABBITS(15); /* max bits for distance code */	57	length code, 5 bits for the length extra, 15 bits for the distance code,
80	e = (t = td + ((uInt)b & md))->exop;	58	and 13 bits for the distance extra. This totals 48 bits, or six bytes.
81	do {	59	Therefore if strm->avail_in >= 6, then there is enough input to avoid
82	DUMPBITS(t->bits)	60	checking for available input while decoding.
83	if (e & 16)
84	{
85	/* get extra bits to add to distance base */
86	e &= 15;
87	GRABBITS(e) /* get extra bits (up to 13) */
88	d = t->base + ((uInt)b & zlib_inflate_mask[e]);
89	DUMPBITS(e)
90		61
91	/* do the copy */	62	- The maximum bytes that a single length/distance pair can output is 258
92	m -= c;	63	bytes, which is the maximum length that can be coded. inflate_fast()
93	r = q - d;	64	requires strm->avail_out >= 258 for each loop to avoid checking for
94	if (r < s->window) /* wrap if needed */	65	output space.
95	{	66	*/
96	do {	67	void inflate_fast(strm, start)
97	r += s->end - s->window; /* force pointer in window */	68	z_streamp strm;
98	} while (r < s->window); /* covers invalid distances */	69	unsigned start; /* inflate()'s starting value for strm->avail_out */
99	e = s->end - r;	70	{
100	if (c > e)	71	struct inflate_state *state;
101	{	72	unsigned char in; / local strm->next_in */
102	c -= e; /* wrapped copy */	73	unsigned char last; / while in < last, enough input available */
103	do {	74	unsigned char out; / local strm->next_out */
104	q++ = r++;	75	unsigned char beg; / inflate()'s initial strm->next_out */
105	} while (--e);	76	unsigned char end; / while out < end, enough space available */
106	r = s->window;	77	#ifdef INFLATE_STRICT
107	do {	78	unsigned dmax; /* maximum distance from zlib header */
108	q++ = r++;	79	#endif
109	} while (--c);	80	unsigned wsize; /* window size or zero if not using window */
110	}	81	unsigned whave; /* valid bytes in the window */
111	else /* normal copy */	82	unsigned write; /* window write index */
112	{	83	unsigned char window; / allocated sliding window, if wsize != 0 */
113	q++ = r++; c--;	84	unsigned long hold; /* local strm->hold */
114	q++ = r++; c--;	85	unsigned bits; /* local strm->bits */
115	do {	86	code const lcode; / local strm->lencode */
116	q++ = r++;	87	code const dcode; / local strm->distcode */
117	} while (--c);	88	unsigned lmask; /* mask for first level of length codes */
118	}	89	unsigned dmask; /* mask for first level of distance codes */
		90	code this; /* retrieved table entry */
		91	unsigned op; /* code bits, operation, extra bits, or */
		92	/* window position, window bytes to copy */
		93	unsigned len; /* match length, unused bytes */
		94	unsigned dist; /* match distance */
		95	unsigned char from; / where to copy match from */
		96
		97	/* copy state to local variables */
		98	state = (struct inflate_state *)strm->state;
		99	in = strm->next_in - OFF;
		100	last = in + (strm->avail_in - 5);
		101	out = strm->next_out - OFF;
		102	beg = out - (start - strm->avail_out);
		103	end = out + (strm->avail_out - 257);
		104	#ifdef INFLATE_STRICT
		105	dmax = state->dmax;
		106	#endif
		107	wsize = state->wsize;
		108	whave = state->whave;
		109	write = state->write;
		110	window = state->window;
		111	hold = state->hold;
		112	bits = state->bits;
		113	lcode = state->lencode;
		114	dcode = state->distcode;
		115	lmask = (1U << state->lenbits) - 1;
		116	dmask = (1U << state->distbits) - 1;
		117
		118	/* decode literals and length/distances until end-of-block or not enough
		119	input data or output space */
		120	do {
		121	if (bits < 15) {
		122	hold += (unsigned long)(PUP(in)) << bits;
		123	bits += 8;
		124	hold += (unsigned long)(PUP(in)) << bits;
		125	bits += 8;
		126	}
		127	this = lcode[hold & lmask];
		128	dolen:
		129	op = (unsigned)(this.bits);
		130	hold >>= op;
		131	bits -= op;
		132	op = (unsigned)(this.op);
		133	if (op == 0) { /* literal */
		134	PUP(out) = (unsigned char)(this.val);
		135	}
		136	else if (op & 16) { /* length base */
		137	len = (unsigned)(this.val);
		138	op &= 15; /* number of extra bits */
		139	if (op) {
		140	if (bits < op) {
		141	hold += (unsigned long)(PUP(in)) << bits;
		142	bits += 8;
		143	}
		144	len += (unsigned)hold & ((1U << op) - 1);
		145	hold >>= op;
		146	bits -= op;
119	}	147	}
120	else /* normal copy */	148	if (bits < 15) {
121	{	149	hold += (unsigned long)(PUP(in)) << bits;
122	q++ = r++; c--;	150	bits += 8;
123	q++ = r++; c--;	151	hold += (unsigned long)(PUP(in)) << bits;
124	do {	152	bits += 8;
125	q++ = r++;
126	} while (--c);
127	}	153	}
		154	this = dcode[hold & dmask];
		155	dodist:
		156	op = (unsigned)(this.bits);
		157	hold >>= op;
		158	bits -= op;
		159	op = (unsigned)(this.op);
		160	if (op & 16) { /* distance base */
		161	dist = (unsigned)(this.val);
		162	op &= 15; /* number of extra bits */
		163	if (bits < op) {
		164	hold += (unsigned long)(PUP(in)) << bits;
		165	bits += 8;
		166	if (bits < op) {
		167	hold += (unsigned long)(PUP(in)) << bits;
		168	bits += 8;
		169	}
		170	}
		171	dist += (unsigned)hold & ((1U << op) - 1);
		172	#ifdef INFLATE_STRICT
		173	if (dist > dmax) {
		174	strm->msg = (char *)"invalid distance too far back";
		175	state->mode = BAD;
		176	break;
		177	}
		178	#endif
		179	hold >>= op;
		180	bits -= op;
		181	op = (unsigned)(out - beg); /* max distance in output */
		182	if (dist > op) { /* see if copy from window */
		183	op = dist - op; /* distance back in window */
		184	if (op > whave) {
		185	strm->msg = (char *)"invalid distance too far back";
		186	state->mode = BAD;
		187	break;
		188	}
		189	from = window - OFF;
		190	if (write == 0) { /* very common case */
		191	from += wsize - op;
		192	if (op < len) { /* some from window */
		193	len -= op;
		194	do {
		195	PUP(out) = PUP(from);
		196	} while (--op);
		197	from = out - dist; /* rest from output */
		198	}
		199	}
		200	else if (write < op) { /* wrap around window */
		201	from += wsize + write - op;
		202	op -= write;
		203	if (op < len) { /* some from end of window */
		204	len -= op;
		205	do {
		206	PUP(out) = PUP(from);
		207	} while (--op);
		208	from = window - OFF;
		209	if (write < len) { /* some from start of window */
		210	op = write;
		211	len -= op;
		212	do {
		213	PUP(out) = PUP(from);
		214	} while (--op);
		215	from = out - dist; /* rest from output */
		216	}
		217	}
		218	}
		219	else { /* contiguous in window */
		220	from += write - op;
		221	if (op < len) { /* some from window */
		222	len -= op;
		223	do {
		224	PUP(out) = PUP(from);
		225	} while (--op);
		226	from = out - dist; /* rest from output */
		227	}
		228	}
		229	while (len > 2) {
		230	PUP(out) = PUP(from);
		231	PUP(out) = PUP(from);
		232	PUP(out) = PUP(from);
		233	len -= 3;
		234	}
		235	if (len) {
		236	PUP(out) = PUP(from);
		237	if (len > 1)
		238	PUP(out) = PUP(from);
		239	}
		240	}
		241	else {
		242	from = out - dist; /* copy direct from output */
		243	do { /* minimum length is three */
		244	PUP(out) = PUP(from);
		245	PUP(out) = PUP(from);
		246	PUP(out) = PUP(from);
		247	len -= 3;
		248	} while (len > 2);
		249	if (len) {
		250	PUP(out) = PUP(from);
		251	if (len > 1)
		252	PUP(out) = PUP(from);
		253	}
		254	}
		255	}
		256	else if ((op & 64) == 0) { /* 2nd level distance code */
		257	this = dcode[this.val + (hold & ((1U << op) - 1))];
		258	goto dodist;
		259	}
		260	else {
		261	strm->msg = (char *)"invalid distance code";
		262	state->mode = BAD;
		263	break;

lib/zlib_inflate/inffast.h

Diff comments View file @ 4f3865f

 /* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2003 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 /* WARNING: this file should *not* be used by applications. It is
    part of the implementation of the compression library and is
    subject to change. Applications should only use zlib.h.
  */
-extern int zlib_inflate_fast (
+void inflate_fast (z_streamp strm, unsigned start);
-    uInt,
-    uInt,
-    inflate_huft *,
-    inflate_huft *,
-    inflate_blocks_statef *,
-    z_streamp );

lib/zlib_inflate/inffixed.h

Diff comments View file @ 4f3865f

File was created	1	/* inffixed.h -- table for decoding fixed codes
	2	* Generated automatically by makefixed().
	3	*/
	4
	5	/* WARNING: this file should not be used by applications. It
	6	is part of the implementation of the compression library and
	7	is subject to change. Applications should only use zlib.h.
	8	*/
	9
	10	static const code lenfix[512] = {
	11	{96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
	12	{0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
	13	{0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
	14	{0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
	15	{0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
	16	{21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
	17	{0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
	18	{0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
	19	{18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
	20	{0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
	21	{0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
	22	{0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
	23	{20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
	24	{0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
	25	{0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
	26	{0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
	27	{16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
	28	{0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
	29	{0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
	30	{0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
	31	{0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
	32	{0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
	33	{0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
	34	{0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
	35	{17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
	36	{0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
	37	{0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
	38	{0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
	39	{19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
	40	{0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
	41	{0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
	42	{0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
	43	{16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
	44	{0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
	45	{0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
	46	{0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
	47	{0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
	48	{20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
	49	{0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
	50	{0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
	51	{17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
	52	{0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
	53	{0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
	54	{0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
	55	{20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
	56	{0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
	57	{0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
	58	{0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
	59	{16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
	60	{0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
	61	{0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
	62	{0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
	63	{0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
	64	{0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
	65	{0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
	66	{0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
	67	{16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
	68	{0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
	69	{0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
	70	{0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
	71	{19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
	72	{0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
	73	{0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
	74	{0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
	75	{16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
	76	{0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
	77	{0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
	78	{0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
	79	{0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
	80	{64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
	81	{0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
	82	{0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
	83	{18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
	84	{0,9,255}
	85	};
	86
	87	static const code distfix[32] = {
	88	{16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
	89	{21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
	90	{18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
	91	{19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
	92	{16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
	93	{22,5,193},{64,5,0}
	94	};
	95

lib/zlib_inflate/inflate.c

Diff comments View file @ 4f3865f

1	/* inflate.c -- zlib interface to inflate modules	1	/* inflate.c -- zlib decompression
2	* Copyright (C) 1995-1998 Mark Adler	2	* Copyright (C) 1995-2005 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h	3	* For conditions of distribution and use, see copyright notice in zlib.h
		4	*
		5	* Based on zlib 1.2.3 but modified for the Linux Kernel by
		6	* Richard Purdie <richard@openedhand.com>
		7	*
		8	* Changes mainly for static instead of dynamic memory allocation
		9	*
4	*/	10	*/
5		11
6	#include <linux/zutil.h>	12	#include <linux/zutil.h>
7	#include "infblock.h"	13	#include "inftrees.h"
		14	#include "inflate.h"
		15	#include "inffast.h"
8	#include "infutil.h"	16	#include "infutil.h"
9		17
10	int zlib_inflate_workspacesize(void)	18	int zlib_inflate_workspacesize(void)
11	{	19	{
12	return sizeof(struct inflate_workspace);	20	return sizeof(struct inflate_workspace);
13	}	21	}
14		22
15		23	int zlib_inflateReset(z_streamp strm)
16	int zlib_inflateReset(
17	z_streamp z
18	)
19	{	24	{
20	if (z == NULL \|\| z->state == NULL \|\| z->workspace == NULL)	25	struct inflate_state *state;
21	return Z_STREAM_ERROR;
22	z->total_in = z->total_out = 0;
23	z->msg = NULL;
24	z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
25	zlib_inflate_blocks_reset(z->state->blocks, z, NULL);
26	return Z_OK;
27	}
28		26
		27	if (strm == NULL \|\| strm->state == NULL) return Z_STREAM_ERROR;
		28	state = (struct inflate_state *)strm->state;
		29	strm->total_in = strm->total_out = state->total = 0;
		30	strm->msg = NULL;
		31	strm->adler = 1; /* to support ill-conceived Java test suite */
		32	state->mode = HEAD;
		33	state->last = 0;
		34	state->havedict = 0;
		35	state->dmax = 32768U;
		36	state->hold = 0;
		37	state->bits = 0;
		38	state->lencode = state->distcode = state->next = state->codes;
29		39
30	int zlib_inflateEnd(	40	/* Initialise Window */
31	z_streamp z	41	state->wsize = 1U << state->wbits;
32	)	42	state->write = 0;
		43	state->whave = 0;
		44
		45	return Z_OK;
		46	}
		47
		48	#if 0
		49	int zlib_inflatePrime(z_streamp strm, int bits, int value)
33	{	50	{
34	if (z == NULL \|\| z->state == NULL \|\| z->workspace == NULL)	51	struct inflate_state *state;
35	return Z_STREAM_ERROR;	52
36	if (z->state->blocks != NULL)	53	if (strm == NULL \|\| strm->state == NULL) return Z_STREAM_ERROR;
37	zlib_inflate_blocks_free(z->state->blocks, z);	54	state = (struct inflate_state *)strm->state;
38	z->state = NULL;	55	if (bits > 16 \|\| state->bits + bits > 32) return Z_STREAM_ERROR;
39	return Z_OK;	56	value &= (1L << bits) - 1;
		57	state->hold += value << state->bits;
		58	state->bits += bits;
		59	return Z_OK;
40	}	60	}
		61	#endif
41		62
		63	int zlib_inflateInit2(z_streamp strm, int windowBits)
		64	{
		65	struct inflate_state *state;
42		66
43	int zlib_inflateInit2_(	67	if (strm == NULL) return Z_STREAM_ERROR;
44	z_streamp z,	68	strm->msg = NULL; /* in case we return an error */
45	int w,	69
46	const char *version,	70	state = &WS(strm)->inflate_state;
47	int stream_size	71	strm->state = (struct internal_state *)state;
48	)	72
		73	if (windowBits < 0) {
		74	state->wrap = 0;
		75	windowBits = -windowBits;
		76	}
		77	else {
		78	state->wrap = (windowBits >> 4) + 1;
		79	}
		80	if (windowBits < 8 \|\| windowBits > 15) {
		81	return Z_STREAM_ERROR;
		82	}
		83	state->wbits = (unsigned)windowBits;
		84	state->window = &WS(strm)->working_window[0];
		85
		86	return zlib_inflateReset(strm);
		87	}
		88
		89	/*
		90	Return state with length and distance decoding tables and index sizes set to
		91	fixed code decoding. This returns fixed tables from inffixed.h.
		92	*/
		93	static void zlib_fixedtables(struct inflate_state *state)
49	{	94	{
50	if (version == NULL \|\| version[0] != ZLIB_VERSION[0] \|\|	95	# include "inffixed.h"
51	stream_size != sizeof(z_stream) \|\| z->workspace == NULL)	96	state->lencode = lenfix;
52	return Z_VERSION_ERROR;	97	state->lenbits = 9;
		98	state->distcode = distfix;
		99	state->distbits = 5;
		100	}
53		101
54	/* initialize state */
55	z->msg = NULL;
56	z->state = &WS(z)->internal_state;
57	z->state->blocks = NULL;
58		102
59	/* handle undocumented nowrap option (no zlib header or check) */	103	/*
60	z->state->nowrap = 0;	104	Update the window with the last wsize (normally 32K) bytes written before
61	if (w < 0)	105	returning. This is only called when a window is already in use, or when
62	{	106	output has been written during this inflate call, but the end of the deflate
63	w = - w;	107	stream has not been reached yet. It is also called to window dictionary data
64	z->state->nowrap = 1;	108	when a dictionary is loaded.
65	}
66		109
67	/* set window size */	110	Providing output buffers larger than 32K to inflate() should provide a speed
68	if (w < 8 \|\| w > 15)	111	advantage, since only the last 32K of output is copied to the sliding window
69	{	112	upon return from inflate(), and since all distances after the first 32K of
70	zlib_inflateEnd(z);	113	output will fall in the output data, making match copies simpler and faster.
71	return Z_STREAM_ERROR;	114	The advantage may be dependent on the size of the processor's data caches.
72	}	115	*/
73	z->state->wbits = (uInt)w;	116	static void zlib_updatewindow(z_streamp strm, unsigned out)
		117	{
		118	struct inflate_state *state;
		119	unsigned copy, dist;
74		120
75	/* create inflate_blocks state */	121	state = (struct inflate_state *)strm->state;
76	if ((z->state->blocks =
77	zlib_inflate_blocks_new(z, z->state->nowrap ? NULL : zlib_adler32, (uInt)1 << w))
78	== NULL)
79	{
80	zlib_inflateEnd(z);
81	return Z_MEM_ERROR;
82	}
83		122
84	/* reset state */	123	/* copy state->wsize or less output bytes into the circular window */
85	zlib_inflateReset(z);	124	copy = out - strm->avail_out;
86	return Z_OK;	125	if (copy >= state->wsize) {
		126	memcpy(state->window, strm->next_out - state->wsize, state->wsize);
		127	state->write = 0;
		128	state->whave = state->wsize;
		129	}
		130	else {
		131	dist = state->wsize - state->write;
		132	if (dist > copy) dist = copy;
		133	memcpy(state->window + state->write, strm->next_out - copy, dist);
		134	copy -= dist;
		135	if (copy) {
		136	memcpy(state->window, strm->next_out - copy, copy);
		137	state->write = copy;
		138	state->whave = state->wsize;
		139	}
		140	else {
		141	state->write += dist;
		142	if (state->write == state->wsize) state->write = 0;
		143	if (state->whave < state->wsize) state->whave += dist;
		144	}
		145	}
87	}	146	}
88		147
89		148
90	/*	149	/*
91	* At the end of a Deflate-compressed PPP packet, we expect to have seen	150	* At the end of a Deflate-compressed PPP packet, we expect to have seen
92	* a `stored' block type value but not the (zero) length bytes.	151	* a `stored' block type value but not the (zero) length bytes.
93	*/	152	*/
94	static int zlib_inflate_packet_flush(inflate_blocks_statef *s)	153	/*
		154	Returns true if inflate is currently at the end of a block generated by
		155	Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
		156	implementation to provide an additional safety check. PPP uses
		157	Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored
		158	block. When decompressing, PPP checks that at the end of input packet,
		159	inflate is waiting for these length bytes.
		160	*/
		161	static int zlib_inflateSyncPacket(z_streamp strm)
95	{	162	{
96	if (s->mode != LENS)	163	struct inflate_state *state;
97	return Z_DATA_ERROR;	164
98	s->mode = TYPE;	165	if (strm == NULL \|\| strm->state == NULL) return Z_STREAM_ERROR;
		166	state = (struct inflate_state *)strm->state;
		167
		168	if (state->mode == STORED && state->bits == 0) {
		169	state->mode = TYPE;
		170	return Z_OK;
		171	}
		172	return Z_DATA_ERROR;
		173	}
		174
		175	/* Macros for inflate(): */
		176
		177	/* check function to use adler32() for zlib or crc32() for gzip */
		178	#define UPDATE(check, buf, len) zlib_adler32(check, buf, len)
		179
		180	/* Load registers with state in inflate() for speed */
		181	#define LOAD() \
		182	do { \
		183	put = strm->next_out; \
		184	left = strm->avail_out; \
		185	next = strm->next_in; \
		186	have = strm->avail_in; \
		187	hold = state->hold; \
		188	bits = state->bits; \
		189	} while (0)
		190
		191	/* Restore state from registers in inflate() */
		192	#define RESTORE() \
		193	do { \
		194	strm->next_out = put; \
		195	strm->avail_out = left; \
		196	strm->next_in = next; \
		197	strm->avail_in = have; \
		198	state->hold = hold; \
		199	state->bits = bits; \
		200	} while (0)
		201
		202	/* Clear the input bit accumulator */
		203	#define INITBITS() \
		204	do { \
		205	hold = 0; \
		206	bits = 0; \
		207	} while (0)
		208
		209	/* Get a byte of input into the bit accumulator, or return from inflate()
		210	if there is no input available. */
		211	#define PULLBYTE() \
		212	do { \
		213	if (have == 0) goto inf_leave; \
		214	have--; \
		215	hold += (unsigned long)(*next++) << bits; \
		216	bits += 8; \
		217	} while (0)
		218
		219	/* Assure that there are at least n bits in the bit accumulator. If there is
		220	not enough available input to do that, then return from inflate(). */
		221	#define NEEDBITS(n) \
		222	do { \
		223	while (bits < (unsigned)(n)) \
		224	PULLBYTE(); \
		225	} while (0)
		226
		227	/* Return the low n bits of the bit accumulator (n < 16) */
		228	#define BITS(n) \
		229	((unsigned)hold & ((1U << (n)) - 1))
		230
		231	/* Remove n bits from the bit accumulator */
		232	#define DROPBITS(n) \
		233	do { \
		234	hold >>= (n); \
		235	bits -= (unsigned)(n); \
		236	} while (0)
		237
		238	/* Remove zero to seven bits as needed to go to a byte boundary */
		239	#define BYTEBITS() \
		240	do { \
		241	hold >>= bits & 7; \
		242	bits -= bits & 7; \
		243	} while (0)
		244
		245	/* Reverse the bytes in a 32-bit value */
		246	#define REVERSE(q) \
		247	((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \
		248	(((q) & 0xff00) << 8) + (((q) & 0xff) << 24))
		249
		250	/*
		251	inflate() uses a state machine to process as much input data and generate as
		252	much output data as possible before returning. The state machine is
		253	structured roughly as follows:
		254
		255	for (;;) switch (state) {
		256	...
		257	case STATEn:
		258	if (not enough input data or output space to make progress)
		259	return;
		260	... make progress ...
		261	state = STATEm;
		262	break;
		263	...
		264	}
		265
		266	so when inflate() is called again, the same case is attempted again, and
		267	if the appropriate resources are provided, the machine proceeds to the
		268	next state. The NEEDBITS() macro is usually the way the state evaluates
		269	whether it can proceed or should return. NEEDBITS() does the return if
		270	the requested bits are not available. The typical use of the BITS macros
		271	is:
		272
		273	NEEDBITS(n);
		274	... do something with BITS(n) ...
		275	DROPBITS(n);
		276
		277	where NEEDBITS(n) either returns from inflate() if there isn't enough
		278	input left to load n bits into the accumulator, or it continues. BITS(n)
		279	gives the low n bits in the accumulator. When done, DROPBITS(n) drops
		280	the low n bits off the accumulator. INITBITS() clears the accumulator
		281	and sets the number of available bits to zero. BYTEBITS() discards just
		282	enough bits to put the accumulator on a byte boundary. After BYTEBITS()
		283	and a NEEDBITS(8), then BITS(8) would return the next byte in the stream.
		284
		285	NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return
		286	if there is no input available. The decoding of variable length codes uses
		287	PULLBYTE() directly in order to pull just enough bytes to decode the next
		288	code, and no more.
		289
		290	Some states loop until they get enough input, making sure that enough
		291	state information is maintained to continue the loop where it left off
		292	if NEEDBITS() returns in the loop. For example, want, need, and keep
		293	would all have to actually be part of the saved state in case NEEDBITS()
		294	returns:
		295
		296	case STATEw:
		297	while (want < need) {
		298	NEEDBITS(n);
		299	keep[want++] = BITS(n);
		300	DROPBITS(n);
		301	}
		302	state = STATEx;
		303	case STATEx:
		304
		305	As shown above, if the next state is also the next case, then the break
		306	is omitted.
		307
		308	A state may also return if there is not enough output space available to
		309	complete that state. Those states are copying stored data, writing a
		310	literal byte, and copying a matching string.
		311
		312	When returning, a "goto inf_leave" is used to update the total counters,
		313	update the check value, and determine whether any progress has been made
		314	during that inflate() call in order to return the proper return code.
		315	Progress is defined as a change in either strm->avail_in or strm->avail_out.
		316	When there is a window, goto inf_leave will update the window with the last
		317	output written. If a goto inf_leave occurs in the middle of decompression
		318	and there is no window currently, goto inf_leave will create one and copy
		319	output to the window for the next call of inflate().
		320
		321	In this implementation, the flush parameter of inflate() only affects the
		322	return code (per zlib.h). inflate() always writes as much as possible to
		323	strm->next_out, given the space available and the provided input--the effect
		324	documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers
		325	the allocation of and copying into a sliding window until necessary, which
		326	provides the effect documented in zlib.h for Z_FINISH when the entire input
		327	stream available. So the only thing the flush parameter actually does is:
		328	when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it
		329	will return Z_BUF_ERROR if it has not reached the end of the stream.
		330	*/
		331
		332	int zlib_inflate(z_streamp strm, int flush)
		333	{
		334	struct inflate_state *state;
		335	unsigned char next; / next input */
		336	unsigned char put; / next output */
		337	unsigned have, left; /* available input and output */
		338	unsigned long hold; /* bit buffer */
		339	unsigned bits; /* bits in bit buffer */
		340	unsigned in, out; /* save starting available input and output */
		341	unsigned copy; /* number of stored or match bytes to copy */
		342	unsigned char from; / where to copy match bytes from */
		343	code this; /* current decoding table entry */
		344	code last; /* parent table entry */
		345	unsigned len; /* length to copy for repeats, bits to drop */
		346	int ret; /* return code */
		347	static const unsigned short order[19] = /* permutation of code lengths */
		348	{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
		349
		350	if (strm == NULL \|\| strm->state == NULL \|\| strm->next_out == NULL \|\|
		351	(strm->next_in == NULL && strm->avail_in != 0))
		352	return Z_STREAM_ERROR;
		353
		354	state = (struct inflate_state *)strm->state;
		355
		356	if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */
		357	LOAD();
		358	in = have;
		359	out = left;
		360	ret = Z_OK;
		361	for (;;)
		362	switch (state->mode) {
		363	case HEAD:
		364	if (state->wrap == 0) {
		365	state->mode = TYPEDO;
		366	break;
		367	}
		368	NEEDBITS(16);
		369	if (
		370	((BITS(8) << 8) + (hold >> 8)) % 31) {
		371	strm->msg = (char *)"incorrect header check";
		372	state->mode = BAD;
		373	break;
		374	}
		375	if (BITS(4) != Z_DEFLATED) {
		376	strm->msg = (char *)"unknown compression method";
		377	state->mode = BAD;
		378	break;
		379	}
		380	DROPBITS(4);
		381	len = BITS(4) + 8;
		382	if (len > state->wbits) {
		383	strm->msg = (char *)"invalid window size";
		384	state->mode = BAD;
		385	break;
		386	}
		387	state->dmax = 1U << len;
		388	strm->adler = state->check = zlib_adler32(0L, NULL, 0);
		389	state->mode = hold & 0x200 ? DICTID : TYPE;
		390	INITBITS();
		391	break;
		392	case DICTID:
		393	NEEDBITS(32);
		394	strm->adler = state->check = REVERSE(hold);
		395	INITBITS();
		396	state->mode = DICT;
		397	case DICT:
		398	if (state->havedict == 0) {
		399	RESTORE();
		400	return Z_NEED_DICT;
		401	}
		402	strm->adler = state->check = zlib_adler32(0L, NULL, 0);
		403	state->mode = TYPE;
		404	case TYPE:
		405	if (flush == Z_BLOCK) goto inf_leave;
		406	case TYPEDO:
		407	if (state->last) {
		408	BYTEBITS();
		409	state->mode = CHECK;
		410	break;
		411	}
		412	NEEDBITS(3);
		413	state->last = BITS(1);
		414	DROPBITS(1);
		415	switch (BITS(2)) {
		416	case 0: /* stored block */
		417	state->mode = STORED;
		418	break;
		419	case 1: /* fixed block */
		420	zlib_fixedtables(state);
		421	state->mode = LEN; /* decode codes */
		422	break;
		423	case 2: /* dynamic block */
		424	state->mode = TABLE;
		425	break;
		426	case 3:
		427	strm->msg = (char *)"invalid block type";
		428	state->mode = BAD;
		429	}
		430	DROPBITS(2);
		431	break;
		432	case STORED:
		433	BYTEBITS(); /* go to byte boundary */
		434	NEEDBITS(32);
		435	if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
		436	strm->msg = (char *)"invalid stored block lengths";
		437	state->mode = BAD;
		438	break;
		439	}
		440	state->length = (unsigned)hold & 0xffff;
		441	INITBITS();
		442	state->mode = COPY;
		443	case COPY:
		444	copy = state->length;
		445	if (copy) {
		446	if (copy > have) copy = have;
		447	if (copy > left) copy = left;
		448	if (copy == 0) goto inf_leave;
		449	memcpy(put, next, copy);
		450	have -= copy;
		451	next += copy;
		452	left -= copy;
		453	put += copy;
		454	state->length -= copy;
		455	break;
		456	}
		457	state->mode = TYPE;
		458	break;
		459	case TABLE:
		460	NEEDBITS(14);
		461	state->nlen = BITS(5) + 257;
		462	DROPBITS(5);
		463	state->ndist = BITS(5) + 1;
		464	DROPBITS(5);
		465	state->ncode = BITS(4) + 4;
		466	DROPBITS(4);
		467	#ifndef PKZIP_BUG_WORKAROUND
		468	if (state->nlen > 286 \|\| state->ndist > 30) {
		469	strm->msg = (char *)"too many length or distance symbols";
		470	state->mode = BAD;
		471	break;
		472	}
		473	#endif
		474	state->have = 0;
		475	state->mode = LENLENS;
		476	case LENLENS:
		477	while (state->have < state->ncode) {
		478	NEEDBITS(3);
		479	state->lens[order[state->have++]] = (unsigned short)BITS(3);
		480	DROPBITS(3);
		481	}
		482	while (state->have < 19)
		483	state->lens[order[state->have++]] = 0;
		484	state->next = state->codes;
		485	state->lencode = (code const *)(state->next);
		486	state->lenbits = 7;
		487	ret = zlib_inflate_table(CODES, state->lens, 19, &(state->next),
		488	&(state->lenbits), state->work);
		489	if (ret) {
		490	strm->msg = (char *)"invalid code lengths set";
		491	state->mode = BAD;
		492	break;
		493	}
		494	state->have = 0;
		495	state->mode = CODELENS;
		496	case CODELENS:
		497	while (state->have < state->nlen + state->ndist) {
		498	for (;;) {
		499	this = state->lencode[BITS(state->lenbits)];
		500	if ((unsigned)(this.bits) <= bits) break;
		501	PULLBYTE();
		502	}
		503	if (this.val < 16) {
		504	NEEDBITS(this.bits);
		505	DROPBITS(this.bits);
		506	state->lens[state->have++] = this.val;
		507	}
		508	else {
		509	if (this.val == 16) {
		510	NEEDBITS(this.bits + 2);
		511	DROPBITS(this.bits);
		512	if (state->have == 0) {
		513	strm->msg = (char *)"invalid bit length repeat";
		514	state->mode = BAD;
		515	break;
		516	}
		517	len = state->lens[state->have - 1];
		518	copy = 3 + BITS(2);
		519	DROPBITS(2);
		520	}
		521	else if (this.val == 17) {
		522	NEEDBITS(this.bits + 3);
		523	DROPBITS(this.bits);
		524	len = 0;
		525	copy = 3 + BITS(3);
		526	DROPBITS(3);
		527	}
		528	else {
		529	NEEDBITS(this.bits + 7);
		530	DROPBITS(this.bits);
		531	len = 0;
		532	copy = 11 + BITS(7);
		533	DROPBITS(7);
		534	}
		535	if (state->have + copy > state->nlen + state->ndist) {
		536	strm->msg = (char *)"invalid bit length repeat";
		537	state->mode = BAD;
		538	break;
		539	}
		540	while (copy--)
		541	state->lens[state->have++] = (unsigned short)len;
		542	}
		543	}
		544
		545	/* handle error breaks in while */
		546	if (state->mode == BAD) break;
		547
		548	/* build code tables */
		549	state->next = state->codes;
		550	state->lencode = (code const *)(state->next);
		551	state->lenbits = 9;
		552	ret = zlib_inflate_table(LENS, state->lens, state->nlen, &(state->next),
		553	&(state->lenbits), state->work);
		554	if (ret) {
		555	strm->msg = (char *)"invalid literal/lengths set";
		556	state->mode = BAD;
		557	break;
		558	}
		559	state->distcode = (code const *)(state->next);
		560	state->distbits = 6;
		561	ret = zlib_inflate_table(DISTS, state->lens + state->nlen, state->ndist,
		562	&(state->next), &(state->distbits), state->work);
		563	if (ret) {
		564	strm->msg = (char *)"invalid distances set";
		565	state->mode = BAD;
		566	break;
		567	}
		568	state->mode = LEN;
		569	case LEN:
		570	if (have >= 6 && left >= 258) {
		571	RESTORE();
		572	inflate_fast(strm, out);
		573	LOAD();
		574	break;
		575	}
		576	for (;;) {
		577	this = state->lencode[BITS(state->lenbits)];
		578	if ((unsigned)(this.bits) <= bits) break;
		579	PULLBYTE();
		580	}
		581	if (this.op && (this.op & 0xf0) == 0) {
		582	last = this;
		583	for (;;) {
		584	this = state->lencode[last.val +
		585	(BITS(last.bits + last.op) >> last.bits)];
		586	if ((unsigned)(last.bits + this.bits) <= bits) break;
		587	PULLBYTE();
		588	}
		589	DROPBITS(last.bits);
		590	}
		591	DROPBITS(this.bits);
		592	state->length = (unsigned)this.val;
		593	if ((int)(this.op) == 0) {
		594	state->mode = LIT;
		595	break;
		596	}
		597	if (this.op & 32) {
		598	state->mode = TYPE;
		599	break;
		600	}
		601	if (this.op & 64) {
		602	strm->msg = (char *)"invalid literal/length code";
		603	state->mode = BAD;
		604	break;
		605	}
		606	state->extra = (unsigned)(this.op) & 15;
		607	state->mode = LENEXT;
		608	case LENEXT:
		609	if (state->extra) {
		610	NEEDBITS(state->extra);
		611	state->length += BITS(state->extra);
		612	DROPBITS(state->extra);
		613	}
		614	state->mode = DIST;
		615	case DIST:
		616	for (;;) {
		617	this = state->distcode[BITS(state->distbits)];
		618	if ((unsigned)(this.bits) <= bits) break;
		619	PULLBYTE();
		620	}
		621	if ((this.op & 0xf0) == 0) {
		622	last = this;
		623	for (;;) {
		624	this = state->distcode[last.val +
		625	(BITS(last.bits + last.op) >> last.bits)];
		626	if ((unsigned)(last.bits + this.bits) <= bits) break;
		627	PULLBYTE();
		628	}
		629	DROPBITS(last.bits);
		630	}
		631	DROPBITS(this.bits);
		632	if (this.op & 64) {
		633	strm->msg = (char *)"invalid distance code";
		634	state->mode = BAD;
		635	break;
		636	}
		637	state->offset = (unsigned)this.val;
		638	state->extra = (unsigned)(this.op) & 15;
		639	state->mode = DISTEXT;
		640	case DISTEXT:
		641	if (state->extra) {
		642	NEEDBITS(state->extra);
		643	state->offset += BITS(state->extra);
		644	DROPBITS(state->extra);
		645	}
		646	#ifdef INFLATE_STRICT
		647	if (state->offset > state->dmax) {
		648	strm->msg = (char *)"invalid distance too far back";
		649	state->mode = BAD;
		650	break;
		651	}
		652	#endif
		653	if (state->offset > state->whave + out - left) {
		654	strm->msg = (char *)"invalid distance too far back";
		655	state->mode = BAD;
		656	break;
		657	}
		658	state->mode = MATCH;
		659	case MATCH:
		660	if (left == 0) goto inf_leave;
		661	copy = out - left;
		662	if (state->offset > copy) { /* copy from window */
		663	copy = state->offset - copy;
		664	if (copy > state->write) {
		665	copy -= state->write;
		666	from = state->window + (state->wsize - copy);
		667	}
		668	else
		669	from = state->window + (state->write - copy);
		670	if (copy > state->length) copy = state->length;
		671	}
		672	else { /* copy from output */
		673	from = put - state->offset;
		674	copy = state->length;
		675	}
		676	if (copy > left) copy = left;
		677	left -= copy;
		678	state->length -= copy;
		679	do {
		680	put++ = from++;
		681	} while (--copy);
		682	if (state->length == 0) state->mode = LEN;
		683	break;
		684	case LIT:
		685	if (left == 0) goto inf_leave;
		686	*put++ = (unsigned char)(state->length);
		687	left--;
		688	state->mode = LEN;
		689	break;
		690	case CHECK:
		691	if (state->wrap) {
		692	NEEDBITS(32);
		693	out -= left;
		694	strm->total_out += out;
		695	state->total += out;
		696	if (out)
		697	strm->adler = state->check =
		698	UPDATE(state->check, put - out, out);
		699	out = left;
		700	if ((
		701	REVERSE(hold)) != state->check) {
		702	strm->msg = (char *)"incorrect data check";
		703	state->mode = BAD;
		704	break;
		705	}
		706	INITBITS();
		707	}
		708	state->mode = DONE;
		709	case DONE:
		710	ret = Z_STREAM_END;
		711	goto inf_leave;
		712	case BAD:
		713	ret = Z_DATA_ERROR;
		714	goto inf_leave;
		715	case MEM:
		716	return Z_MEM_ERROR;
		717	case SYNC:
		718	default:
		719	return Z_STREAM_ERROR;
		720	}
		721
		722	/*
		723	Return from inflate(), updating the total counts and the check value.
		724	If there was no progress during the inflate() call, return a buffer
		725	error. Call zlib_updatewindow() to create and/or update the window state.
		726	*/
		727	inf_leave:
		728	RESTORE();
		729	if (state->wsize \|\| (state->mode < CHECK && out != strm->avail_out))
		730	zlib_updatewindow(strm, out);
		731
		732	in -= strm->avail_in;
		733	out -= strm->avail_out;
		734	strm->total_in += in;
		735	strm->total_out += out;
		736	state->total += out;
		737	if (state->wrap && out)
		738	strm->adler = state->check =
		739	UPDATE(state->check, strm->next_out - out, out);
		740
		741	strm->data_type = state->bits + (state->last ? 64 : 0) +
		742	(state->mode == TYPE ? 128 : 0);
		743	if (((in == 0 && out == 0) \|\| flush == Z_FINISH) && ret == Z_OK)
		744	ret = Z_BUF_ERROR;
		745
		746	if (flush == Z_PACKET_FLUSH && ret == Z_OK &&
		747	(strm->avail_out != 0 \|\| strm->avail_in == 0))
		748	return zlib_inflateSyncPacket(strm);
		749	return ret;
		750	}
		751
		752	int zlib_inflateEnd(z_streamp strm)
		753	{
		754	if (strm == NULL \|\| strm->state == NULL)
		755	return Z_STREAM_ERROR;
99	return Z_OK;	756	return Z_OK;
100	}	757	}
101		758
		759	#if 0
		760	int zlib_inflateSetDictionary(z_streamp strm, const Byte *dictionary,
		761	uInt dictLength)
		762	{
		763	struct inflate_state *state;
		764	unsigned long id;
102		765
103	int zlib_inflateInit_(	766	/* check state */
104	z_streamp z,	767	if (strm == NULL \|\| strm->state == NULL) return Z_STREAM_ERROR;
105	const char *version,	768	state = (struct inflate_state *)strm->state;
106	int stream_size	769	if (state->wrap != 0 && state->mode != DICT)
107	)	770	return Z_STREAM_ERROR;
		771
		772	/* check for correct dictionary id */
		773	if (state->mode == DICT) {
		774	id = zlib_adler32(0L, NULL, 0);
		775	id = zlib_adler32(id, dictionary, dictLength);
		776	if (id != state->check)
		777	return Z_DATA_ERROR;
		778	}
		779
		780	/* copy dictionary to window */
		781	zlib_updatewindow(strm, strm->avail_out);
		782
		783	if (dictLength > state->wsize) {
		784	memcpy(state->window, dictionary + dictLength - state->wsize,
		785	state->wsize);
		786	state->whave = state->wsize;
		787	}
		788	else {
		789	memcpy(state->window + state->wsize - dictLength, dictionary,
		790	dictLength);
		791	state->whave = dictLength;
		792	}
		793	state->havedict = 1;
		794	return Z_OK;
		795	}
		796	#endif
		797
		798	#if 0
		799	/*
		800	Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found
		801	or when out of input. When called, *have is the number of pattern bytes
		802	found in order so far, in 0..3. On return *have is updated to the new
		803	state. If on return *have equals four, then the pattern was found and the
		804	return value is how many bytes were read including the last byte of the
		805	pattern. If *have is less than four, then the pattern has not been found
		806	yet and the return value is len. In the latter case, zlib_syncsearch() can be
		807	called again with more data and the have state. have is initialized to
		808	zero for the first call.
		809	*/
		810	static unsigned zlib_syncsearch(unsigned have, unsigned char buf,
		811	unsigned len)
108	{	812	{
109	return zlib_inflateInit2_(z, DEF_WBITS, version, stream_size);	813	unsigned got;
		814	unsigned next;
		815
		816	got = *have;
		817	next = 0;
		818	while (next < len && got < 4) {
		819	if ((int)(buf[next]) == (got < 2 ? 0 : 0xff))
		820	got++;
		821	else if (buf[next])
		822	got = 0;
		823	else
		824	got = 4 - got;
		825	next++;
		826	}
		827	*have = got;
		828	return next;
110	}	829	}
		830	#endif
111		831
112	#undef NEEDBYTE	832	#if 0
113	#undef NEXTBYTE	833	int zlib_inflateSync(z_streamp strm)
114	#define NEEDBYTE {if(z->avail_in==0)goto empty;r=trv;}	834	{
115	#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)	835	unsigned len; /* number of bytes to look at or looked at */
		836	unsigned long in, out; /* temporary to save total_in and total_out */
		837	unsigned char buf[4]; /* to restore bit buffer to byte string */
		838	struct inflate_state *state;
116		839
117	int zlib_inflate(	840	/* check parameters */
118	z_streamp z,	841	if (strm == NULL \|\| strm->state == NULL) return Z_STREAM_ERROR;
119	int f	842	state = (struct inflate_state *)strm->state;
120	)	843	if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
		844
		845	/* if first time, start search in bit buffer */
		846	if (state->mode != SYNC) {
		847	state->mode = SYNC;
		848	state->hold <<= state->bits & 7;
		849	state->bits -= state->bits & 7;
		850	len = 0;
		851	while (state->bits >= 8) {
		852	buf[len++] = (unsigned char)(state->hold);
		853	state->hold >>= 8;
		854	state->bits -= 8;
		855	}
		856	state->have = 0;
		857	zlib_syncsearch(&(state->have), buf, len);
		858	}
		859
		860	/* search available input */
		861	len = zlib_syncsearch(&(state->have), strm->next_in, strm->avail_in);
		862	strm->avail_in -= len;
		863	strm->next_in += len;
		864	strm->total_in += len;
		865
		866	/* return no joy or set up to restart inflate() on a new block */
		867	if (state->have != 4) return Z_DATA_ERROR;
		868	in = strm->total_in; out = strm->total_out;
		869	zlib_inflateReset(strm);
		870	strm->total_in = in; strm->total_out = out;
		871	state->mode = TYPE;
		872	return Z_OK;
		873	}
		874	#endif
		875
		876	/*
		877	* This subroutine adds the data at next_in/avail_in to the output history
		878	* without performing any output. The output buffer must be "caught up";
		879	* i.e. no pending output but this should always be the case. The state must
		880	* be waiting on the start of a block (i.e. mode == TYPE or HEAD). On exit,
		881	* the output will also be caught up, and the checksum will have been updated
		882	* if need be.
		883	*/
		884	int zlib_inflateIncomp(z_stream *z)
121	{	885	{
122	int r, trv;	886	struct inflate_state state = (struct inflate_state )z->state;
123	uInt b;	887	Byte *saved_no = z->next_out;
		888	uInt saved_ao = z->avail_out;
124		889
125	if (z == NULL \|\| z->state == NULL \|\| z->next_in == NULL)	890	if (state->mode != TYPE && state->mode != HEAD)
126	return Z_STREAM_ERROR;	891	return Z_DATA_ERROR;
127	trv = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;

lib/zlib_inflate/inflate.h

Diff comments View file @ 4f3865f

File was created	1	/* inflate.h -- internal inflate state definition
	2	* Copyright (C) 1995-2004 Mark Adler
	3	* For conditions of distribution and use, see copyright notice in zlib.h
	4	*/
	5
	6	/* WARNING: this file should not be used by applications. It is
	7	part of the implementation of the compression library and is
	8	subject to change. Applications should only use zlib.h.
	9	*/
	10
	11	/* Possible inflate modes between inflate() calls */
	12	typedef enum {
	13	HEAD, /* i: waiting for magic header */
	14	FLAGS, /* i: waiting for method and flags (gzip) */
	15	TIME, /* i: waiting for modification time (gzip) */
	16	OS, /* i: waiting for extra flags and operating system (gzip) */
	17	EXLEN, /* i: waiting for extra length (gzip) */
	18	EXTRA, /* i: waiting for extra bytes (gzip) */
	19	NAME, /* i: waiting for end of file name (gzip) */
	20	COMMENT, /* i: waiting for end of comment (gzip) */
	21	HCRC, /* i: waiting for header crc (gzip) */
	22	DICTID, /* i: waiting for dictionary check value */
	23	DICT, /* waiting for inflateSetDictionary() call */
	24	TYPE, /* i: waiting for type bits, including last-flag bit */
	25	TYPEDO, /* i: same, but skip check to exit inflate on new block */
	26	STORED, /* i: waiting for stored size (length and complement) */
	27	COPY, /* i/o: waiting for input or output to copy stored block */
	28	TABLE, /* i: waiting for dynamic block table lengths */
	29	LENLENS, /* i: waiting for code length code lengths */
	30	CODELENS, /* i: waiting for length/lit and distance code lengths */
	31	LEN, /* i: waiting for length/lit code */
	32	LENEXT, /* i: waiting for length extra bits */
	33	DIST, /* i: waiting for distance code */
	34	DISTEXT, /* i: waiting for distance extra bits */
	35	MATCH, /* o: waiting for output space to copy string */
	36	LIT, /* o: waiting for output space to write literal */
	37	CHECK, /* i: waiting for 32-bit check value */
	38	LENGTH, /* i: waiting for 32-bit length (gzip) */
	39	DONE, /* finished check, done -- remain here until reset */
	40	BAD, /* got a data error -- remain here until reset */
	41	MEM, /* got an inflate() memory error -- remain here until reset */
	42	SYNC /* looking for synchronization bytes to restart inflate() */
	43	} inflate_mode;
	44
	45	/*
	46	State transitions between above modes -
	47
	48	(most modes can go to the BAD or MEM mode -- not shown for clarity)
	49
	50	Process header:
	51	HEAD -> (gzip) or (zlib)
	52	(gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME
	53	NAME -> COMMENT -> HCRC -> TYPE
	54	(zlib) -> DICTID or TYPE
	55	DICTID -> DICT -> TYPE
	56	Read deflate blocks:
	57	TYPE -> STORED or TABLE or LEN or CHECK
	58	STORED -> COPY -> TYPE
	59	TABLE -> LENLENS -> CODELENS -> LEN
	60	Read deflate codes:
	61	LEN -> LENEXT or LIT or TYPE
	62	LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
	63	LIT -> LEN
	64	Process trailer:
	65	CHECK -> LENGTH -> DONE
	66	*/
	67
	68	/* state maintained between inflate() calls. Approximately 7K bytes. */
	69	struct inflate_state {
	70	inflate_mode mode; /* current inflate mode */
	71	int last; /* true if processing last block */
	72	int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
	73	int havedict; /* true if dictionary provided */
	74	int flags; /* gzip header method and flags (0 if zlib) */
	75	unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */
	76	unsigned long check; /* protected copy of check value */
	77	unsigned long total; /* protected copy of output count */
	78	/* gz_headerp head; / / where to save gzip header information */
	79	/* sliding window */
	80	unsigned wbits; /* log base 2 of requested window size */
	81	unsigned wsize; /* window size or zero if not using window */
	82	unsigned whave; /* valid bytes in the window */
	83	unsigned write; /* window write index */
	84	unsigned char window; / allocated sliding window, if needed */
	85	/* bit accumulator */
	86	unsigned long hold; /* input bit accumulator */
	87	unsigned bits; /* number of bits in "in" */
	88	/* for string and stored block copying */
	89	unsigned length; /* literal or length of data to copy */
	90	unsigned offset; /* distance back to copy string from */
	91	/* for table and code decoding */
	92	unsigned extra; /* extra bits needed */
	93	/* fixed and dynamic code tables */
	94	code const lencode; / starting table for length/literal codes */
	95	code const distcode; / starting table for distance codes */
	96	unsigned lenbits; /* index bits for lencode */
	97	unsigned distbits; /* index bits for distcode */
	98	/* dynamic table building */
	99	unsigned ncode; /* number of code length code lengths */
	100	unsigned nlen; /* number of length code lengths */
	101	unsigned ndist; /* number of distance code lengths */
	102	unsigned have; /* number of code lengths in lens[] */
	103	code next; / next available space in codes[] */
	104	unsigned short lens[320]; /* temporary storage for code lengths */
	105	unsigned short work[288]; /* work area for code table building */
	106	code codes[ENOUGH]; /* space for code tables */
	107	};
	108

lib/zlib_inflate/inflate_syms.c

Diff comments View file @ 4f3865f

 /*
  * linux/lib/zlib_inflate/inflate_syms.c
  *
  * Exported symbols for the inflate functionality.
  *
  */
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/zlib.h>
 EXPORT_SYMBOL(zlib_inflate_workspacesize);
 EXPORT_SYMBOL(zlib_inflate);
-EXPORT_SYMBOL(zlib_inflateInit_);
+EXPORT_SYMBOL(zlib_inflateInit2);
-EXPORT_SYMBOL(zlib_inflateInit2_);
 EXPORT_SYMBOL(zlib_inflateEnd);
 EXPORT_SYMBOL(zlib_inflateReset);
 EXPORT_SYMBOL(zlib_inflateIncomp);
 MODULE_LICENSE("GPL");

lib/zlib_inflate/inflate_sync.c

View file @ 4f3865f

1	/* inflate.c -- zlib interface to inflate modules		File was deleted
2	* Copyright (C) 1995-1998 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include <linux/zutil.h>
7	#include "infblock.h"
8	#include "infutil.h"
9
10	#if 0
11	int zlib_inflateSync(
12	z_streamp z
13	)
14	{
15	uInt n; /* number of bytes to look at */
16	Byte p; / pointer to bytes */
17	uInt m; /* number of marker bytes found in a row */
18	uLong r, w; /* temporaries to save total_in and total_out */
19
20	/* set up */
21	if (z == NULL \|\| z->state == NULL)
22	return Z_STREAM_ERROR;
23	if (z->state->mode != I_BAD)
24	{
25	z->state->mode = I_BAD;
26	z->state->sub.marker = 0;
27	}
28	if ((n = z->avail_in) == 0)
29	return Z_BUF_ERROR;
30	p = z->next_in;
31	m = z->state->sub.marker;
32
33	/* search */
34	while (n && m < 4)
35	{
36	static const Byte mark[4] = {0, 0, 0xff, 0xff};
37	if (*p == mark[m])
38	m++;
39	else if (*p)
40	m = 0;
41	else
42	m = 4 - m;
43	p++, n--;
44	}
45
46	/* restore */
47	z->total_in += p - z->next_in;
48	z->next_in = p;
49	z->avail_in = n;
50	z->state->sub.marker = m;
51
52	/* return no joy or set up to restart on a new block */
53	if (m != 4)
54	return Z_DATA_ERROR;
55	r = z->total_in; w = z->total_out;
56	zlib_inflateReset(z);
57	z->total_in = r; z->total_out = w;
58	z->state->mode = BLOCKS;
59	return Z_OK;
60	}
61	#endif /* 0 */
62
63
64	/* Returns true if inflate is currently at the end of a block generated
65	* by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
66	* implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
67	* but removes the length bytes of the resulting empty stored block. When
68	* decompressing, PPP checks that at the end of input packet, inflate is
69	* waiting for these length bytes.
70	*/
71	#if 0
72	int zlib_inflateSyncPoint(
73	z_streamp z
74	)
75	{
76	if (z == NULL \|\| z->state == NULL \|\| z->state->blocks == NULL)
77	return Z_STREAM_ERROR;
78	return zlib_inflate_blocks_sync_point(z->state->blocks);
79	}
80	#endif /* 0 */
81
82	/*
83	* This subroutine adds the data at next_in/avail_in to the output history
84	* without performing any output. The output buffer must be "caught up";
85	* i.e. no pending output (hence s->read equals s->write), and the state must
86	* be BLOCKS (i.e. we should be willing to see the start of a series of
87	* BLOCKS). On exit, the output will also be caught up, and the checksum
88	* will have been updated if need be.
89	*/
90	static int zlib_inflate_addhistory(inflate_blocks_statef *s,
91	z_stream *z)
92	{
93	uLong b; /* bit buffer / / NOT USED HERE */
94	uInt k; /* bits in bit buffer / / NOT USED HERE */
95	uInt t; /* temporary storage */
96	Byte p; / input data pointer */
97	uInt n; /* bytes available there */
98	Byte q; / output window write pointer */
99	uInt m; /* bytes to end of window or read pointer */
100
101	if (s->read != s->write)
102	return Z_STREAM_ERROR;
103	if (s->mode != TYPE)
104	return Z_DATA_ERROR;
105
106	/* we're ready to rock */
107	LOAD
108	/* while there is input ready, copy to output buffer, moving
109	* pointers as needed.
110	*/
111	while (n) {
112	t = n; /* how many to do */
113	/* is there room until end of buffer? */
114	if (t > m) t = m;
115	/* update check information */
116	if (s->checkfn != NULL)
117	s->check = (*s->checkfn)(s->check, q, t);
118	memcpy(q, p, t);
119	q += t;
120	p += t;
121	n -= t;
122	z->total_out += t;
123	s->read = q; /* drag read pointer forward */
124	/* WWRAP / / expand WWRAP macro by hand to handle s->read */
125	if (q == s->end) {
126	s->read = q = s->window;
127	m = WAVAIL;
128	}
129	}
130	UPDATE
131	return Z_OK;
132	}
133
134
135	/*
136	* This subroutine adds the data at next_in/avail_in to the output history
137	* without performing any output. The output buffer must be "caught up";
138	* i.e. no pending output (hence s->read equals s->write), and the state must
139	* be BLOCKS (i.e. we should be willing to see the start of a series of
140	* BLOCKS). On exit, the output will also be caught up, and the checksum
141	* will have been updated if need be.
142	*/
143
144	int zlib_inflateIncomp(
145	z_stream *z
146
147	)
148	{
149	if (z->state->mode != BLOCKS)
150	return Z_DATA_ERROR;
151	return zlib_inflate_addhistory(z->state->blocks, z);
152	}
153		1	/* inflate.c -- zlib interface to inflate modules

lib/zlib_inflate/inftrees.c

Diff comments View file @ 4f3865f

1	/* inftrees.c -- generate Huffman trees for efficient decoding	1	/* inftrees.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-1998 Mark Adler	2	* Copyright (C) 1995-2005 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/	4	*/
5		5
6	#include <linux/zutil.h>	6	#include <linux/zutil.h>
7	#include "inftrees.h"	7	#include "inftrees.h"
8	#include "infutil.h"
9		8
10	static const char inflate_copyright[] __attribute_used__ =	9	#define MAXBITS 15
11	" inflate 1.1.3 Copyright 1995-1998 Mark Adler ";	10
		11	const char inflate_copyright[] =
		12	" inflate 1.2.3 Copyright 1995-2005 Mark Adler ";
12	/*	13	/*
13	If you use the zlib library in a product, an acknowledgment is welcome	14	If you use the zlib library in a product, an acknowledgment is welcome
14	in the documentation of your product. If for some reason you cannot	15	in the documentation of your product. If for some reason you cannot
15	include such an acknowledgment, I would appreciate that you keep this	16	include such an acknowledgment, I would appreciate that you keep this
16	copyright string in the executable of your product.	17	copyright string in the executable of your product.
17	*/	18	*/
18	struct internal_state;
19		19
20	/* simplify the use of the inflate_huft type with some defines */	20	/*
21	#define exop word.what.Exop	21	Build a set of tables to decode the provided canonical Huffman code.
22	#define bits word.what.Bits	22	The code lengths are lens[0..codes-1]. The result starts at *table,
23		23	whose indices are 0..2^bits-1. work is a writable array of at least
24		24	lens shorts, which is used as a work area. type is the type of code
25	static int huft_build (	25	to be generated, CODES, LENS, or DISTS. On return, zero is success,
26	uInt , / code lengths in bits */	26	-1 is an invalid code, and +1 means that ENOUGH isn't enough. table
27	uInt, /* number of codes */	27	on return points to the next available entry's address. bits is the
28	uInt, /* number of "simple" codes */	28	requested root table index bits, and on return it is the actual root
29	const uInt , / list of base values for non-simple codes */	29	table index bits. It will differ if the request is greater than the
30	const uInt , / list of extra bits for non-simple codes */	30	longest code or if it is less than the shortest code.
31	inflate_huft *, / result: starting table */	31	*/
32	uInt , / maximum lookup bits (returns actual) */	32	int zlib_inflate_table(type, lens, codes, table, bits, work)
33	inflate_huft , / space for trees */	33	codetype type;
34	uInt , / hufts used in space */	34	unsigned short *lens;
35	uInt * ); /* space for values */	35	unsigned codes;
36		36	code **table;
37	/* Tables for deflate from PKZIP's appnote.txt. */	37	unsigned *bits;
38	static const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */	38	unsigned short *work;
		39	{
		40	unsigned len; /* a code's length in bits */
		41	unsigned sym; /* index of code symbols */
		42	unsigned min, max; /* minimum and maximum code lengths */
		43	unsigned root; /* number of index bits for root table */
		44	unsigned curr; /* number of index bits for current table */
		45	unsigned drop; /* code bits to drop for sub-table */
		46	int left; /* number of prefix codes available */
		47	unsigned used; /* code entries in table used */
		48	unsigned huff; /* Huffman code */
		49	unsigned incr; /* for incrementing code, index */
		50	unsigned fill; /* index for replicating entries */
		51	unsigned low; /* low bits for current root entry */
		52	unsigned mask; /* mask for low root bits */
		53	code this; /* table entry for duplication */
		54	code next; / next available space in table */
		55	const unsigned short base; / base value table to use */
		56	const unsigned short extra; / extra bits table to use */
		57	int end; /* use base and extra for symbol > end */
		58	unsigned short count[MAXBITS+1]; /* number of codes of each length */
		59	unsigned short offs[MAXBITS+1]; /* offsets in table for each length */
		60	static const unsigned short lbase[31] = { /* Length codes 257..285 base */
39	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,	61	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
40	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};	62	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
41	/* see note #13 above about 258 */	63	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
42	static const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */	64	16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
43	0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,	65	19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 201, 196};
44	3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */	66	static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
45	static const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
46	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,	67	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
47	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,	68	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
48	8193, 12289, 16385, 24577};	69	8193, 12289, 16385, 24577, 0, 0};
49	static const uInt cpdext[30] = { /* Extra bits for distance codes */	70	static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
50	0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,	71	16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
51	7, 7, 8, 8, 9, 9, 10, 10, 11, 11,	72	23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
52	12, 12, 13, 13};	73	28, 28, 29, 29, 64, 64};
53		74
54	/*	75	/*
55	Huffman code decoding is performed using a multi-level table lookup.	76	Process a set of code lengths to create a canonical Huffman code. The
56	The fastest way to decode is to simply build a lookup table whose	77	code lengths are lens[0..codes-1]. Each length corresponds to the
57	size is determined by the longest code. However, the time it takes	78	symbols 0..codes-1. The Huffman code is generated by first sorting the
58	to build this table can also be a factor if the data being decoded	79	symbols by length from short to long, and retaining the symbol order
59	is not very long. The most common codes are necessarily the	80	for codes with equal lengths. Then the code starts with all zero bits
60	shortest codes, so those codes dominate the decoding time, and hence	81	for the first code of the shortest length, and the codes are integer
61	the speed. The idea is you can have a shorter table that decodes the	82	increments for the same length, and zeros are appended as the length
62	shorter, more probable codes, and then point to subsidiary tables for	83	increases. For the deflate format, these bits are stored backwards
63	the longer codes. The time it costs to decode the longer codes is	84	from their more natural integer increment ordering, and so when the
64	then traded against the time it takes to make longer tables.	85	decoding tables are built in the large loop below, the integer codes
		86	are incremented backwards.
65		87
66	This results of this trade are in the variables lbits and dbits	88	This routine assumes, but does not check, that all of the entries in
67	below. lbits is the number of bits the first level table for literal/	89	lens[] are in the range 0..MAXBITS. The caller must assure this.
68	length codes can decode in one step, and dbits is the same thing for	90	1..MAXBITS is interpreted as that code length. zero means that that
69	the distance codes. Subsequent tables are also less than or equal to	91	symbol does not occur in this code.
70	those sizes. These values may be adjusted either when all of the
71	codes are shorter than that, in which case the longest code length in
72	bits is used, or when the shortest code is longer than the requested
73	table size, in which case the length of the shortest code in bits is
74	used.
75		92
76	There are two different values for the two tables, since they code a	93	The codes are sorted by computing a count of codes for each length,
77	different number of possibilities each. The literal/length table	94	creating from that a table of starting indices for each length in the
78	codes 286 possible values, or in a flat code, a little over eight	95	sorted table, and then entering the symbols in order in the sorted
79	bits. The distance table codes 30 possible values, or a little less	96	table. The sorted table is work[], with that space being provided by
80	than five bits, flat. The optimum values for speed end up being	97	the caller.
81	about one bit more than those, so lbits is 8+1 and dbits is 5+1.
82	The optimum values may differ though from machine to machine, and
83	possibly even between compilers. Your mileage may vary.
84	*/
85		98
		99	The length counts are used for other purposes as well, i.e. finding
		100	the minimum and maximum length codes, determining if there are any
		101	codes at all, checking for a valid set of lengths, and looking ahead
		102	at length counts to determine sub-table sizes when building the
		103	decoding tables.
		104	*/
86		105
87	/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */	106	/* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
88	#define BMAX 15 /* maximum bit length of any code */	107	for (len = 0; len <= MAXBITS; len++)
		108	count[len] = 0;
		109	for (sym = 0; sym < codes; sym++)
		110	count[lens[sym]]++;
89		111
90	static int huft_build(	112	/* bound code lengths, force root to be within code lengths */
91	uInt b, / code lengths in bits (all assumed <= BMAX) */	113	root = *bits;
92	uInt n, /* number of codes (assumed <= 288) */	114	for (max = MAXBITS; max >= 1; max--)
93	uInt s, /* number of simple-valued codes (0..s-1) */	115	if (count[max] != 0) break;
94	const uInt d, / list of base values for non-simple codes */	116	if (root > max) root = max;
95	const uInt e, / list of extra bits for non-simple codes */	117	if (max == 0) { /* no symbols to code at all */
96	inflate_huft *t, / result: starting table */	118	this.op = (unsigned char)64; /* invalid code marker */
97	uInt m, / maximum lookup bits, returns actual */	119	this.bits = (unsigned char)1;
98	inflate_huft hp, / space for trees */	120	this.val = (unsigned short)0;
99	uInt hn, / hufts used in space */	121	(table)++ = this; /* make a table to force an error */
100	uInt v / working area: values in order of bit length */	122	(table)++ = this;
101	)	123	*bits = 1;
102	/* Given a list of code lengths and a maximum table size, make a set of	124	return 0; /* no symbols, but wait for decoding to report error */
103	tables to decode that set of codes. Return Z_OK on success, Z_BUF_ERROR	125	}
104	if the given code set is incomplete (the tables are still built in this	126	for (min = 1; min <= MAXBITS; min++)
105	case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of	127	if (count[min] != 0) break;
106	lengths), or Z_MEM_ERROR if not enough memory. */	128	if (root < min) root = min;
107	{
108		129
109	uInt a; /* counter for codes of length k */	130	/* check for an over-subscribed or incomplete set of lengths */
110	uInt c[BMAX+1]; /* bit length count table */	131	left = 1;
111	uInt f; /* i repeats in table every f entries */	132	for (len = 1; len <= MAXBITS; len++) {
112	int g; /* maximum code length */	133	left <<= 1;
113	int h; /* table level */	134	left -= count[len];
114	register uInt i; /* counter, current code */	135	if (left < 0) return -1; /* over-subscribed */
115	register uInt j; /* counter */	136	}
116	register int k; /* number of bits in current code */	137	if (left > 0 && (type == CODES \|\| max != 1))
117	int l; /* bits per table (returned in m) */	138	return -1; /* incomplete set */
118	uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */
119	register uInt p; / pointer into c[], b[], or v[] */
120	inflate_huft q; / points to current table */
121	struct inflate_huft_s r; /* table entry for structure assignment */
122	inflate_huft u[BMAX]; / table stack */
123	register int w; /* bits before this table == (l * h) */
124	uInt x[BMAX+1]; /* bit offsets, then code stack */
125	uInt xp; / pointer into x */
126	int y; /* number of dummy codes added */
127	uInt z; /* number of entries in current table */
128		139
		140	/* generate offsets into symbol table for each length for sorting */
		141	offs[1] = 0;
		142	for (len = 1; len < MAXBITS; len++)
		143	offs[len + 1] = offs[len] + count[len];
129		144
130	/* Generate counts for each bit length */	145	/* sort symbols by length, by symbol order within each length */
131	p = c;	146	for (sym = 0; sym < codes; sym++)
132	#define C0 *p++ = 0;	147	if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
133	#define C2 C0 C0 C0 C0
134	#define C4 C2 C2 C2 C2
135	C4 /* clear c[]--assume BMAX+1 is 16 */
136	p = b; i = n;
137	do {
138	c[p++]++; / assume all entries <= BMAX */
139	} while (--i);
140	if (c[0] == n) /* null input--all zero length codes */
141	{
142	*t = NULL;
143	*m = 0;
144	return Z_OK;
145	}
146		148
		149	/*
		150	Create and fill in decoding tables. In this loop, the table being
		151	filled is at next and has curr index bits. The code being used is huff
		152	with length len. That code is converted to an index by dropping drop
		153	bits off of the bottom. For codes where len is less than drop + curr,
		154	those top drop + curr - len bits are incremented through all values to
		155	fill the table with replicated entries.
147		156
148	/* Find minimum and maximum length, bound m by those /	157	root is the number of index bits for the root table. When len exceeds
149	l = *m;	158	root, sub-tables are created pointed to by the root entry with an index
150	for (j = 1; j <= BMAX; j++)	159	of the low root bits of huff. This is saved in low to check for when a
151	if (c[j])	160	new sub-table should be started. drop is zero when the root table is
152	break;	161	being filled, and drop is root when sub-tables are being filled.
153	k = j; /* minimum code length */
154	if ((uInt)l < j)
155	l = j;
156	for (i = BMAX; i; i--)
157	if (c[i])
158	break;
159	g = i; /* maximum code length */
160	if ((uInt)l > i)
161	l = i;
162	*m = l;
163		162
		163	When a new sub-table is needed, it is necessary to look ahead in the
		164	code lengths to determine what size sub-table is needed. The length
		165	counts are used for this, and so count[] is decremented as codes are
		166	entered in the tables.
164		167
165	/* Adjust last length count to fill out codes, if needed */	168	used keeps track of how many table entries have been allocated from the
166	for (y = 1 << j; j < i; j++, y <<= 1)	169	provided *table space. It is checked when a LENS table is being made
167	if ((y -= c[j]) < 0)	170	against the space in *table, ENOUGH, minus the maximum space needed by
168	return Z_DATA_ERROR;	171	the worst case distance code, MAXD. This should never happen, but the
169	if ((y -= c[i]) < 0)	172	sufficiency of ENOUGH has not been proven exhaustively, hence the check.
170	return Z_DATA_ERROR;	173	This assumes that when type == LENS, bits == 9.
171	c[i] += y;
172		174
		175	sym increments through all symbols, and the loop terminates when
		176	all codes of length max, i.e. all codes, have been processed. This
		177	routine permits incomplete codes, so another loop after this one fills
		178	in the rest of the decoding tables with invalid code markers.
		179	*/
173		180
174	/* Generate starting offsets into the value table for each length */	181	/* set up for code type */
175	x[1] = j = 0;	182	switch (type) {
176	p = c + 1; xp = x + 2;	183	case CODES:
177	while (--i) { /* note that i == g from above */	184	base = extra = work; /* dummy value--not used */
178	xp++ = (j += p++);	185	end = 19;
179	}	186	break;
		187	case LENS:
		188	base = lbase;
		189	base -= 257;
		190	extra = lext;
		191	extra -= 257;
		192	end = 256;
		193	break;
		194	default: /* DISTS */
		195	base = dbase;
		196	extra = dext;
		197	end = -1;
		198	}
180		199
		200	/* initialize state for loop */
		201	huff = 0; /* starting code */
		202	sym = 0; /* starting code symbol */
		203	len = min; /* starting code length */
		204	next = table; / current table to fill in */
		205	curr = root; /* current table index bits */
		206	drop = 0; /* current bits to drop from code for index */
		207	low = (unsigned)(-1); /* trigger new sub-table when len > root */
		208	used = 1U << root; /* use root table entries */
		209	mask = used - 1; /* mask for comparing low */
181		210
182	/* Make a table of values in order of bit lengths */	211	/* check available table space */
183	p = b; i = 0;	212	if (type == LENS && used >= ENOUGH - MAXD)
184	do {	213	return 1;
185	if ((j = *p++) != 0)
186	v[x[j]++] = i;
187	} while (++i < n);
188	n = x[g]; /* set n to length of v */
189		214
190		215	/* process all codes and make table entries */
191	/* Generate the Huffman codes and for each, make the table entries */	216	for (;;) {
192	x[0] = i = 0; /* first Huffman code is zero */	217	/* create table entry */
193	p = v; /* grab values in bit order */	218	this.bits = (unsigned char)(len - drop);
194	h = -1; /* no tables yet--level -1 */	219	if ((int)(work[sym]) < end) {
195	w = -l; /* bits decoded == (l * h) */	220	this.op = (unsigned char)0;
196	u[0] = NULL; /* just to keep compilers happy */	221	this.val = work[sym];
197	q = NULL; /* ditto */
198	z = 0; /* ditto */
199
200	/* go through the bit lengths (k already is bits in shortest code) */
201	for (; k <= g; k++)
202	{
203	a = c[k];
204	while (a--)
205	{
206	/* here i is the Huffman code of length k bits for value p /
207	/* make tables up to required level */
208	while (k > w + l)
209	{
210	h++;
211	w += l; /* previous table always l bits */
212
213	/* compute minimum size table less than or equal to l bits */
214	z = g - w;
215	z = z > (uInt)l ? l : z; /* table size upper limit */
216	if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */
217	{ /* too few codes for k-w bit table */
218	f -= a + 1; /* deduct codes from patterns left */
219	xp = c + k;
220	if (j < z)
221	while (++j < z) /* try smaller tables up to z bits */
222	{
223	if ((f <<= 1) <= *++xp)
224	break; /* enough codes to use up j bits */
225	f -= xp; / else deduct codes from patterns */
226	}
227	}	222	}
228	z = 1 << j; /* table entries for j-bit table */	223	else if ((int)(work[sym]) > end) {
		224	this.op = (unsigned char)(extra[work[sym]]);
		225	this.val = base[work[sym]];
		226	}
		227	else {
		228	this.op = (unsigned char)(32 + 64); /* end of block */
		229	this.val = 0;
		230	}
229		231
230	/* allocate new table */	232	/* replicate for those indices with low len bits equal to huff */
231	if (hn + z > MANY) / (note: doesn't matter for fixed) */	233	incr = 1U << (len - drop);
232	return Z_DATA_ERROR; /* overflow of MANY */	234	fill = 1U << curr;
233	u[h] = q = hp + *hn;	235	min = fill; /* save offset to next table */
234	*hn += z;	236	do {
		237	fill -= incr;
		238	next[(huff >> drop) + fill] = this;
		239	} while (fill != 0);
235		240
236	/* connect to last table, if there is one */	241	/* backwards increment the len-bit code huff */
237	if (h)	242	incr = 1U << (len - 1);
238	{	243	while (huff & incr)
239	x[h] = i; /* save pattern for backing up */	244	incr >>= 1;
240	r.bits = (Byte)l; /* bits to dump before this table */	245	if (incr != 0) {
241	r.exop = (Byte)j; /* bits in this table */	246	huff &= incr - 1;
242	j = i >> (w - l);	247	huff += incr;
243	r.base = (uInt)(q - u[h-1] - j); /* offset to this table */
244	u[h-1][j] = r; /* connect to last table */
245	}	248	}
246	else	249	else
247	t = q; / first table is returned result */	250	huff = 0;
248	}
249		251
250	/* set up table entry in r */	252	/* go to next symbol, update count, len */
251	r.bits = (Byte)(k - w);	253	sym++;
252	if (p >= v + n)	254	if (--(count[len]) == 0) {
253	r.exop = 128 + 64; /* out of values--invalid code */	255	if (len == max) break;
254	else if (*p < s)	256	len = lens[work[sym]];
255	{	257	}
256	r.exop = (Byte)(p < 256 ? 0 : 32 + 64); / 256 is end-of-block */
257	r.base = p++; / simple code is just the value */
258	}
259	else
260	{
261	r.exop = (Byte)(e[p - s] + 16 + 64);/ non-simple--look up in lists */
262	r.base = d[*p++ - s];
263	}
264		258
265	/* fill code-like entries with r */	259	/* create new sub-table if needed */
266	f = 1 << (k - w);	260	if (len > root && (huff & mask) != low) {
267	for (j = i >> w; j < z; j += f)	261	/* if first time, transition to sub-tables */
268	q[j] = r;	262	if (drop == 0)
		263	drop = root;
269		264
270	/* backwards increment the k-bit code i */	265	/* increment past last table */
271	for (j = 1 << (k - 1); i & j; j >>= 1)	266	next += min; /* here min is 1 << curr */
272	i ^= j;
273	i ^= j;
274		267
275	/* backup over finished tables */	268	/* determine length of next table */
276	mask = (1 << w) - 1; /* needed on HP, cc -O bug */	269	curr = len - drop;
277	while ((i & mask) != x[h])	270	left = (int)(1 << curr);
278	{	271	while (curr + drop < max) {
279	h--; /* don't need to update q */	272	left -= count[curr + drop];
280	w -= l;	273	if (left <= 0) break;
281	mask = (1 << w) - 1;	274	curr++;
282	}	275	left <<= 1;
283	}	276	}
284	}
285		277
		278	/* check for enough space */
		279	used += 1U << curr;
		280	if (type == LENS && used >= ENOUGH - MAXD)
		281	return 1;
286		282
287	/* Return Z_BUF_ERROR if we were given an incomplete table */	283	/* point entry in root table to sub-table */
288	return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;	284	low = huff & mask;
289	}	285	(*table)[low].op = (unsigned char)curr;
		286	(*table)[low].bits = (unsigned char)root;
		287	(table)[low].val = (unsigned short)(next - table);
		288	}
		289	}
290		290
		291	/*
		292	Fill in rest of table for incomplete codes. This loop is similar to the
		293	loop above in incrementing huff for table indices. It is assumed that
		294	len is equal to curr + drop, so there is no loop needed to increment
		295	through high index bits. When the current sub-table is filled, the loop
		296	drops back to the root table to fill in any remaining entries there.
		297	*/
		298	this.op = (unsigned char)64; /* invalid code marker */
		299	this.bits = (unsigned char)(len - drop);
		300	this.val = (unsigned short)0;
		301	while (huff != 0) {
		302	/* when done with sub-table, drop back to root table */
		303	if (drop != 0 && (huff & mask) != low) {
		304	drop = 0;
		305	len = root;
		306	next = *table;
		307	this.bits = (unsigned char)len;
		308	}
291		309
292	int zlib_inflate_trees_bits(	310	/* put invalid code marker in table */
293	uInt c, / 19 code lengths */	311	next[huff >> drop] = this;
294	uInt bb, / bits tree desired/actual depth */
295	inflate_huft *tb, / bits tree result */
296	inflate_huft hp, / space for trees */
297	z_streamp z /* for messages */
298	)
299	{
300	int r;

lib/zlib_inflate/inftrees.h

Diff comments View file @ 4f3865f

 /* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-1998 Mark Adler
+ * Copyright (C) 1995-2005 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 /* WARNING: this file should *not* be used by applications. It is
    part of the implementation of the compression library and is
    subject to change. Applications should only use zlib.h.
  */
-/* Huffman code lookup table entry--this entry is four bytes for machines
+/* Structure for decoding tables.  Each entry provides either the
-   that have 16-bit pointers (e.g. PC's in the small or medium model). */
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
-#ifndef _INFTREES_H
+/* op values as set by inflate_table():
-#define _INFTREES_H
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
-typedef struct inflate_huft_s inflate_huft;
-struct inflate_huft_s {
-  union {
-    struct {
-      Byte Exop;        /* number of extra bits or operation */
-      Byte Bits;        /* number of bits in this code or subcode */
-    } what;
-    uInt pad;           /* pad structure to a power of 2 (4 bytes for */
-  } word;               /*  16-bit, 8 bytes for 32-bit int's) */
-  uInt base;            /* literal, length base, distance base,
-                           or table offset */
-};
 /* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 huft structures (850 for length/literals
+   exhaustive search was 1444 code structures (852 for length/literals
-   and 154 for distances, the latter actually the result of an
+   and 592 for distances, the latter actually the result of an
-   exhaustive search).  The actual maximum is not known, but the
+   exhaustive search).  The true maximum is not known, but the value
-   value below is more than safe. */
+   below is more than safe. */
-#define MANY 1440
+#define ENOUGH 2048
+#define MAXD 592
-extern int zlib_inflate_trees_bits (
+/* Type of code to build for inftable() */
-    uInt *,                     /* 19 code lengths */
+typedef enum {
-    uInt *,                     /* bits tree desired/actual depth */
+    CODES,
-    inflate_huft **,            /* bits tree result */
+    LENS,
-    inflate_huft *,             /* space for trees */
+    DISTS
-    z_streamp);                 /* for messages */
+} codetype;

lib/zlib_inflate/infutil.c

View file @ 4f3865f

1	/* inflate_util.c -- data and routines common to blocks and codes		File was deleted
2	* Copyright (C) 1995-1998 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include <linux/zutil.h>
7	#include "infblock.h"
8	#include "inftrees.h"
9	#include "infcodes.h"
10	#include "infutil.h"
11
12	struct inflate_codes_state;
13
14	/* And'ing with mask[n] masks the lower n bits */
15	uInt zlib_inflate_mask[17] = {
16	0x0000,
17	0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
18	0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
19	};
20
21
22	/* copy as much as possible from the sliding window to the output area */
23	int zlib_inflate_flush(
24	inflate_blocks_statef *s,
25	z_streamp z,
26	int r
27	)
28	{
29	uInt n;
30	Byte *p;
31	Byte *q;
32
33	/* local copies of source and destination pointers */
34	p = z->next_out;
35	q = s->read;
36
37	/* compute number of bytes to copy as far as end of window */
38	n = (uInt)((q <= s->write ? s->write : s->end) - q);
39	if (n > z->avail_out) n = z->avail_out;
40	if (n && r == Z_BUF_ERROR) r = Z_OK;
41
42	/* update counters */
43	z->avail_out -= n;
44	z->total_out += n;
45
46	/* update check information */
47	if (s->checkfn != NULL)
48	z->adler = s->check = (*s->checkfn)(s->check, q, n);
49
50	/* copy as far as end of window */
51	memcpy(p, q, n);
52	p += n;
53	q += n;
54
55	/* see if more to copy at beginning of window */
56	if (q == s->end)
57	{
58	/* wrap pointers */
59	q = s->window;
60	if (s->write == s->end)
61	s->write = s->window;
62
63	/* compute bytes to copy */
64	n = (uInt)(s->write - q);
65	if (n > z->avail_out) n = z->avail_out;
66	if (n && r == Z_BUF_ERROR) r = Z_OK;
67
68	/* update counters */
69	z->avail_out -= n;
70	z->total_out += n;
71
72	/* update check information */
73	if (s->checkfn != NULL)
74	z->adler = s->check = (*s->checkfn)(s->check, q, n);
75
76	/* copy */
77	memcpy(p, q, n);
78	p += n;
79	q += n;
80	}
81
82	/* update pointers */
83	z->next_out = p;
84	s->read = q;
85
86	/* done */
87	return r;
88	}
89		1	/* inflate_util.c -- data and routines common to blocks and codes

lib/zlib_inflate/infutil.h

Diff comments View file @ 4f3865f

1	/* infutil.h -- types and macros common to blocks and codes	1	/* infutil.h -- types and macros common to blocks and codes
2	* Copyright (C) 1995-1998 Mark Adler	2	* Copyright (C) 1995-1998 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/	4	*/
5		5
6	/* WARNING: this file should not be used by applications. It is	6	/* WARNING: this file should not be used by applications. It is
7	part of the implementation of the compression library and is	7	part of the implementation of the compression library and is
8	subject to change. Applications should only use zlib.h.	8	subject to change. Applications should only use zlib.h.
9	*/	9	*/
10		10
11	#ifndef _INFUTIL_H	11	#ifndef _INFUTIL_H
12	#define _INFUTIL_H	12	#define _INFUTIL_H
13		13
14	#include <linux/zconf.h>	14	#include <linux/zlib.h>
15	#include "inftrees.h"
16	#include "infcodes.h"
17		15
18	typedef enum {
19	TYPE, /* get type bits (3, including end bit) */
20	LENS, /* get lengths for stored */
21	STORED, /* processing stored block */
22	TABLE, /* get table lengths */
23	BTREE, /* get bit lengths tree for a dynamic block */
24	DTREE, /* get length, distance trees for a dynamic block */
25	CODES, /* processing fixed or dynamic block */
26	DRY, /* output remaining window bytes */
27	B_DONE, /* finished last block, done */
28	B_BAD} /* got a data error--stuck here */
29	inflate_block_mode;
30
31	/* inflate blocks semi-private state */
32	struct inflate_blocks_state {
33
34	/* mode */
35	inflate_block_mode mode; /* current inflate_block mode */
36
37	/* mode dependent information */
38	union {
39	uInt left; /* if STORED, bytes left to copy */
40	struct {
41	uInt table; /* table lengths (14 bits) */
42	uInt index; /* index into blens (or border) */
43	uInt blens; / bit lengths of codes */
44	uInt bb; /* bit length tree depth */
45	inflate_huft tb; / bit length decoding tree */
46	} trees; /* if DTREE, decoding info for trees */
47	struct {
48	inflate_codes_statef
49	*codes;
50	} decode; /* if CODES, current state */
51	} sub; /* submode */
52	uInt last; /* true if this block is the last block */
53
54	/* mode independent information */
55	uInt bitk; /* bits in bit buffer */
56	uLong bitb; /* bit buffer */
57	inflate_huft hufts; / single malloc for tree space */
58	Byte window; / sliding window */
59	Byte end; / one byte after sliding window */
60	Byte read; / window read pointer */
61	Byte write; / window write pointer */
62	check_func checkfn; /* check function */
63	uLong check; /* check on output */
64
65	};
66
67
68	/* defines for inflate input/output */
69	/* update pointers and return */
70	#define UPDBITS {s->bitb=b;s->bitk=k;}
71	#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;}
72	#define UPDOUT {s->write=q;}
73	#define UPDATE {UPDBITS UPDIN UPDOUT}
74	#define LEAVE {UPDATE return zlib_inflate_flush(s,z,r);}
75	/* get bytes and bits */
76	#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;}
77	#define NEEDBYTE {if(n)r=Z_OK;else LEAVE}
78	#define NEXTBYTE (n--,*p++)
79	#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b\|=((uLong)NEXTBYTE)<<k;k+=8;}}
80	#define DUMPBITS(j) {b>>=(j);k-=(j);}
81	/* output bytes */
82	#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
83	#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
84	#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
85	#define FLUSH {UPDOUT r=zlib_inflate_flush(s,z,r); LOADOUT}
86	#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
87	#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
88	/* load local pointers */
89	#define LOAD {LOADIN LOADOUT}
90
91	/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
92	extern uInt zlib_inflate_mask[17];
93
94	/* copy as much as possible from the sliding window to the output area */
95	extern int zlib_inflate_flush (
96	inflate_blocks_statef *,
97	z_streamp ,
98	int);
99
100	/* inflate private state */
101	typedef enum {
102	METHOD, /* waiting for method byte */
103	FLAG, /* waiting for flag byte */
104	DICT4, /* four dictionary check bytes to go */
105	DICT3, /* three dictionary check bytes to go */
106	DICT2, /* two dictionary check bytes to go */
107	DICT1, /* one dictionary check byte to go */
108	DICT0, /* waiting for inflateSetDictionary */
109	BLOCKS, /* decompressing blocks */
110	CHECK4, /* four check bytes to go */
111	CHECK3, /* three check bytes to go */
112	CHECK2, /* two check bytes to go */
113	CHECK1, /* one check byte to go */
114	I_DONE, /* finished check, done */
115	I_BAD} /* got an error--stay here */
116	inflate_mode;
117
118	struct internal_state {
119
120	/* mode */
121	inflate_mode mode; /* current inflate mode */
122
123	/* mode dependent information */
124	union {
125	uInt method; /* if FLAGS, method byte */
126	struct {
127	uLong was; /* computed check value */
128	uLong need; /* stream check value */
129	} check; /* if CHECK, check values to compare */
130	uInt marker; /* if BAD, inflateSync's marker bytes count */
131	} sub; /* submode */
132
133	/* mode independent information */
134	int nowrap; /* flag for no wrapper */
135	uInt wbits; /* log2(window size) (8..15, defaults to 15) */
136	inflate_blocks_statef
137	blocks; / current inflate_blocks state */
138
139	};
140
141	/* inflate codes private state */
142	typedef enum { /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
143	START, /* x: set up for LEN */
144	LEN, /* i: get length/literal/eob next */
145	LENEXT, /* i: getting length extra (have base) */
146	DIST, /* i: get distance next */
147	DISTEXT, /* i: getting distance extra */
148	COPY, /* o: copying bytes in window, waiting for space */
149	LIT, /* o: got literal, waiting for output space */
150	WASH, /* o: got eob, possibly still output waiting */
151	END, /* x: got eob and all data flushed */
152	BADCODE} /* x: got error */
153	inflate_codes_mode;
154
155	struct inflate_codes_state {
156
157	/* mode */
158	inflate_codes_mode mode; /* current inflate_codes mode */
159
160	/* mode dependent information */
161	uInt len;
162	union {
163	struct {
164	inflate_huft tree; / pointer into tree */
165	uInt need; /* bits needed */
166	} code; /* if LEN or DIST, where in tree */
167	uInt lit; /* if LIT, literal */
168	struct {
169	uInt get; /* bits to get for extra */
170	uInt dist; /* distance back to copy from */
171	} copy; /* if EXT or COPY, where and how much */
172	} sub; /* submode */
173
174	/* mode independent information */
175	Byte lbits; /* ltree bits decoded per branch */
176	Byte dbits; /* dtree bits decoder per branch */
177	inflate_huft ltree; / literal/length/eob tree */
178	inflate_huft dtree; / distance tree */
179
180	};
181
182	/* memory allocation for inflation */	16	/* memory allocation for inflation */
183		17
184	struct inflate_workspace {	18	struct inflate_workspace {
185	inflate_codes_statef working_state;	19	struct inflate_state inflate_state;
186	struct inflate_blocks_state working_blocks_state;
187	struct internal_state internal_state;
188	unsigned int tree_work_area_1[19];
189	unsigned int tree_work_area_2[288];
190	unsigned working_blens[258 + 0x1f + 0x1f];
191	inflate_huft working_hufts[MANY];
192	unsigned char working_window[1 << MAX_WBITS];	20	unsigned char working_window[1 << MAX_WBITS];
193	};	21	};
194		22
195	#define WS(z) ((struct inflate_workspace *)(z->workspace))	23	#define WS(z) ((struct inflate_workspace *)(z->workspace))
196		24
197	#endif	25	#endif
198		26

1	# Makefile for making ELF bootable images for booting on CHRP	1	# Makefile for making ELF bootable images for booting on CHRP
2	# using Open Firmware.	2	# using Open Firmware.
3	#	3	#
4	# Geert Uytterhoeven September 1997	4	# Geert Uytterhoeven September 1997
5	#	5	#
6	# Based on coffboot by Paul Mackerras	6	# Based on coffboot by Paul Mackerras
7	# Simplified for ppc64 by Todd Inglett	7	# Simplified for ppc64 by Todd Inglett
8	#	8	#
9	# NOTE: this code is built for 32 bit in ELF32 format even though	9	# NOTE: this code is built for 32 bit in ELF32 format even though
10	# it packages a 64 bit kernel. We do this to simplify the	10	# it packages a 64 bit kernel. We do this to simplify the
11	# bootloader and increase compatibility with OpenFirmware.	11	# bootloader and increase compatibility with OpenFirmware.
12	#	12	#
13	# To this end we need to define BOOTCC, etc, as the tools	13	# To this end we need to define BOOTCC, etc, as the tools
14	# needed to build the 32 bit image. These are normally HOSTCC,	14	# needed to build the 32 bit image. These are normally HOSTCC,
15	# but may be a third compiler if, for example, you are cross	15	# but may be a third compiler if, for example, you are cross
16	# compiling from an intel box. Once the 64bit ppc gcc is	16	# compiling from an intel box. Once the 64bit ppc gcc is
17	# stable it will probably simply be a compiler switch to	17	# stable it will probably simply be a compiler switch to
18	# compile for 32bit mode.	18	# compile for 32bit mode.
19	# To make it easier to setup a cross compiler,	19	# To make it easier to setup a cross compiler,
20	# CROSS32_COMPILE is setup as a prefix just like CROSS_COMPILE	20	# CROSS32_COMPILE is setup as a prefix just like CROSS_COMPILE
21	# in the toplevel makefile.	21	# in the toplevel makefile.
22		22
23		23
24	HOSTCC := gcc	24	HOSTCC := gcc
25	BOOTCFLAGS := $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem \	25	BOOTCFLAGS := $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem \
26	$(shell $(CROSS32CC) -print-file-name=include) -fPIC	26	$(shell $(CROSS32CC) -print-file-name=include) -fPIC
27	BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc	27	BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
28	OBJCOPYFLAGS := contents,alloc,load,readonly,data	28	OBJCOPYFLAGS := contents,alloc,load,readonly,data
29	OBJCOPY_COFF_ARGS := -O aixcoff-rs6000 --set-start 0x500000	29	OBJCOPY_COFF_ARGS := -O aixcoff-rs6000 --set-start 0x500000
30	OBJCOPY_MIB_ARGS := -O aixcoff-rs6000 -R .stab -R .stabstr -R .comment	30	OBJCOPY_MIB_ARGS := -O aixcoff-rs6000 -R .stab -R .stabstr -R .comment
31		31
32	zlib := infblock.c infcodes.c inffast.c inflate.c inftrees.c infutil.c	32	zlib := inffast.c inflate.c inftrees.c
33	zlibheader := infblock.h infcodes.h inffast.h inftrees.h infutil.h	33	zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
34	zliblinuxheader := zlib.h zconf.h zutil.h	34	zliblinuxheader := zlib.h zconf.h zutil.h
35		35
36	$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))	36	$(addprefix $(obj)/,$(zlib) main.o): $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
37	#$(addprefix $(obj)/,main.o): $(addprefix $(obj)/,zlib.h)	37	#$(addprefix $(obj)/,main.o): $(addprefix $(obj)/,zlib.h)
38		38
39	src-boot := crt0.S string.S prom.c stdio.c main.c div64.S	39	src-boot := crt0.S string.S prom.c stdio.c main.c div64.S
40	src-boot += $(zlib)	40	src-boot += $(zlib)
41	src-boot := $(addprefix $(obj)/, $(src-boot))	41	src-boot := $(addprefix $(obj)/, $(src-boot))
42	obj-boot := $(addsuffix .o, $(basename $(src-boot)))	42	obj-boot := $(addsuffix .o, $(basename $(src-boot)))
43		43
44	BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)	44	BOOTCFLAGS += -I$(obj) -I$(srctree)/$(obj)
45		45
46	quiet_cmd_copy_zlib = COPY $@	46	quiet_cmd_copy_zlib = COPY $@
47	cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@	47	cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
48		48
49	quiet_cmd_copy_zlibheader = COPY $@	49	quiet_cmd_copy_zlibheader = COPY $@
50	cmd_copy_zlibheader = sed "s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@	50	cmd_copy_zlibheader = sed "s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
51	# stddef.h for NULL	51	# stddef.h for NULL
52	quiet_cmd_copy_zliblinuxheader = COPY $@	52	quiet_cmd_copy_zliblinuxheader = COPY $@
53	cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@	53	cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@
54		54
55	$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%	55	$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
56	$(call cmd,copy_zlib)	56	$(call cmd,copy_zlib)
57		57
58	$(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/%	58	$(addprefix $(obj)/,$(zlibheader)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
59	$(call cmd,copy_zlibheader)	59	$(call cmd,copy_zlibheader)
60		60
61	$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%	61	$(addprefix $(obj)/,$(zliblinuxheader)): $(obj)/%: $(srctree)/include/linux/%
62	$(call cmd,copy_zliblinuxheader)	62	$(call cmd,copy_zliblinuxheader)
63		63
64	clean-files := $(zlib) $(zlibheader) $(zliblinuxheader)	64	clean-files := $(zlib) $(zlibheader) $(zliblinuxheader)
65		65
66		66
67	quiet_cmd_bootcc = BOOTCC $@	67	quiet_cmd_bootcc = BOOTCC $@
68	cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<	68	cmd_bootcc = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTCFLAGS) -c -o $@ $<
69		69
70	quiet_cmd_bootas = BOOTAS $@	70	quiet_cmd_bootas = BOOTAS $@
71	cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<	71	cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<
72		72
73	quiet_cmd_bootld = BOOTLD $@	73	quiet_cmd_bootld = BOOTLD $@
74	cmd_bootld = $(CROSS32LD) -T $(srctree)/$(src)/$(3) -o $@ $(2)	74	cmd_bootld = $(CROSS32LD) -T $(srctree)/$(src)/$(3) -o $@ $(2)
75		75
76	$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c	76	$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c
77	$(call if_changed_dep,bootcc)	77	$(call if_changed_dep,bootcc)
78	$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S	78	$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
79	$(call if_changed_dep,bootas)	79	$(call if_changed_dep,bootas)
80		80
81	#-----------------------------------------------------------	81	#-----------------------------------------------------------
82	# ELF sections within the zImage bootloader/wrapper	82	# ELF sections within the zImage bootloader/wrapper
83	#-----------------------------------------------------------	83	#-----------------------------------------------------------
84	required := vmlinux.strip	84	required := vmlinux.strip
85	initrd := initrd	85	initrd := initrd
86		86
87	obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.o, $(section)))	87	obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.o, $(section)))
88	src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))	88	src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))
89	gz-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))	89	gz-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))
90		90
91	hostprogs-y := addnote addRamDisk hack-coff	91	hostprogs-y := addnote addRamDisk hack-coff
92		92
93	targets += zImage.vmode zImage.initrd.vmode zImage zImage.initrd \	93	targets += zImage.vmode zImage.initrd.vmode zImage zImage.initrd \
94	zImage.coff zImage.initrd.coff miboot.image miboot.initrd.image \	94	zImage.coff zImage.initrd.coff miboot.image miboot.initrd.image \
95	$(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \	95	$(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \
96	$(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \	96	$(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \
97	$(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \	97	$(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \
98	vmlinux.initrd dummy.o	98	vmlinux.initrd dummy.o
99	extra-y := initrd.o	99	extra-y := initrd.o
100		100
101	quiet_cmd_ramdisk = RAMDISK $@	101	quiet_cmd_ramdisk = RAMDISK $@
102	cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@	102	cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@
103		103
104	quiet_cmd_stripvm = STRIP $@	104	quiet_cmd_stripvm = STRIP $@
105	cmd_stripvm = $(STRIP) -s -R .comment $< -o $@	105	cmd_stripvm = $(STRIP) -s -R .comment $< -o $@
106		106
107	vmlinux.strip: vmlinux	107	vmlinux.strip: vmlinux
108	$(call if_changed,stripvm)	108	$(call if_changed,stripvm)
109	$(obj)/vmlinux.initrd: vmlinux.strip $(obj)/addRamDisk $(obj)/ramdisk.image.gz	109	$(obj)/vmlinux.initrd: vmlinux.strip $(obj)/addRamDisk $(obj)/ramdisk.image.gz
110	$(call if_changed,ramdisk)	110	$(call if_changed,ramdisk)
111		111
112	quiet_cmd_addsection = ADDSEC $@	112	quiet_cmd_addsection = ADDSEC $@
113	cmd_addsection = $(CROSS32OBJCOPY) $@ \	113	cmd_addsection = $(CROSS32OBJCOPY) $@ \
114	--add-section=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(patsubst %.o,%.gz, $@) \	114	--add-section=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(patsubst %.o,%.gz, $@) \
115	--set-section-flags=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(OBJCOPYFLAGS)	115	--set-section-flags=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(OBJCOPYFLAGS)
116		116
117	quiet_cmd_addnote = ADDNOTE $@	117	quiet_cmd_addnote = ADDNOTE $@
118	cmd_addnote = $(obj)/addnote $@	118	cmd_addnote = $(obj)/addnote $@
119		119
120	quiet_cmd_gen-miboot = GEN $@	120	quiet_cmd_gen-miboot = GEN $@
121	cmd_gen-miboot = $(OBJCOPY) $(OBJCOPY_MIB_ARGS) \	121	cmd_gen-miboot = $(OBJCOPY) $(OBJCOPY_MIB_ARGS) \
122	--add-section=$1=$(word 2, $^) $< $@	122	--add-section=$1=$(word 2, $^) $< $@
123		123
124	quiet_cmd_gencoff = COFF $@	124	quiet_cmd_gencoff = COFF $@
125	cmd_gencoff = $(OBJCOPY) $(OBJCOPY_COFF_ARGS) $@ && \	125	cmd_gencoff = $(OBJCOPY) $(OBJCOPY_COFF_ARGS) $@ && \
126	$(obj)/hack-coff $@	126	$(obj)/hack-coff $@
127		127
128	$(call gz-sec, $(required)): $(obj)/kernel-%.gz: %	128	$(call gz-sec, $(required)): $(obj)/kernel-%.gz: %
129	$(call if_changed,gzip)	129	$(call if_changed,gzip)
130		130
131	$(obj)/kernel-initrd.gz: $(obj)/ramdisk.image.gz	131	$(obj)/kernel-initrd.gz: $(obj)/ramdisk.image.gz
132	cp -f $(obj)/ramdisk.image.gz $@	132	cp -f $(obj)/ramdisk.image.gz $@
133		133
134	$(call src-sec, $(required) $(initrd)): $(obj)/kernel-%.c: $(obj)/kernel-%.gz	134	$(call src-sec, $(required) $(initrd)): $(obj)/kernel-%.c: $(obj)/kernel-%.gz
135	@touch $@	135	@touch $@
136		136
137	$(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c	137	$(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c
138	$(call if_changed_dep,bootcc)	138	$(call if_changed_dep,bootcc)
139	$(call cmd,addsection)	139	$(call cmd,addsection)
140		140
141	$(obj)/zImage.vmode $(obj)/zImage.coff: obj-boot += $(call obj-sec, $(required))	141	$(obj)/zImage.vmode $(obj)/zImage.coff: obj-boot += $(call obj-sec, $(required))
142	$(obj)/zImage.vmode: $(call obj-sec, $(required)) $(obj-boot) $(srctree)/$(src)/zImage.lds	142	$(obj)/zImage.vmode: $(call obj-sec, $(required)) $(obj-boot) $(srctree)/$(src)/zImage.lds
143	$(call cmd,bootld,$(obj-boot),zImage.lds)	143	$(call cmd,bootld,$(obj-boot),zImage.lds)
144		144
145	$(obj)/zImage.initrd.vmode $(obj)/zImage.initrd.coff: obj-boot += $(call obj-sec, $(required) $(initrd))	145	$(obj)/zImage.initrd.vmode $(obj)/zImage.initrd.coff: obj-boot += $(call obj-sec, $(required) $(initrd))
146	$(obj)/zImage.initrd.vmode: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(srctree)/$(src)/zImage.lds	146	$(obj)/zImage.initrd.vmode: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(srctree)/$(src)/zImage.lds
147	$(call cmd,bootld,$(obj-boot),zImage.lds)	147	$(call cmd,bootld,$(obj-boot),zImage.lds)
148		148
149	# For 32-bit powermacs, build the COFF and miboot images	149	# For 32-bit powermacs, build the COFF and miboot images
150	# as well as the ELF images.	150	# as well as the ELF images.
151	coffimage-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.coff	151	coffimage-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.coff
152	coffrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.initrd.coff	152	coffrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/zImage.initrd.coff
153	mibootimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/miboot.image	153	mibootimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/miboot.image
154	mibrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/miboot.initrd.image	154	mibrdimg-$(CONFIG_PPC_PMAC)-$(CONFIG_PPC32) := $(obj)/miboot.initrd.image
155		155
156	$(obj)/zImage: $(obj)/zImage.vmode $(obj)/addnote $(coffimage-y-y) \	156	$(obj)/zImage: $(obj)/zImage.vmode $(obj)/addnote $(coffimage-y-y) \
157	$(mibootimg-y-y)	157	$(mibootimg-y-y)
158	@cp -f $< $@	158	@cp -f $< $@
159	$(call if_changed,addnote)	159	$(call if_changed,addnote)
160		160
161	$(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote \	161	$(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote \
162	$(coffrdimg-y-y) $(mibrdimg-y-y)	162	$(coffrdimg-y-y) $(mibrdimg-y-y)
163	@cp -f $< $@	163	@cp -f $< $@
164	$(call if_changed,addnote)	164	$(call if_changed,addnote)
165		165
166	$(obj)/zImage.coff: $(call obj-sec, $(required)) $(obj-boot) \	166	$(obj)/zImage.coff: $(call obj-sec, $(required)) $(obj-boot) \
167	$(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff	167	$(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff
168	$(call cmd,bootld,$(obj-boot),zImage.coff.lds)	168	$(call cmd,bootld,$(obj-boot),zImage.coff.lds)
169	$(call cmd,gencoff)	169	$(call cmd,gencoff)
170		170
171	$(obj)/zImage.initrd.coff: $(call obj-sec, $(required) $(initrd)) $(obj-boot) \	171	$(obj)/zImage.initrd.coff: $(call obj-sec, $(required) $(initrd)) $(obj-boot) \
172	$(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff	172	$(srctree)/$(src)/zImage.coff.lds $(obj)/hack-coff
173	$(call cmd,bootld,$(obj-boot),zImage.coff.lds)	173	$(call cmd,bootld,$(obj-boot),zImage.coff.lds)
174	$(call cmd,gencoff)	174	$(call cmd,gencoff)
175		175
176	$(obj)/miboot.image: $(obj)/dummy.o $(obj)/vmlinux.gz	176	$(obj)/miboot.image: $(obj)/dummy.o $(obj)/vmlinux.gz
177	$(call cmd,gen-miboot,image)	177	$(call cmd,gen-miboot,image)
178		178
179	$(obj)/miboot.initrd.image: $(obj)/miboot.image $(images)/ramdisk.image.gz	179	$(obj)/miboot.initrd.image: $(obj)/miboot.image $(images)/ramdisk.image.gz
180	$(call cmd,gen-miboot,initrd)	180	$(call cmd,gen-miboot,initrd)
181		181
182	#-----------------------------------------------------------	182	#-----------------------------------------------------------
183	# build u-boot images	183	# build u-boot images
184	#-----------------------------------------------------------	184	#-----------------------------------------------------------
185	quiet_cmd_mygzip = GZIP $@	185	quiet_cmd_mygzip = GZIP $@
186	cmd_mygzip = gzip -f -9 < $< > $@.$$$$ && mv $@.$$$$ $@	186	cmd_mygzip = gzip -f -9 < $< > $@.$$$$ && mv $@.$$$$ $@
187		187
188	quiet_cmd_objbin = OBJCOPY $@	188	quiet_cmd_objbin = OBJCOPY $@
189	cmd_objbin = $(OBJCOPY) -O binary $< $@	189	cmd_objbin = $(OBJCOPY) -O binary $< $@
190		190
191	quiet_cmd_uimage = UIMAGE $@	191	quiet_cmd_uimage = UIMAGE $@
192	cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A ppc -O linux -T kernel \	192	cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A ppc -O linux -T kernel \
193	-C gzip -a 00000000 -e 00000000 -n 'Linux-$(KERNELRELEASE)' \	193	-C gzip -a 00000000 -e 00000000 -n 'Linux-$(KERNELRELEASE)' \
194	-d $< $@	194	-d $< $@
195		195
196	MKIMAGE := $(srctree)/scripts/mkuboot.sh	196	MKIMAGE := $(srctree)/scripts/mkuboot.sh
197	targets += uImage	197	targets += uImage
198	extra-y += vmlinux.bin vmlinux.gz	198	extra-y += vmlinux.bin vmlinux.gz
199		199
200	$(obj)/vmlinux.bin: vmlinux FORCE	200	$(obj)/vmlinux.bin: vmlinux FORCE
201	$(call if_changed,objbin)	201	$(call if_changed,objbin)
202		202
203	$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE	203	$(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
204	$(call if_changed,mygzip)	204	$(call if_changed,mygzip)
205		205
206	$(obj)/uImage: $(obj)/vmlinux.gz	206	$(obj)/uImage: $(obj)/vmlinux.gz
207	$(Q)rm -f $@	207	$(Q)rm -f $@
208	$(call cmd,uimage)	208	$(call cmd,uimage)
209	@echo -n ' Image: $@ '	209	@echo -n ' Image: $@ '
210	@if [ -f $@ ]; then echo 'is ready' ; else echo 'not made'; fi	210	@if [ -f $@ ]; then echo 'is ready' ; else echo 'not made'; fi
211		211
212	install: $(CONFIGURE) $(BOOTIMAGE)	212	install: $(CONFIGURE) $(BOOTIMAGE)
213	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" "$(BOOTIMAGE)"	213	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" "$(BOOTIMAGE)"
214		214
215	clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)	215	clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)
216		216