From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Tue, 23 Feb 2021 05:43:24 +0000 (-0800)
Subject: Sync use of adler32_len_16 among adler32 variants.
X-Git-Tag: 2.1.0-beta1~588
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=366aa5ac9998f84bf011b8a2f8a4dbde5f7ab55f;p=thirdparty%2Fzlib-ng.git

Sync use of adler32_len_16 among adler32 variants.
---

diff --git a/arch/power/adler32_power8.c b/arch/power/adler32_power8.c
index cda51aa80..029aa3a84 100644
--- a/arch/power/adler32_power8.c
+++ b/arch/power/adler32_power8.c
@@ -147,7 +147,7 @@ uint32_t adler32_power8(uint32_t adler, const unsigned char* buf, size_t len) {
     s1 = vs1[0] % BASE;
     s2 = vs2[0] % BASE;
 
-    /* Process tail (len < 16).and return  */
+    /* Process tail (len < 16).  */
     return adler32_len_16(s1, buf, len, s2);
 }
 
diff --git a/arch/x86/adler32_avx.c b/arch/x86/adler32_avx.c
index 106324654..3d30d4d78 100644
--- a/arch/x86/adler32_avx.c
+++ b/arch/x86/adler32_avx.c
@@ -102,16 +102,8 @@ Z_INTERNAL uint32_t adler32_avx2(uint32_t adler, const unsigned char *buf, size_
        s2[7] = sum2;
     }
 
-    while (len) {
-        len--;
-        adler += *buf++;
-        sum2 += adler;
-    }
-    adler %= BASE;
-    sum2 %= BASE;
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
+    /* Process tail (len < 16).  */
+    return adler32_len_16(adler, buf, len, sum2);
 }
 
 #endif
diff --git a/arch/x86/adler32_ssse3.c b/arch/x86/adler32_ssse3.c
index 101df4fe4..f7587f3da 100644
--- a/arch/x86/adler32_ssse3.c
+++ b/arch/x86/adler32_ssse3.c
@@ -103,16 +103,8 @@ Z_INTERNAL uint32_t adler32_ssse3(uint32_t adler, const unsigned char *buf, size
        s2[3] = sum2;
     }
 
-    while (len) {
-        len--;
-        adler += *buf++;
-        sum2 += adler;
-    }
-    adler %= BASE;
-    sum2 %= BASE;
-
-    /* return recombined sums */
-    return adler | (sum2 << 16);
+    /* Process tail (len < 16).  */
+    return adler32_len_16(adler, buf, len, sum2);
 }
 
 #endif