diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index d0060521..4b6cd7dc 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -13921,9 +13921,10 @@ struct wuffs_xz__decoder__struct { uint32_t f_num_non_final_filters; uint32_t f_checksummer; bool f_ignore_checksum; - uint8_t f_bcj_undo_index; bool f_block_has_compressed_size; bool f_block_has_uncompressed_size; + uint8_t f_bcj_undo_index; + uint32_t f_bcj_pos; uint64_t f_block_compressed_size; uint64_t f_block_uncompressed_size; @@ -66987,7 +66988,28 @@ static uint8_t wuffs_xz__decoder__apply_filter_07_arm( wuffs_xz__decoder* self, wuffs_base__slice_u8 a_dst_slice) { - return 0u; + wuffs_base__slice_u8 v_s = {0}; + uint32_t v_p = 0; + uint32_t v_x = 0; + + v_s = a_dst_slice; + v_p = ((uint32_t)(self->private_impl.f_bcj_pos + 8u)); + while (((uint64_t)(v_s.len)) >= 4u) { + if (v_s.ptr[3u] == 235u) { + v_x = ((((uint32_t)(v_s.ptr[0u])) << 0u) | + (((uint32_t)(v_s.ptr[1u])) << 8u) | + (((uint32_t)(v_s.ptr[2u])) << 16u) | + (((uint32_t)(v_s.ptr[3u])) << 24u)); + v_x = (((uint32_t)(((v_x & 16777215u) << 2u) - v_p)) >> 2u); + v_s.ptr[0u] = ((uint8_t)((v_x >> 0u))); + v_s.ptr[1u] = ((uint8_t)((v_x >> 8u))); + v_s.ptr[2u] = ((uint8_t)((v_x >> 16u))); + } + v_p += 4u; + v_s = wuffs_base__slice_u8__subslice_i(v_s, 4u); + } + self->private_impl.f_bcj_pos = ((uint32_t)(v_p - 8u)); + return ((uint8_t)(((uint64_t)(v_s.len)))); } // -------- func xz.decoder.get_quirk @@ -67941,6 +67963,7 @@ wuffs_xz__decoder__decode_block_header_sans_padding( break; } } + self->private_impl.f_bcj_pos = 0u; self->private_impl.choosy_apply_non_final_filters = ( &wuffs_xz__decoder__apply_non_final_filters__choosy_default); v_f = 0u; diff --git a/std/xz/decode_filter.wuffs b/std/xz/decode_filter.wuffs index 1a92d565..0f5a1a89 100644 --- a/std/xz/decode_filter.wuffs +++ b/std/xz/decode_filter.wuffs @@ -51,5 +51,30 @@ pri func decoder.apply_non_final_filters!(dst_slice: slice base.u8) base.u8, } pri func decoder.apply_filter_07_arm!(dst_slice: slice base.u8) base.u8 { - return 0 + var s : slice base.u8 + var p : base.u32 + var x : base.u32 + + s = args.dst_slice + p = this.bcj_pos ~mod+ 8 + + while s.length() >= 4, + post s.length() < 4, + { + if s[3] == 0xEB { + x = ((s[0] as base.u32) << 0x00) | + ((s[1] as base.u32) << 0x08) | + ((s[2] as base.u32) << 0x10) | + ((s[3] as base.u32) << 0x18) + x = (((x & 0xFF_FFFF) << 2) ~mod- p) >> 2 + s[0] = ((x >> 0x00) & 0xFF) as base.u8 + s[1] = ((x >> 0x08) & 0xFF) as base.u8 + s[2] = ((x >> 0x10) & 0xFF) as base.u8 + } + p ~mod+= 4 + s = s[4 ..] + } endwhile + + this.bcj_pos = p ~mod- 8 + return s.length() as base.u8 } diff --git a/std/xz/decode_xz.wuffs b/std/xz/decode_xz.wuffs index 54744294..8c8164af 100644 --- a/std/xz/decode_xz.wuffs +++ b/std/xz/decode_xz.wuffs @@ -44,11 +44,12 @@ pub struct decoder? implements base.io_transformer( ignore_checksum : base.bool, - bcj_undo_index : base.u8, - block_has_compressed_size : base.bool, block_has_uncompressed_size : base.bool, + bcj_undo_index : base.u8, + bcj_pos : base.u32, + block_compressed_size : base.u64, block_uncompressed_size : base.u64, @@ -384,6 +385,7 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { // Configure the non-final filters. + this.bcj_pos = 0 choose apply_non_final_filters = [apply_non_final_filters] f = 0 while f < this.num_non_final_filters { diff --git a/test/data/artificial-xz-filter/xz-filter-09-0353bd24-sparc.dat b/test/data/artificial-xz-filter/xz-filter-09-0353bd24-sparc.dat new file mode 100644 index 00000000..d85ad42e Binary files /dev/null and b/test/data/artificial-xz-filter/xz-filter-09-0353bd24-sparc.dat differ diff --git a/test/data/artificial-xz-filter/xz-filter-09-0353bd24-sparc.dat.xz b/test/data/artificial-xz-filter/xz-filter-09-0353bd24-sparc.dat.xz new file mode 100644 index 00000000..84f68c53 Binary files /dev/null and b/test/data/artificial-xz-filter/xz-filter-09-0353bd24-sparc.dat.xz differ diff --git a/test/mzcat-checksums-of-data.txt b/test/mzcat-checksums-of-data.txt index f03ba9b6..5276de9d 100644 --- a/test/mzcat-checksums-of-data.txt +++ b/test/mzcat-checksums-of-data.txt @@ -7,7 +7,7 @@ OK. b19df306 test/data/archive.tar.bz2 OK. b19df306 test/data/archive.tar.gz OK. 6ddef9db test/data/artificial-bzip2/abraca.txt.bz2 OK. 6ddef9db test/data/artificial-bzip2/huffman-258.bz2 -BAD 07100884 test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm.dat.xz +OK. 9a3fb8ae test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm.dat.xz OK. acef87f1 test/data/enwik5.lzma OK. acef87f1 test/data/enwik5.xz OK. 3db2cdc6 test/data/midsummer.txt.bz2