root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

liblzma: CRC: Simplify table omission macros 

A macro is useful to prevent a single #if directive from
getting too ugly but only one macro is needed for all archs.

(cherry picked from commit 6286c1900c)
This commit is contained in:
Lasse Collin 2024-04-10 23:20:02 +03:00
parent 2a80827e23
commit 5d20a61205
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/liblzma/check/crc32_table.c
View File

@ -17,18 +17,16 @@
#if defined(HAVE_USABLE_CLMUL) && ((defined(__x86_64__) && defined(__SSSE3__) \ #if defined(HAVE_USABLE_CLMUL) && ((defined(__x86_64__) && defined(__SSSE3__) \
&& defined(__SSE4_1__) && defined(__PCLMUL__)) \ && defined(__SSE4_1__) && defined(__PCLMUL__)) \
|| (defined(__e2k__) && __iset__ >= 6)) || (defined(__e2k__) && __iset__ >= 6))
# define X86_CLMUL_NO_TABLE 1 # define NO_CRC32_TABLE
#endif
#if defined(HAVE_ARM64_CRC32) \ #elif defined(HAVE_ARM64_CRC32) \
&& !defined(WORDS_BIGENDIAN) \ && !defined(WORDS_BIGENDIAN) \
&& defined(__ARM_FEATURE_CRC32) && defined(__ARM_FEATURE_CRC32)
# define ARM64_CRC32_NO_TABLE 1 # define NO_CRC32_TABLE
#endif #endif
#if !defined(HAVE_ENCODERS) && (defined(X86_CLMUL_NO_TABLE) \ #if !defined(HAVE_ENCODERS) && defined(NO_CRC32_TABLE)
|| defined(ARM64_CRC32_NO_TABLE))
// No table needed. Use a typedef to avoid an empty translation unit. // No table needed. Use a typedef to avoid an empty translation unit.
typedef void lzma_crc32_dummy; typedef void lzma_crc32_dummy;

4
src/liblzma/check/crc64_table.c
View File

@ -17,11 +17,11 @@
#if defined(HAVE_USABLE_CLMUL) && ((defined(__x86_64__) && defined(__SSSE3__) \ #if defined(HAVE_USABLE_CLMUL) && ((defined(__x86_64__) && defined(__SSSE3__) \
&& defined(__SSE4_1__) && defined(__PCLMUL__)) \ && defined(__SSE4_1__) && defined(__PCLMUL__)) \
|| (defined(__e2k__) && __iset__ >= 6)) || (defined(__e2k__) && __iset__ >= 6))
# define X86_CLMUL_NO_TABLE 1 # define NO_CRC64_TABLE
#endif #endif
#ifdef X86_CLMUL_NO_TABLE #ifdef NO_CRC64_TABLE
// No table needed. Use a typedef to avoid an empty translation unit. // No table needed. Use a typedef to avoid an empty translation unit.
typedef void lzma_crc64_dummy; typedef void lzma_crc64_dummy;

5
src/liblzma/check/crc_common.h
View File

@ -74,7 +74,7 @@
// endian machine. // endian machine.
// //
// NOTE: Keep this and the next check in sync with the macro // NOTE: Keep this and the next check in sync with the macro
// ARM64_CRC32_NO_TABLE in crc32_table.c // NO_CRC32_TABLE in crc32_table.c
#if defined(HAVE_ARM64_CRC32) && !defined(WORDS_BIGENDIAN) #if defined(HAVE_ARM64_CRC32) && !defined(WORDS_BIGENDIAN)
// Allow ARM64 CRC32 instruction without a runtime check if // Allow ARM64 CRC32 instruction without a runtime check if
// __ARM_FEATURE_CRC32 is defined. GCC and Clang only define this if the // __ARM_FEATURE_CRC32 is defined. GCC and Clang only define this if the
@ -94,7 +94,8 @@
// generic version can be omitted. Note that this doesn't work with MSVC // generic version can be omitted. Note that this doesn't work with MSVC
// as I don't know how to detect the features here. // as I don't know how to detect the features here.
// //
// NOTE: Keep this in sync with the CLMUL_NO_TABLE macro in crc32_table.c. // NOTE: Keep this in sync with the NO_CRC32_TABLE macro in crc32_table.c
// and NO_CRC64_TABLE in crc64_table.c.
# if (defined(__SSSE3__) && defined(__SSE4_1__) && defined(__PCLMUL__)) \ # if (defined(__SSSE3__) && defined(__SSE4_1__) && defined(__PCLMUL__)) \
|| (defined(__e2k__) && __iset__ >= 6) || (defined(__e2k__) && __iset__ >= 6)
# define CRC32_ARCH_OPTIMIZED 1 # define CRC32_ARCH_OPTIMIZED 1