From f954ce8a36a21fefcf89d34a2e693cff3a62256f Mon Sep 17 00:00:00 2001 From: shen-chenyang1 Date: Mon, 18 Aug 2025 16:40:13 +0800 Subject: [PATCH] add: support crc32c & crc32 --- KAELz4/src/v1/kaelz4_comp.c | 87 ++++++++++++++++++++++++++++ KAELz4/test/kzip/build.sh | 2 +- KAELz4/test/kzip/compress_ctx.h | 1 + KAELz4/test/kzip/crc32c.c | 80 ++++++++++++++++++++++++++ KAELz4/test/kzip/main.c | 14 +++-- KAEZlib/src/v1/kaezip_async_comp.c | 92 +++++++++++++++++++++++++++++- 6 files changed, 270 insertions(+), 6 deletions(-) create mode 100644 KAELz4/test/kzip/crc32c.c diff --git a/KAELz4/src/v1/kaelz4_comp.c b/KAELz4/src/v1/kaelz4_comp.c index 4c8e351..b44dfd6 100644 --- a/KAELz4/src/v1/kaelz4_comp.c +++ b/KAELz4/src/v1/kaelz4_comp.c @@ -100,6 +100,7 @@ int kaelz4_compress_v1(LZ4_CCtx* zc, const void* src, size_t srcSize) PREFL2_64B((l2ptr) + 3 * 64); \ } while (0) +#ifdef KAE_USE_CRC32 #define CRC32D_64B(crc, ptr) do { \ (crc) = __crc32d((crc), *(const uint64_t *)((ptr) + 8 * 0)); \ (crc) = __crc32d((crc), *(const uint64_t *)((ptr) + 8 * 1)); \ @@ -110,6 +111,19 @@ int kaelz4_compress_v1(LZ4_CCtx* zc, const void* src, size_t srcSize) (crc) = __crc32d((crc), *(const uint64_t *)((ptr) + 8 * 6)); \ (crc) = __crc32d((crc), *(const uint64_t *)((ptr) + 8 * 7)); \ } while (0) +#else +#define CRC32D_64B(crc, ptr) do { \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 0)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 1)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 2)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 3)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 4)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 5)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 6)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 7)); \ +} while (0) +#endif + #define CRC32D_64B_X4(crc, ptr) do { \ CRC32D_64B((crc), (ptr) + 0 * 64); \ CRC32D_64B((crc), (ptr) + 1 * 64); \ @@ -117,6 +131,7 @@ int kaelz4_compress_v1(LZ4_CCtx* zc, const void* src, size_t srcSize) CRC32D_64B((crc), (ptr) + 3 * 64); \ } while (0) +#ifdef KAE_USE_CRC32 static const uint32_t table0_[256] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, @@ -183,6 +198,74 @@ static const uint32_t table0_[256] = { 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; +#else +static const uint32_t table0_[256] = { + 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, + 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, + 0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, + 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, + 0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, + 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, + 0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, + 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b, + 0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, + 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, + 0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, + 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, + 0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, + 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a, + 0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, + 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, + 0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, + 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, + 0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, + 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198, + 0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, + 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, + 0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, + 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, + 0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, + 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789, + 0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, + 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, + 0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, + 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, + 0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, + 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829, + 0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, + 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, + 0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, + 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, + 0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, + 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc, + 0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, + 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, + 0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, + 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, + 0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, + 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982, + 0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, + 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, + 0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, + 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, + 0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, + 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f, + 0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, + 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, + 0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, + 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, + 0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, + 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f, + 0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, + 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, + 0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, + 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, + 0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, + 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e, + 0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, + 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351 +}; +#endif #define PLATFORM_IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN) @@ -217,7 +300,11 @@ static inline uint64_t LE_LOAD64(uint8_t* p) static inline void Slow_CRC32(uint64_t* l, uint8_t** p) { +#ifdef KAE_USE_CRC32 *l = __crc32d(*l, LE_LOAD64(*p)); +#else + *l = __crc32cd(*l, LE_LOAD64(*p)); +#endif *p += 8; } diff --git a/KAELz4/test/kzip/build.sh b/KAELz4/test/kzip/build.sh index 55b8658..444e1e5 100644 --- a/KAELz4/test/kzip/build.sh +++ b/KAELz4/test/kzip/build.sh @@ -10,7 +10,7 @@ TestEnv=${TestEnv:=kaelz4} echo "build kzip for $TestEnv..." case "$TestEnv" in kaelz4) - gcc -g -o kzip main.c delayRecord.c datagen.c alg/manage.c alg/*/*.c scene_test_functions/*c -lz -lnuma -lrt -L/usr/local/kaelz4/lib -llz4 -lkaelz4 -L/usr/local/kaezip/lib -lkaezip -DBUILD_ENV=$TestEnv -DBUILD_ENV_KAELZ4=1 -O3 -fstack-protector-all -Wall -Werror -lpthread + gcc -g -o kzip *.c alg/manage.c alg/*/*.c scene_test_functions/*c -lz -lnuma -lrt -L/usr/local/kaelz4/lib -llz4 -lkaelz4 -L/usr/local/kaezip/lib -lkaezip -DBUILD_ENV=$TestEnv -DBUILD_ENV_KAELZ4=1 -O3 -fstack-protector-all -Wall -Werror -lpthread ;; *) ;; diff --git a/KAELz4/test/kzip/compress_ctx.h b/KAELz4/test/kzip/compress_ctx.h index 36a3e8f..c27004d 100644 --- a/KAELz4/test/kzip/compress_ctx.h +++ b/KAELz4/test/kzip/compress_ctx.h @@ -104,4 +104,5 @@ struct thread_compress_args { #define wmb() __sync_synchronize() /* write fence */ #define mb() __sync_synchronize() /* rw fence */ #endif +uint32_t crc32c_sw(uint32_t crc, const uint8_t *data, size_t len); #endif diff --git a/KAELz4/test/kzip/crc32c.c b/KAELz4/test/kzip/crc32c.c new file mode 100644 index 0000000..a23df72 --- /dev/null +++ b/KAELz4/test/kzip/crc32c.c @@ -0,0 +1,80 @@ +// CRC32C 多项式（Castagnoli）：0x1EDC6F41（反向：0x82F63B78） +#include +#include + +static const uint32_t crc32c_table[256] = { + 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, + 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, + 0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, + 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, + 0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, + 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, + 0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, + 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b, + 0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, + 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, + 0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, + 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, + 0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, + 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a, + 0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, + 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, + 0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, + 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, + 0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, + 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198, + 0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, + 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, + 0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, + 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, + 0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, + 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789, + 0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, + 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, + 0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, + 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, + 0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, + 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829, + 0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, + 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, + 0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, + 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, + 0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, + 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc, + 0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, + 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, + 0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, + 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, + 0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, + 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982, + 0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, + 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, + 0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, + 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, + 0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, + 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f, + 0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, + 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, + 0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, + 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, + 0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, + 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f, + 0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, + 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, + 0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, + 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, + 0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, + 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e, + 0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, + 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351 +}; + +// 查表法计算 CRC32C +uint32_t crc32c_sw(uint32_t crc, const uint8_t *data, size_t len) +{ + crc = ~crc; + for (size_t i = 0; i < len; i++) { + crc = crc32c_table[(crc ^ data[i]) & 0xFF] ^ (crc >> 8); + } + return ~crc; +} \ No newline at end of file diff --git a/KAELz4/test/kzip/main.c b/KAELz4/test/kzip/main.c index 6e1ea17..66d214b 100644 --- a/KAELz4/test/kzip/main.c +++ b/KAELz4/test/kzip/main.c @@ -327,13 +327,19 @@ static size_t write_outputFile(const char* outFileName, struct compress_out_buf base_offset += fragments[num].len; // 更新下一个分片的偏移量 uint32_t tmp_crc = crc32(0, out_buf_node->buf_addr, out_buf_node->len); if (out_buf_node->obuf_crc != 0 && out_buf_node->obuf_crc != tmp_crc) { - printf("Obuf crc err ! expected 0x%x recv 0x%x\n", tmp_crc, out_buf_node->obuf_crc); - return -1; + tmp_crc = crc32c_sw(0, out_buf_node->buf_addr, out_buf_node->len); + if (out_buf_node->obuf_crc != 0 && out_buf_node->obuf_crc != tmp_crc) { + printf("Obuf crc err ! expected 0x%x recv 0x%x\n", tmp_crc, out_buf_node->obuf_crc); + return -1; + } } tmp_crc = crc32(0, out_buf_node->src, out_buf_node->src_len); if (out_buf_node->ibuf_crc != 0 && out_buf_node->ibuf_crc != tmp_crc) { - printf("Ibuf crc err ! expected 0x%x recv 0x%x\n", tmp_crc, out_buf_node->ibuf_crc); - return -1; + tmp_crc = crc32c_sw(0, out_buf_node->src, out_buf_node->src_len); + if (out_buf_node->ibuf_crc != 0 && out_buf_node->ibuf_crc != tmp_crc) { + printf("Ibuf crc err ! expected 0x%x recv 0x%x\n", tmp_crc, out_buf_node->ibuf_crc); + return -1; + } } count += fwrite(out_buf_node->buf_addr, sizeof(Bytef), out_buf_node->len, outputFile); diff --git a/KAEZlib/src/v1/kaezip_async_comp.c b/KAEZlib/src/v1/kaezip_async_comp.c index 17850bd..75199ef 100644 --- a/KAEZlib/src/v1/kaezip_async_comp.c +++ b/KAEZlib/src/v1/kaezip_async_comp.c @@ -24,6 +24,7 @@ PREFL2_64B((l2ptr) + 3 * 64); \ } while (0) +#ifdef KAE_USE_CRC32 #define CRC32D_64B(crc, ptr) do { \ (crc) = __crc32d((crc), *(const uint64_t *)((ptr) + 8 * 0)); \ (crc) = __crc32d((crc), *(const uint64_t *)((ptr) + 8 * 1)); \ @@ -34,6 +35,19 @@ (crc) = __crc32d((crc), *(const uint64_t *)((ptr) + 8 * 6)); \ (crc) = __crc32d((crc), *(const uint64_t *)((ptr) + 8 * 7)); \ } while (0) +#else +#define CRC32D_64B(crc, ptr) do { \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 0)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 1)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 2)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 3)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 4)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 5)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 6)); \ + (crc) = __crc32cd((crc), *(const uint64_t *)((ptr) + 8 * 7)); \ +} while (0) +#endif + #define CRC32D_64B_X4(crc, ptr) do { \ CRC32D_64B((crc), (ptr) + 0 * 64); \ CRC32D_64B((crc), (ptr) + 1 * 64); \ @@ -41,6 +55,7 @@ CRC32D_64B((crc), (ptr) + 3 * 64); \ } while (0) +#ifdef KAE_USE_CRC32 static const uint32_t table0_[256] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, @@ -107,6 +122,74 @@ static const uint32_t table0_[256] = { 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d }; +#else +static const uint32_t table0_[256] = { + 0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, + 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb, + 0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, + 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, + 0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, + 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384, + 0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, + 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b, + 0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, + 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, + 0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, + 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa, + 0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, + 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a, + 0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, + 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, + 0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, + 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957, + 0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, + 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198, + 0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, + 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, + 0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, + 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7, + 0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, + 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789, + 0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, + 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, + 0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, + 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6, + 0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, + 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829, + 0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, + 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, + 0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, + 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c, + 0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, + 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc, + 0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, + 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, + 0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, + 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d, + 0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, + 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982, + 0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, + 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, + 0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, + 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed, + 0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, + 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f, + 0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, + 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, + 0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, + 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540, + 0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, + 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f, + 0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, + 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, + 0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, + 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e, + 0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, + 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e, + 0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, + 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351 +}; +#endif #define PLATFORM_IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN) @@ -141,7 +224,11 @@ static inline uint64_t LE_LOAD64(uint8_t* p) static inline void Slow_CRC32(uint64_t* l, uint8_t** p) { +#ifdef KAE_USE_CRC32 *l = __crc32d(*l, LE_LOAD64(*p)); +#else + *l = __crc32cd(*l, LE_LOAD64(*p)); +#endif *p += 8; } @@ -633,7 +720,7 @@ static void kaezip_async_compress_process(struct kaezip_async_ctrl *ctrl, void * } return; } - +#ifdef KAE_USE_CRC32 static uint32_t extract_checksum(struct kaezip_async_req *req, unsigned int output_len) { if (req == NULL || output_len < 8) { @@ -675,6 +762,7 @@ static uint32_t extract_checksum(struct kaezip_async_req *req, unsigned int outp (uint32_t)result[0]; return checksum; } +#endif static int kaezip_async_block_padding(struct kaezip_async_req *req, const struct wd_buf_list *source, void *dst_tmp, struct kaezip_priv_save_info *save_info) @@ -685,10 +773,12 @@ static int kaezip_async_block_padding(struct kaezip_async_req *req, const struct unsigned int output_len = op_data->produced; if (req->kz_ctx[0].comp_type == WCRYPTO_DEFLATE) { // extract checksum from dst buffer +#ifdef KAE_USE_CRC32 if (req->compress_ctx->result->ibuf_crc != NULL) { *req->compress_ctx->result->ibuf_crc = extract_checksum(req, output_len); req->compress_ctx->ibuf_checksum_flag = 1; } +#endif // remove checksum (4 Bytes) and isize (4 Bytes) in dst buffer output_len -= 8; } -- Gitee