perf.patch revision 881
881N/A--- zlib-1.2.3/zlib.h.orig Sun Jul 17 19:26:49 2005
881N/A+++ zlib-1.2.3/zlib.h Tue May 22 10:17:54 2012
881N/A@@ -37,8 +37,8 @@
881N/A extern "C" {
881N/A #endif
881N/A
881N/A-#define ZLIB_VERSION "1.2.3"
881N/A-#define ZLIB_VERNUM 0x1230
881N/A+#define ZLIB_VERSION "1.2.3-T4mods"
881N/A+#define ZLIB_VERNUM 0x123f
881N/A
881N/A /*
881N/A The 'zlib' compression library provides in-memory compression and
881N/A--- zlib-1.2.3/Makefile.in.orig Mon May 14 14:29:35 2012
881N/A+++ zlib-1.2.3/Makefile.in Mon May 14 14:30:29 2012
881N/A@@ -77,8 +77,8 @@
881N/A mv _match.o match.o
881N/A rm -f _match.s
881N/A
881N/A-$(SHAREDLIBV): $(OBJS)
881N/A- $(LDSHARED) -o $@ $(OBJS)
881N/A+$(SHAREDLIBV): $(OBJS) $(PIC_OBJS)
881N/A+ $(LDSHARED) -o $@ $(OBJS) $(PIC_OBJS)
881N/A rm -f $(SHAREDLIB) $(SHAREDLIBM)
881N/A ln -s $@ $(SHAREDLIB)
881N/A ln -s $@ $(SHAREDLIBM)
881N/A
881N/A--- zlib-1.2.3/inffast.c.orig Fri Nov 12 22:05:29 2004
881N/A+++ zlib-1.2.3/inffast.c Tue Mar 27 08:05:36 2012
881N/A@@ -87,7 +87,7 @@
881N/A code const FAR *dcode; /* local strm->distcode */
881N/A unsigned lmask; /* mask for first level of length codes */
881N/A unsigned dmask; /* mask for first level of distance codes */
881N/A- code this; /* retrieved table entry */
881N/A+ code *this; /* retrieved table entry */
881N/A unsigned op; /* code bits, operation, extra bits, or */
881N/A /* window position, window bytes to copy */
881N/A unsigned len; /* match length, unused bytes */
881N/A@@ -124,20 +124,20 @@
881N/A hold += (unsigned long)(PUP(in)) << bits;
881N/A bits += 8;
881N/A }
881N/A- this = lcode[hold & lmask];
881N/A+ this = (code *)(&(lcode[hold & lmask]));
881N/A dolen:
881N/A- op = (unsigned)(this.bits);
881N/A+ op = (unsigned)(this->bits);
881N/A hold >>= op;
881N/A bits -= op;
881N/A- op = (unsigned)(this.op);
881N/A+ op = (unsigned)(this->op);
881N/A if (op == 0) { /* literal */
881N/A- Tracevv((stderr, this.val >= 0x20 && this.val < 0x7f ?
881N/A+ Tracevv((stderr, this->val >= 0x20 && this->val < 0x7f ?
881N/A "inflate: literal '%c'\n" :
881N/A- "inflate: literal 0x%02x\n", this.val));
881N/A- PUP(out) = (unsigned char)(this.val);
881N/A+ "inflate: literal 0x%02x\n", this->val));
881N/A+ PUP(out) = (unsigned char)(this->val);
881N/A }
881N/A else if (op & 16) { /* length base */
881N/A- len = (unsigned)(this.val);
881N/A+ len = (unsigned)(this->val);
881N/A op &= 15; /* number of extra bits */
881N/A if (op) {
881N/A if (bits < op) {
881N/A@@ -155,14 +155,14 @@
881N/A hold += (unsigned long)(PUP(in)) << bits;
881N/A bits += 8;
881N/A }
881N/A- this = dcode[hold & dmask];
881N/A+ this = (code *)(&(dcode[hold & dmask]));
881N/A dodist:
881N/A- op = (unsigned)(this.bits);
881N/A+ op = (unsigned)(this->bits);
881N/A hold >>= op;
881N/A bits -= op;
881N/A- op = (unsigned)(this.op);
881N/A+ op = (unsigned)(this->op);
881N/A if (op & 16) { /* distance base */
881N/A- dist = (unsigned)(this.val);
881N/A+ dist = (unsigned)(this->val);
881N/A op &= 15; /* number of extra bits */
881N/A if (bits < op) {
881N/A hold += (unsigned long)(PUP(in)) << bits;
881N/A@@ -259,7 +259,8 @@
881N/A }
881N/A }
881N/A else if ((op & 64) == 0) { /* 2nd level distance code */
881N/A- this = dcode[this.val + (hold & ((1U << op) - 1))];
881N/A+ this = (code *)
881N/A+ (&(dcode[this->val + (hold & ((1U << op) - 1))]));
881N/A goto dodist;
881N/A }
881N/A else {
881N/A@@ -269,7 +270,7 @@
881N/A }
881N/A }
881N/A else if ((op & 64) == 0) { /* 2nd level length code */
881N/A- this = lcode[this.val + (hold & ((1U << op) - 1))];
881N/A+ this = (code *)(&(lcode[this->val + (hold & ((1U << op) - 1))]));
881N/A goto dolen;
881N/A }
881N/A else if (op & 32) { /* end-of-block */
881N/A
881N/A--- zlib-1.2.3/deflate.c.orig Tue Mar 27 10:02:52 2012
881N/A+++ zlib-1.2.3/deflate.c Sun Jul 17 19:27:31 2005
881N/A@@ -88,9 +88,13 @@
881N/A void match_init OF((void)); /* asm code initialization */
881N/A uInt longest_match OF((deflate_state *s, IPos cur_match));
881N/A #else
881N/A+#ifdef ORIG_LONGEST_MATCH
881N/A local uInt longest_match OF((deflate_state *s, IPos cur_match));
881N/A+#else
881N/A+uInt longest_match OF((deflate_state *s, IPos cur_match));
881N/A #endif
881N/A #endif
881N/A+#endif
881N/A local uInt longest_match_fast OF((deflate_state *s, IPos cur_match));
881N/A
881N/A #ifdef DEBUG
881N/A@@ -1010,6 +1014,7 @@
881N/A #endif
881N/A }
881N/A
881N/A+#if defined(ORIG_LONGEST_MATCH) || defined(ORIG_LONGEST_MATCH_GLOBAL)
881N/A #ifndef FASTEST
881N/A /* ===========================================================================
881N/A * Set match_start to the longest match starting at the given string and
881N/A@@ -1024,7 +1029,11 @@
881N/A /* For 80x86 and 680x0, an optimized version will be provided in match.asm or
881N/A * match.S. The code will be functionally equivalent.
881N/A */
881N/A+#ifdef ORIG_LONGEST_MATCH_GLOBAL
881N/A+uInt longest_match(s, cur_match)
881N/A+#else
881N/A local uInt longest_match(s, cur_match)
881N/A+#endif
881N/A deflate_state *s;
881N/A IPos cur_match; /* current match */
881N/A {
881N/A@@ -1168,6 +1177,7 @@
881N/A }
881N/A #endif /* ASMV */
881N/A #endif /* FASTEST */
881N/A+#endif /* ORIG_LONGEST_MATCHT */
881N/A
881N/A /* ---------------------------------------------------------------------------
881N/A * Optimized version for level == 1 or strategy == Z_RLE only