diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2022-11-14 23:14:41 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2022-11-14 23:16:38 +0200 |
| commit | 8370ec8edf9ddf8d1d9fef03d8d1027503ec4c35 (patch) | |
| tree | 5a5badf9edc6b6aaf3f8aa4e6cea15940c34b733 /src/liblzma/common | |
| parent | liblzma: Add fast CRC64 for 32/64-bit x86 using SSSE3 + SSE4.1 + CLMUL. (diff) | |
| download | xz-8370ec8edf9ddf8d1d9fef03d8d1027503ec4c35.tar.xz | |
Replace the experimental ARM64 filter with a new experimental version.
This is incompatible with the previous version.
This has space/tab fixes in filter_*.c and bcj.h too.
Diffstat (limited to 'src/liblzma/common')
| -rw-r--r-- | src/liblzma/common/filter_common.c | 14 | ||||
| -rw-r--r-- | src/liblzma/common/filter_decoder.c | 12 | ||||
| -rw-r--r-- | src/liblzma/common/filter_encoder.c | 17 |
3 files changed, 21 insertions, 22 deletions
diff --git a/src/liblzma/common/filter_common.c b/src/liblzma/common/filter_common.c index 52401aa9..0113035b 100644 --- a/src/liblzma/common/filter_common.c +++ b/src/liblzma/common/filter_common.c @@ -98,13 +98,13 @@ static const struct { }, #endif #if defined(HAVE_ENCODER_ARM64) || defined(HAVE_DECODER_ARM64) - { - .id = LZMA_FILTER_ARM64, - .options_size = sizeof(lzma_options_arm64), - .non_last_ok = true, - .last_ok = false, - .changes_size = false, - }, + { + .id = LZMA_FILTER_ARM64, + .options_size = sizeof(lzma_options_bcj), + .non_last_ok = true, + .last_ok = false, + .changes_size = false, + }, #endif #if defined(HAVE_ENCODER_SPARC) || defined(HAVE_DECODER_SPARC) { diff --git a/src/liblzma/common/filter_decoder.c b/src/liblzma/common/filter_decoder.c index 37af0cc2..b031ac62 100644 --- a/src/liblzma/common/filter_decoder.c +++ b/src/liblzma/common/filter_decoder.c @@ -100,12 +100,12 @@ static const lzma_filter_decoder decoders[] = { }, #endif #ifdef HAVE_DECODER_ARM64 - { - .id = LZMA_FILTER_ARM64, - .init = &lzma_simple_arm64_decoder_init, - .memusage = NULL, - .props_decode = &lzma_arm64_props_decode, - }, + { + .id = LZMA_FILTER_ARM64, + .init = &lzma_simple_arm64_decoder_init, + .memusage = NULL, + .props_decode = &lzma_simple_props_decode, + }, #endif #ifdef HAVE_DECODER_SPARC { diff --git a/src/liblzma/common/filter_encoder.c b/src/liblzma/common/filter_encoder.c index ec9e969d..1db78446 100644 --- a/src/liblzma/common/filter_encoder.c +++ b/src/liblzma/common/filter_encoder.c @@ -127,15 +127,14 @@ static const lzma_filter_encoder encoders[] = { }, #endif #ifdef HAVE_ENCODER_ARM64 - { - .id = LZMA_FILTER_ARM64, - .init = &lzma_simple_arm64_encoder_init, - .memusage = NULL, - .block_size = NULL, - .props_size_get = NULL, - .props_size_fixed = 1, - .props_encode = &lzma_arm64_props_encode, - }, + { + .id = LZMA_FILTER_ARM64, + .init = &lzma_simple_arm64_encoder_init, + .memusage = NULL, + .block_size = NULL, + .props_size_get = &lzma_simple_props_size, + .props_encode = &lzma_simple_props_encode, + }, #endif #ifdef HAVE_ENCODER_SPARC { |