Automatic date update in version.in

[binutils.git] / zlib / inffast.c

diff --git a/zlib/inffast.c b/zlib/inffast.c
index bda59ceb6a12b2d7de80ef3c1e7318e54fc979ac..1fec7f363fa665f1722a32ad7a7d5071d4eb04ee 100644 (file)
--- a/zlib/inffast.c
+++ b/zlib/inffast.c
@@ -1,5 +1,5 @@
 /* inffast.c -- fast decoding
 /* inffast.c -- fast decoding

- * Copyright (C) 1995-2008, 2010, 2013 Mark Adler
+ * Copyright (C) 1995-2017 Mark Adler

  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 


@@ -8,26 +8,9 @@
 #include "inflate.h"
 #include "inffast.h"
 
 #include "inflate.h"
 #include "inffast.h"
 

-#ifndef ASMINF
-
-/* Allow machine dependent optimization for post-increment or pre-increment.
-   Based on testing to date,
-   Pre-increment preferred for:
-   - PowerPC G3 (Adler)
-   - MIPS R5000 (Randers-Pehrson)
-   Post-increment preferred for:
-   - none
-   No measurable difference:
-   - Pentium III (Anderson)
-   - M68060 (Nikl)
- */
-#ifdef POSTINC
-#  define OFF 0
-#  define PUP(a) *(a)++
+#ifdef ASMINF
+#  pragma message("Assembler code may have bugs -- use at your own risk")

 #else
 #else

-#  define OFF 1
-#  define PUP(a) *++(a)
-#endif

 
 /*
    Decode literal, length, and distance codes and write out the resulting
 
 /*
    Decode literal, length, and distance codes and write out the resulting


@@ -87,7 +70,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     code const FAR *dcode;      /* local strm->distcode */
     unsigned lmask;             /* mask for first level of length codes */
     unsigned dmask;             /* mask for first level of distance codes */
     code const FAR *dcode;      /* local strm->distcode */
     unsigned lmask;             /* mask for first level of length codes */
     unsigned dmask;             /* mask for first level of distance codes */

-    code here;                  /* retrieved table entry */
+    code const *here;           /* retrieved table entry */

     unsigned op;                /* code bits, operation, extra bits, or */
                                 /*  window position, window bytes to copy */
     unsigned len;               /* match length, unused bytes */
     unsigned op;                /* code bits, operation, extra bits, or */
                                 /*  window position, window bytes to copy */
     unsigned len;               /* match length, unused bytes */


@@ -96,9 +79,9 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 
     /* copy state to local variables */
     state = (struct inflate_state FAR *)strm->state;
 
     /* copy state to local variables */
     state = (struct inflate_state FAR *)strm->state;

-    in = strm->next_in - OFF;
+    in = strm->next_in;

     last = in + (strm->avail_in - 5);
     last = in + (strm->avail_in - 5);

-    out = strm->next_out - OFF;
+    out = strm->next_out;

     beg = out - (start - strm->avail_out);
     end = out + (strm->avail_out - 257);
 #ifdef INFLATE_STRICT
     beg = out - (start - strm->avail_out);
     end = out + (strm->avail_out - 257);
 #ifdef INFLATE_STRICT


