diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 4b6cd7dc..89fec455 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -66785,6 +66785,12 @@ wuffs_xz__decoder__apply_filter_07_arm( wuffs_xz__decoder* self, wuffs_base__slice_u8 a_dst_slice); +WUFFS_BASE__GENERATED_C_CODE +static uint8_t +wuffs_xz__decoder__apply_filter_09_sparc( + wuffs_xz__decoder* self, + wuffs_base__slice_u8 a_dst_slice); + WUFFS_BASE__GENERATED_C_CODE static wuffs_base__status wuffs_xz__decoder__do_transform_io( @@ -67012,6 +67018,39 @@ wuffs_xz__decoder__apply_filter_07_arm( return ((uint8_t)(((uint64_t)(v_s.len)))); } +// -------- func xz.decoder.apply_filter_09_sparc + +WUFFS_BASE__GENERATED_C_CODE +static uint8_t +wuffs_xz__decoder__apply_filter_09_sparc( + wuffs_xz__decoder* self, + wuffs_base__slice_u8 a_dst_slice) { + wuffs_base__slice_u8 v_s = {0}; + uint32_t v_p = 0; + uint32_t v_x = 0; + + v_s = a_dst_slice; + v_p = self->private_impl.f_bcj_pos; + while (((uint64_t)(v_s.len)) >= 4u) { + v_x = ((((uint32_t)(v_s.ptr[0u])) << 24u) | + (((uint32_t)(v_s.ptr[1u])) << 16u) | + (((uint32_t)(v_s.ptr[2u])) << 8u) | + (((uint32_t)(v_s.ptr[3u])) << 0u)); + if (((v_x >> 22u) == 256u) || ((v_x >> 22u) == 511u)) { + v_x = (((uint32_t)(((uint32_t)(v_x << 2u)) - v_p)) >> 2u); + v_x = ((1073741824u - (v_x & 4194304u)) | 1073741824u | (v_x & 4194303u)); + v_s.ptr[0u] = ((uint8_t)((v_x >> 24u))); + v_s.ptr[1u] = ((uint8_t)((v_x >> 16u))); + v_s.ptr[2u] = ((uint8_t)((v_x >> 8u))); + v_s.ptr[3u] = ((uint8_t)((v_x >> 0u))); + } + v_p += 4u; + v_s = wuffs_base__slice_u8__subslice_i(v_s, 4u); + } + self->private_impl.f_bcj_pos = v_p; + return ((uint8_t)(((uint64_t)(v_s.len)))); +} + // -------- func xz.decoder.get_quirk WUFFS_BASE__GENERATED_C_CODE @@ -68020,6 +68059,9 @@ wuffs_xz__decoder__decode_block_header_sans_padding( if (v_filter_id == 7u) { self->private_impl.choosy_apply_non_final_filters = ( &wuffs_xz__decoder__apply_filter_07_arm); + } else if (v_filter_id == 9u) { + self->private_impl.choosy_apply_non_final_filters = ( + &wuffs_xz__decoder__apply_filter_09_sparc); } else { status = wuffs_base__make_status(wuffs_xz__error__unsupported_filter); goto exit; diff --git a/std/xz/decode_filter.wuffs b/std/xz/decode_filter.wuffs index 0f5a1a89..7ab25be9 100644 --- a/std/xz/decode_filter.wuffs +++ b/std/xz/decode_filter.wuffs @@ -78,3 +78,34 @@ pri func decoder.apply_filter_07_arm!(dst_slice: slice base.u8) base.u8 { this.bcj_pos = p ~mod- 8 return s.length() as base.u8 } + +pri func decoder.apply_filter_09_sparc!(dst_slice: slice base.u8) base.u8 { + var s : slice base.u8 + var p : base.u32 + var x : base.u32 + + s = args.dst_slice + p = this.bcj_pos + + while s.length() >= 4, + post s.length() < 4, + { + x = ((s[0] as base.u32) << 0x18) | + ((s[1] as base.u32) << 0x10) | + ((s[2] as base.u32) << 0x08) | + ((s[3] as base.u32) << 0x00) + if ((x >> 22) == 0x100) or ((x >> 22) == 0x1FF) { + x = ((x ~mod<< 2) ~mod- p) >> 2 + x = (0x4000_0000 - (x & 0x40_0000)) | 0x4000_0000 | (x & 0x3F_FFFF) + s[0] = ((x >> 0x18) & 0xFF) as base.u8 + s[1] = ((x >> 0x10) & 0xFF) as base.u8 + s[2] = ((x >> 0x08) & 0xFF) as base.u8 + s[3] = ((x >> 0x00) & 0xFF) as base.u8 + } + p ~mod+= 4 + s = s[4 ..] + } endwhile + + this.bcj_pos = p + return s.length() as base.u8 +} diff --git a/std/xz/decode_xz.wuffs b/std/xz/decode_xz.wuffs index 8c8164af..0b966732 100644 --- a/std/xz/decode_xz.wuffs +++ b/std/xz/decode_xz.wuffs @@ -423,6 +423,8 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { this.filters[f] = filter_id as base.u32 if filter_id == 0x07 { choose apply_non_final_filters = [apply_filter_07_arm] + } else if filter_id == 0x09 { + choose apply_non_final_filters = [apply_filter_09_sparc] } else { return "#unsupported filter" } diff --git a/test/3pdata/mzcat-checksums-of-xzsuite.txt b/test/3pdata/mzcat-checksums-of-xzsuite.txt index d24e970c..69f6faec 100644 --- a/test/3pdata/mzcat-checksums-of-xzsuite.txt +++ b/test/3pdata/mzcat-checksums-of-xzsuite.txt @@ -59,6 +59,7 @@ OK. db4847fb test/3pdata/xzsuite/good-1-lzma2-2.xz OK. db4847fb test/3pdata/xzsuite/good-1-lzma2-3.xz OK. db4847fb test/3pdata/xzsuite/good-1-lzma2-4.xz OK. 00000000 test/3pdata/xzsuite/good-1-lzma2-5.xz +OK. cc270da1 test/3pdata/xzsuite/good-1-sparc-lzma2.xz OK. 15a2a343 test/3pdata/xzsuite/good-2-lzma2.xz BAD 15a2a343 test/3pdata/xzsuite/good-known_size-with_eopm.lzma OK. 15a2a343 test/3pdata/xzsuite/good-known_size-without_eopm.lzma diff --git a/test/data/artificial-xz-filter/make.go b/test/data/artificial-xz-filter/make.go index f436d3ff..46a277d0 100644 --- a/test/data/artificial-xz-filter/make.go +++ b/test/data/artificial-xz-filter/make.go @@ -36,6 +36,7 @@ func main1() error { generator func() []byte }{ {"07", "arm", genArm}, + {"09", "sparc", genSparc}, } for _, recipe := range recipes { @@ -77,3 +78,37 @@ func genArm() []byte { } return b } + +func genSparc() []byte { + b := make([]byte, 256) + for i := range b { + b[i] = byte(i) + } + for i := 0; (i + 4) <= len(b); i += 4 { + x := peekU32BE(b[i:]) + switch pi[i>>2] & 3 { + case 0: + x = (x & 0x003F_FFFF) | 0x4000_0000 + case 1: + x = (x & 0x003F_FFFF) | 0x7FC0_0000 + default: + // No-op. + } + pokeU32BE(b[i:], x) + } + return b +} + +func peekU32BE(b []byte) uint32 { + return (uint32(b[0]) << 0x18) | + (uint32(b[1]) << 0x10) | + (uint32(b[2]) << 0x08) | + (uint32(b[3]) << 0x00) +} + +func pokeU32BE(b []byte, x uint32) { + b[0] = uint8(x >> 0x18) + b[1] = uint8(x >> 0x10) + b[2] = uint8(x >> 0x08) + b[3] = uint8(x >> 0x00) +} diff --git a/test/mzcat-checksums-of-data.txt b/test/mzcat-checksums-of-data.txt index 5276de9d..d5bde8fb 100644 --- a/test/mzcat-checksums-of-data.txt +++ b/test/mzcat-checksums-of-data.txt @@ -8,6 +8,7 @@ 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 OK. 9a3fb8ae test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm.dat.xz +OK. 0353bd24 test/data/artificial-xz-filter/xz-filter-09-0353bd24-sparc.dat.xz OK. acef87f1 test/data/enwik5.lzma OK. acef87f1 test/data/enwik5.xz OK. 3db2cdc6 test/data/midsummer.txt.bz2