From: Yann Collet <yann.collet.73@gmail.com>
Date: Fri, 6 Nov 2015 17:44:54 +0000 (+0100)
Subject: revert
X-Git-Tag: zstd-0.3.5^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=628065cf985d65b7dc053fff2fa34de5ea62c9f8;p=thirdparty%2Fzstd.git

revert
---

diff --git a/lib/zstdhc.c b/lib/zstdhc.c
index dbc7a3a99..e2dfafc1d 100644
--- a/lib/zstdhc.c
+++ b/lib/zstdhc.c
@@ -655,7 +655,6 @@ size_t ZSTD_HC_compressBlock_lazy_generic(ZSTD_HC_CCtx* ctx,
 
         /* let's try to find a better solution */
         start = ip;
-        while ((start>anchor) && (start-offset>ctx->base) && (start[-1] == start[-1-offset])) { start--; matchLength++; }  /* catch up */
 
         while (ip<ilimit)
         {
@@ -671,15 +670,11 @@ size_t ZSTD_HC_compressBlock_lazy_generic(ZSTD_HC_CCtx* ctx,
             {
                 size_t offset2=999999;
                 size_t ml2 = searchMax(ctx, ip, iend, &offset2, maxSearches, mls);
-                const BYTE* start2 = ip;
-                int gain1, gain2;
-                if (ml2)
-                    while ((start2>anchor) && (start2-offset2>ctx->base) && (start2[-1] == start2[-1-offset2])) { start2--; ml2++; }  /* catch up */
-                gain2 = (int)(ml2*(3+deep) - ZSTD_highbit((U32)offset2+1));   /* raw approx */
-                gain1 = (int)(matchLength*(3+deep) - ZSTD_highbit((U32)offset+1) + (3+deep));
+                int gain2 = (int)(ml2*(3+deep) - ZSTD_highbit((U32)offset2+1));   /* raw approx */
+                int gain1 = (int)(matchLength*(3+deep) - ZSTD_highbit((U32)offset+1) + (3+deep));
                 if (gain2 > gain1)
                 {
-                    matchLength = ml2, offset = offset2, start = start2;
+                    matchLength = ml2, offset = offset2, start = ip;
                     continue;   /* search a better one */
                 }
             }
@@ -699,16 +694,12 @@ size_t ZSTD_HC_compressBlock_lazy_generic(ZSTD_HC_CCtx* ctx,
                 {
                     size_t offset2=999999;
                     size_t ml2 = searchMax(ctx, ip, iend, &offset2, maxSearches, mls);
-                    const BYTE* start2 = ip;
-                    int gain1, gain2;
-                    if (ml2)
-                        while ((start2>anchor) && (start2-offset2>ctx->base) && (start2[-1] == start2[-1-offset2])) { start2--; ml2++; }  /* catch up */
-                    gain2 = (int)(ml2*(3+deep) - ZSTD_highbit((U32)offset2+1));   /* raw approx */
-                    gain1 = (int)(matchLength*(3+deep) - ZSTD_highbit((U32)offset+1) + (3+deep));
+                    int gain2 = (int)(ml2*4 - ZSTD_highbit((U32)offset2+1));   /* raw approx */
+                    int gain1 = (int)(matchLength*4 - ZSTD_highbit((U32)offset+1) + 7);
                     if (gain2 > gain1)
                     {
-                        matchLength = ml2, offset = offset2, start = start2;
-                        continue;   /* search a better one */
+                        matchLength = ml2, offset = offset2, start = ip;
+                        continue;
                     }
                 }
             }
@@ -716,6 +707,8 @@ size_t ZSTD_HC_compressBlock_lazy_generic(ZSTD_HC_CCtx* ctx,
         }
 
         /* store sequence */
+        if (offset)
+        while ((start>anchor) && (start-offset>ctx->base) && (start[-1] == start[-1-offset])) { start--; matchLength++; }  /* catch up */
         {
             size_t litLength = start - anchor;
             if (offset) offset_1 = offset;