Sync use of adler32_len_16 among adler32 variants.

diff --git a/arch/power/adler32_power8.c b/arch/power/adler32_power8.c
index cda51aa80752f9546ecf93ddc137326dc5348f8e..029aa3a84c5773313036d766c38db5c51465fd58 100644 (file)
--- 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 1063246549f215a21feda86c0937f571acfe1c22..3d30d4d783d95ba30c638a6f03a21debb98baefa 100644 (file)
--- 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 101df4fe4d64ddcb6477709cf4d013c5015ac3f4..f7587f3da16ca30a963a76a5d611dc152464ab24 100644 (file)
--- 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