From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Thu, 25 Feb 2021 00:50:46 +0000 (-0800)
Subject: Rename slide_hash chain functions.
X-Git-Tag: 2.1.0-beta1~595
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06ee8421456ead3d7c1a2488e6f594749eca09a4;p=thirdparty%2Fzlib-ng.git

Rename slide_hash chain functions.
---

diff --git a/arch/arm/slide_neon.c b/arch/arm/slide_neon.c
index 81461391..87b53976 100644
--- a/arch/arm/slide_neon.c
+++ b/arch/arm/slide_neon.c
@@ -18,7 +18,7 @@
 #include "../../deflate.h"
 
 /* SIMD version of hash_chain rebase */
-static inline void slide_hash_neon_chain(Pos *table, uint32_t entries, uint16_t wsize) {
+static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) {
     Z_REGISTER uint16x8_t v, *p;
     Z_REGISTER size_t n;
 
@@ -46,7 +46,7 @@ static inline void slide_hash_neon_chain(Pos *table, uint32_t entries, uint16_t
 Z_INTERNAL void slide_hash_neon(deflate_state *s) {
     unsigned int wsize = s->w_size;
 
-    slide_hash_neon_chain(s->head, HASH_SIZE, wsize);
-    slide_hash_neon_chain(s->prev, wsize, wsize);
+    slide_hash_chain(s->head, HASH_SIZE, wsize);
+    slide_hash_chain(s->prev, wsize, wsize);
 }
 #endif
diff --git a/arch/power/slide_hash_power8.c b/arch/power/slide_hash_power8.c
index 11256193..c0083aad 100644
--- a/arch/power/slide_hash_power8.c
+++ b/arch/power/slide_hash_power8.c
@@ -10,7 +10,7 @@
 #include "zbuild.h"
 #include "deflate.h"
 
-static inline void slide_hash_power8_chain(Pos *table, uint32_t entries, uint16_t wsize) {
+static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) {
     vector unsigned short vw, vm, *vp;
     unsigned chunks;
 
@@ -49,8 +49,8 @@ static inline void slide_hash_power8_chain(Pos *table, uint32_t entries, uint16_
 void Z_INTERNAL slide_hash_power8(deflate_state *s) {
     uint16_t wsize = s->w_size;
 
-    slide_hash_power8_chain(s->head, HASH_SIZE, wsize);
-    slide_hash_power8_chain(s->prev, wsize, wsize);
+    slide_hash_chain(s->head, HASH_SIZE, wsize);
+    slide_hash_chain(s->prev, wsize, wsize);
 }
 
 #endif /* POWER8_VSX_SLIDEHASH */
diff --git a/arch/x86/slide_avx.c b/arch/x86/slide_avx.c
index 01c788df..94fe10c7 100644
--- a/arch/x86/slide_avx.c
+++ b/arch/x86/slide_avx.c
@@ -14,7 +14,7 @@
 
 #include <immintrin.h>
 
-static inline void slide_hash_avx2_chain(Pos *table, uint32_t entries, const __m256i wsize) {
+static inline void slide_hash_chain(Pos *table, uint32_t entries, const __m256i wsize) {
     table += entries;
     table -= 16;
 
@@ -34,6 +34,6 @@ Z_INTERNAL void slide_hash_avx2(deflate_state *s) {
     uint16_t wsize = (uint16_t)s->w_size;
     const __m256i ymm_wsize = _mm256_set1_epi16((short)wsize);
 
-    slide_hash_avx2_chain(s->head, HASH_SIZE, ymm_wsize);
-    slide_hash_avx2_chain(s->prev, wsize, ymm_wsize);
+    slide_hash_chain(s->head, HASH_SIZE, ymm_wsize);
+    slide_hash_chain(s->prev, wsize, ymm_wsize);
 }
diff --git a/arch/x86/slide_sse.c b/arch/x86/slide_sse.c
index 65d58a71..7507c68b 100644
--- a/arch/x86/slide_sse.c
+++ b/arch/x86/slide_sse.c
@@ -13,7 +13,7 @@
 
 #include <immintrin.h>
 
-static inline void slide_hash_sse2_chain(Pos *table, uint32_t entries, const __m128i wsize) {
+static inline void slide_hash_chain(Pos *table, uint32_t entries, const __m128i wsize) {
     table += entries;
     table -= 8;
 
@@ -33,6 +33,6 @@ Z_INTERNAL void slide_hash_sse2(deflate_state *s) {
     uint16_t wsize = (uint16_t)s->w_size;
     const __m128i xmm_wsize = _mm_set1_epi16((short)wsize);
 
-    slide_hash_sse2_chain(s->head, HASH_SIZE, xmm_wsize);
-    slide_hash_sse2_chain(s->prev, wsize, xmm_wsize);
+    slide_hash_chain(s->head, HASH_SIZE, xmm_wsize);
+    slide_hash_chain(s->prev, wsize, xmm_wsize);
 }