diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index d560a8d9..daa3e282 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -13960,6 +13960,7 @@ struct wuffs_xz__decoder__struct { uint8_t v_flags; uint32_t v_shift; uint32_t v_f; + uint64_t scratch; } s_decode_block_header_sans_padding; } private_data; @@ -68335,7 +68336,6 @@ wuffs_xz__decoder__decode_block_header_sans_padding( break; } } - self->private_impl.f_bcj_pos = 0u; self->private_impl.f_bcj_x86_prev_mask = 0u; self->private_impl.choosy_apply_non_final_filters = ( &wuffs_xz__decoder__apply_non_final_filters__choosy_default); @@ -68421,7 +68421,39 @@ wuffs_xz__decoder__decode_block_header_sans_padding( uint8_t t_6 = *iop_a_src++; v_c8 = t_6; } - if (v_c8 != 0u) { + if (v_c8 == 0u) { + self->private_impl.f_bcj_pos = 0u; + } else if (v_c8 == 4u) { + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); + uint32_t t_7; + if (WUFFS_BASE__LIKELY(io2_a_src - iop_a_src >= 4)) { + t_7 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src); + iop_a_src += 4; + } else { + self->private_data.s_decode_block_header_sans_padding.scratch = 0; + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); + while (true) { + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint64_t* scratch = &self->private_data.s_decode_block_header_sans_padding.scratch; + uint32_t num_bits_7 = ((uint32_t)(*scratch >> 56)); + *scratch <<= 8; + *scratch >>= 8; + *scratch |= ((uint64_t)(*iop_a_src++)) << num_bits_7; + if (num_bits_7 == 24) { + t_7 = ((uint32_t)(*scratch)); + break; + } + num_bits_7 += 8u; + *scratch |= ((uint64_t)(num_bits_7)) << 56; + } + } + self->private_impl.f_bcj_pos = t_7; + } + } else { status = wuffs_base__make_status(wuffs_xz__error__unsupported_filter); goto exit; } @@ -68429,30 +68461,17 @@ wuffs_xz__decoder__decode_block_header_sans_padding( v_f += 1u; } { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); goto suspend; } - uint8_t t_7 = *iop_a_src++; - v_filter_id = t_7; + uint8_t t_8 = *iop_a_src++; + v_filter_id = t_8; } if (v_filter_id == 33u) { { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { - status = wuffs_base__make_status(wuffs_base__suspension__short_read); - goto suspend; - } - uint8_t t_8 = *iop_a_src++; - v_c8 = t_8; - } - if (v_c8 != 1u) { - status = wuffs_base__make_status(wuffs_xz__error__bad_filter); - goto exit; - } - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(10); + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { status = wuffs_base__make_status(wuffs_base__suspension__short_read); goto suspend; @@ -68460,6 +68479,19 @@ wuffs_xz__decoder__decode_block_header_sans_padding( uint8_t t_9 = *iop_a_src++; v_c8 = t_9; } + if (v_c8 != 1u) { + status = wuffs_base__make_status(wuffs_xz__error__bad_filter); + goto exit; + } + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint8_t t_10 = *iop_a_src++; + v_c8 = t_10; + } v_status = wuffs_lzma__decoder__set_quirk(&self->private_data.f_lzma, 1348001792u, (2u | (((uint64_t)(v_c8)) << 8u))); if ( ! wuffs_base__status__is_ok(&v_status)) { status = wuffs_base__make_status(wuffs_xz__error__bad_filter); diff --git a/std/xz/decode_xz.wuffs b/std/xz/decode_xz.wuffs index 2e74b62d..50bb338e 100644 --- a/std/xz/decode_xz.wuffs +++ b/std/xz/decode_xz.wuffs @@ -386,7 +386,6 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { // Configure the non-final filters. - this.bcj_pos = 0 this.bcj_x86_prev_mask = 0 choose apply_non_final_filters = [apply_non_final_filters] f = 0 @@ -438,9 +437,13 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { } else { choose apply_non_final_filters = [apply_filter_0a_arm64] } - // We only support a zero BCJ offset. + c8 = args.src.read_u8?() - if c8 <> 0x00 { + if c8 == 0x00 { + this.bcj_pos = 0 + } else if c8 == 0x04 { + this.bcj_pos = args.src.read_u32le?() + } else { return "#unsupported filter" } } diff --git a/test/3pdata/mzcat-checksums-of-xzsuite.txt b/test/3pdata/mzcat-checksums-of-xzsuite.txt index 45fc633b..67b30ff7 100644 --- a/test/3pdata/mzcat-checksums-of-xzsuite.txt +++ b/test/3pdata/mzcat-checksums-of-xzsuite.txt @@ -47,6 +47,7 @@ OK. 00000000 test/3pdata/xzsuite/good-0catpad-empty.xz OK. 00000000 test/3pdata/xzsuite/good-0pad-empty.xz OK. db4847fb test/3pdata/xzsuite/good-1-3delta-lzma2.xz OK. d4e17ca0 test/3pdata/xzsuite/good-1-arm64-lzma2-1.xz +OK. d4e17ca0 test/3pdata/xzsuite/good-1-arm64-lzma2-2.xz OK. 15a2a343 test/3pdata/xzsuite/good-1-block_header-1.xz OK. 15a2a343 test/3pdata/xzsuite/good-1-block_header-2.xz OK. 15a2a343 test/3pdata/xzsuite/good-1-block_header-3.xz diff --git a/test/data/artificial-xz-filter/make.go b/test/data/artificial-xz-filter/make.go index 4a583acc..d81c02a7 100644 --- a/test/data/artificial-xz-filter/make.go +++ b/test/data/artificial-xz-filter/make.go @@ -20,6 +20,7 @@ import ( "hash/crc32" "os" "os/exec" + "strings" ) func main() { @@ -41,6 +42,7 @@ func main1() error { {"05", "powerpc", genPowerpc}, {"06", "ia64", genIa64}, {"07", "arm", genArm}, + {"07", "arm=start=1000", genArm}, {"08", "armthumb", genArmthumb}, {"09", "sparc", genSparc}, {"0a", "arm64", genArm64}, @@ -51,7 +53,7 @@ func main1() error { filename := fmt.Sprintf("xz-filter-%s-%08x-%s.dat", recipe.filterID, crc32.ChecksumIEEE(contents), - recipe.filterName) + strings.Replace(recipe.filterName, "=", "_", -1)) if err := os.WriteFile(filename, contents, 0644); err != nil { return err } diff --git a/test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm_start_1000.dat b/test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm_start_1000.dat new file mode 100644 index 00000000..51e4d410 Binary files /dev/null and b/test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm_start_1000.dat differ diff --git a/test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm_start_1000.dat.xz b/test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm_start_1000.dat.xz new file mode 100644 index 00000000..f8bb4cbb Binary files /dev/null and b/test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm_start_1000.dat.xz differ diff --git a/test/mzcat-checksums-of-data.txt b/test/mzcat-checksums-of-data.txt index 1424200c..62c63370 100644 --- a/test/mzcat-checksums-of-data.txt +++ b/test/mzcat-checksums-of-data.txt @@ -10,6 +10,7 @@ OK. 6ddef9db test/data/artificial-bzip2/huffman-258.bz2 OK. fa3907fb test/data/artificial-xz-filter/xz-filter-05-fa3907fb-powerpc.dat.xz OK. e147593e test/data/artificial-xz-filter/xz-filter-06-e147593e-ia64.dat.xz OK. 9a3fb8ae test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm.dat.xz +OK. 9a3fb8ae test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm_start_1000.dat.xz OK. 84e8999d test/data/artificial-xz-filter/xz-filter-08-84e8999d-armthumb.dat.xz OK. 0353bd24 test/data/artificial-xz-filter/xz-filter-09-0353bd24-sparc.dat.xz OK. dfdb871b test/data/artificial-xz-filter/xz-filter-0a-dfdb871b-arm64.dat.xz