From: Hans Kristian Rosbach Date: Mon, 17 Feb 2025 18:57:08 +0000 (+0100) Subject: Move Chorba defines X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0ae8b240c3840c9b6ed2010ffcc5820c020321b;p=thirdparty%2Fzlib-ng.git Move Chorba defines --- diff --git a/arch/generic/crc32_c.c b/arch/generic/crc32_c.c index a17dff37..a6179d42 100644 --- a/arch/generic/crc32_c.c +++ b/arch/generic/crc32_c.c @@ -1,14 +1,8 @@ #include "zbuild.h" +#include "crc32.h" #include "crc32_braid_p.h" #include "crc32_c.h" -/* Size thresholds for Chorba algorithm variants */ -#define CHORBA_LARGE_THRESHOLD (sizeof(z_word_t) * 64 * 1024) -#define CHORBA_MEDIUM_UPPER_THRESHOLD 32768 -#define CHORBA_MEDIUM_LOWER_THRESHOLD 8192 -#define CHORBA_SMALL_THRESHOLD_64BIT 72 -#define CHORBA_SMALL_THRESHOLD_32BIT 80 - uint32_t PREFIX(crc32_c)(uint32_t crc, const uint8_t *buf, size_t len) { uint32_t c; uint64_t* aligned_buf; diff --git a/crc32.h b/crc32.h index 8c3d7a8a..e26b59e5 100644 --- a/crc32.h +++ b/crc32.h @@ -5,8 +5,15 @@ #ifndef CRC32_H_ #define CRC32_H_ -#define CRC32_FOLD_BUFFER_SIZE (16 * 4) /* sizeof(__m128i) * (4 folds) */ +#define CRC32_FOLD_BUFFER_SIZE (16 * 4) + +/* Size thresholds for Chorba algorithm variants */ +#define CHORBA_LARGE_THRESHOLD (sizeof(z_word_t) * 64 * 1024) +#define CHORBA_MEDIUM_UPPER_THRESHOLD 32768 +#define CHORBA_MEDIUM_LOWER_THRESHOLD 8192 +#define CHORBA_SMALL_THRESHOLD_64BIT 72 +#define CHORBA_SMALL_THRESHOLD_32BIT 80 typedef struct crc32_fold_s { uint8_t fold[CRC32_FOLD_BUFFER_SIZE];