@@ -119,29 +102,29 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
        input data or output space */
     do {
         if (bits < 15) {
        input data or output space */
     do {
         if (bits < 15) {

-            hold += (unsigned long)(PUP(in)) << bits;
+            hold += (unsigned long)(*in++) << bits;

             bits += 8;
             bits += 8;

-            hold += (unsigned long)(PUP(in)) << bits;
+            hold += (unsigned long)(*in++) << bits;

             bits += 8;
         }
             bits += 8;
         }

-        here = lcode[hold & lmask];
+        here = lcode + (hold & lmask);

       dolen:
       dolen:

-        op = (unsigned)(here.bits);
+        op = (unsigned)(here->bits);

         hold >>= op;
         bits -= op;
         hold >>= op;
         bits -= op;

-        op = (unsigned)(here.op);
+        op = (unsigned)(here->op);

         if (op == 0) {                          /* literal */
         if (op == 0) {                          /* literal */

-            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+            Tracevv((stderr, here->val >= 0x20 && here->val < 0x7f ?

                     "inflate:         literal '%c'\n" :
                     "inflate:         literal '%c'\n" :

-                    "inflate:         literal 0x%02x\n", here.val));
-            PUP(out) = (unsigned char)(here.val);
+                    "inflate:         literal 0x%02x\n", here->val));
+            *out++ = (unsigned char)(here->val);

         }
         else if (op & 16) {                     /* length base */
         }
         else if (op & 16) {                     /* length base */

-            len = (unsigned)(here.val);
+            len = (unsigned)(here->val);

             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {
             op &= 15;                           /* number of extra bits */
             if (op) {
                 if (bits < op) {

-                    hold += (unsigned long)(PUP(in)) << bits;
+                    hold += (unsigned long)(*in++) << bits;

                     bits += 8;
                 }
                 len += (unsigned)hold & ((1U << op) - 1);
                     bits += 8;
                 }
                 len += (unsigned)hold & ((1U << op) - 1);


@@ -150,25 +133,25 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             }
             Tracevv((stderr, "inflate:         length %u\n", len));
             if (bits < 15) {
             }
             Tracevv((stderr, "inflate:         length %u\n", len));
             if (bits < 15) {

-                hold += (unsigned long)(PUP(in)) << bits;
+                hold += (unsigned long)(*in++) << bits;

                 bits += 8;
                 bits += 8;

-                hold += (unsigned long)(PUP(in)) << bits;
+                hold += (unsigned long)(*in++) << bits;

                 bits += 8;
             }
                 bits += 8;
             }

-            here = dcode[hold & dmask];
+            here = dcode + (hold & dmask);

           dodist:
           dodist:

-            op = (unsigned)(here.bits);
+            op = (unsigned)(here->bits);

             hold >>= op;
             bits -= op;
             hold >>= op;
             bits -= op;

-            op = (unsigned)(here.op);
+            op = (unsigned)(here->op);

             if (op & 16) {                      /* distance base */
             if (op & 16) {                      /* distance base */

-                dist = (unsigned)(here.val);
+                dist = (unsigned)(here->val);

                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {
                 op &= 15;                       /* number of extra bits */
                 if (bits < op) {

-                    hold += (unsigned long)(PUP(in)) << bits;
+                    hold += (unsigned long)(*in++) << bits;

                     bits += 8;
                     if (bits < op) {
                     bits += 8;
                     if (bits < op) {

-                        hold += (unsigned long)(PUP(in)) << bits;
+                        hold += (unsigned long)(*in++) << bits;

                         bits += 8;
                     }
                 }
                         bits += 8;
                     }
                 }


@@ -196,30 +179,30 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
                         if (len <= op - whave) {
                             do {
 #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
                         if (len <= op - whave) {
                             do {

-                                PUP(out) = 0;
+                                *out++ = 0;

                             } while (--len);
                             continue;
                         }
                         len -= op - whave;
                         do {
                             } while (--len);
                             continue;
                         }
                         len -= op - whave;
                         do {

-                            PUP(out) = 0;
+                            *out++ = 0;

                         } while (--op > whave);
                         if (op == 0) {
                             from = out - dist;
                             do {
                         } while (--op > whave);
                         if (op == 0) {
                             from = out - dist;
                             do {

-                                PUP(out) = PUP(from);
+                                *out++ = *from++;

                             } while (--len);
                             continue;
                         }
 #endif
                     }
                             } while (--len);
                             continue;
                         }
 #endif
                     }

-                    from = window - OFF;
+                    from = window;

                     if (wnext == 0) {           /* very common case */
                         from += wsize - op;
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {
                     if (wnext == 0) {           /* very common case */
                         from += wsize - op;
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {

-                                PUP(out) = PUP(from);
+                                *out++ = *from++;

                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }
                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }


@@ -230,14 +213,14 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                         if (op < len) {         /* some from end of window */
                             len -= op;
                             do {
                         if (op < len) {         /* some from end of window */
                             len -= op;
                             do {

-                                PUP(out) = PUP(from);
+                                *out++ = *from++;

                             } while (--op);
                             } while (--op);

-                            from = window - OFF;
+                            from = window;

                             if (wnext < len) {  /* some from start of window */
                                 op = wnext;
                                 len -= op;
                                 do {
                             if (wnext < len) {  /* some from start of window */
                                 op = wnext;
                                 len -= op;
                                 do {

-                                    PUP(out) = PUP(from);
+                                    *out++ = *from++;

                                 } while (--op);
                                 from = out - dist;      /* rest from output */
                             }
                                 } while (--op);
                                 from = out - dist;      /* rest from output */
                             }


@@ -248,40 +231,40 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {
                         if (op < len) {         /* some from window */
                             len -= op;
                             do {

-                                PUP(out) = PUP(from);
+                                *out++ = *from++;

                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }
                     }
                     while (len > 2) {
                             } while (--op);
                             from = out - dist;  /* rest from output */
                         }
                     }
                     while (len > 2) {

-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        *out++ = *from++;

                         len -= 3;
                     }
                     if (len) {
                         len -= 3;
                     }
                     if (len) {

-                        PUP(out) = PUP(from);
+                        *out++ = *from++;

                         if (len > 1)
                         if (len > 1)

-                            PUP(out) = PUP(from);
+                            *out++ = *from++;

                     }
                 }
                 else {
                     from = out - dist;          /* copy direct from output */
                     do {                        /* minimum length is three */
                     }
                 }
                 else {
                     from = out - dist;          /* copy direct from output */
                     do {                        /* minimum length is three */

-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
-                        PUP(out) = PUP(from);
+                        *out++ = *from++;
+                        *out++ = *from++;
+                        *out++ = *from++;

                         len -= 3;
                     } while (len > 2);
                     if (len) {
                         len -= 3;
                     } while (len > 2);
                     if (len) {

-                        PUP(out) = PUP(from);
+                        *out++ = *from++;

                         if (len > 1)
                         if (len > 1)

-                            PUP(out) = PUP(from);
+                            *out++ = *from++;

                     }
                 }
             }
             else if ((op & 64) == 0) {          /* 2nd level distance code */
                     }
                 }
             }
             else if ((op & 64) == 0) {          /* 2nd level distance code */

-                here = dcode[here.val + (hold & ((1U << op) - 1))];
+                here = dcode + here->val + (hold & ((1U << op) - 1));

                 goto dodist;
             }
             else {
                 goto dodist;
             }
             else {


@@ -291,7 +274,7 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
             }
         }
         else if ((op & 64) == 0) {              /* 2nd level length code */
             }
         }
         else if ((op & 64) == 0) {              /* 2nd level length code */

-            here = lcode[here.val + (hold & ((1U << op) - 1))];
+            here = lcode + here->val + (hold & ((1U << op) - 1));

             goto dolen;
         }
         else if (op & 32) {                     /* end-of-block */
             goto dolen;
         }
         else if (op & 32) {                     /* end-of-block */


@@ -313,8 +296,8 @@ unsigned start;         /* inflate()'s starting value for strm->avail_out */
     hold &= (1U << bits) - 1;
 
     /* update state and return */
     hold &= (1U << bits) - 1;
 
     /* update state and return */

-    strm->next_in = in + OFF;
-    strm->next_out = out + OFF;
+    strm->next_in = in;
+    strm->next_out = out;

     strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
     strm->avail_out = (unsigned)(out < end ?
                                  257 + (end - out) : 257 - (out - end));
     strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
     strm->avail_out = (unsigned)(out < end ?
                                  257 + (end - out) : 257 - (out - end));