diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 66821184..1d269973 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -66801,6 +66801,12 @@ wuffs_xz__decoder__apply_filter_04_x86( wuffs_xz__decoder* self, wuffs_base__slice_u8 a_dst_slice); +WUFFS_BASE__GENERATED_C_CODE +static uint8_t +wuffs_xz__decoder__apply_filter_05_powerpc( + wuffs_xz__decoder* self, + wuffs_base__slice_u8 a_dst_slice); + WUFFS_BASE__GENERATED_C_CODE static uint8_t wuffs_xz__decoder__apply_filter_07_arm( @@ -67111,6 +67117,38 @@ wuffs_xz__decoder__apply_filter_04_x86( return ((uint8_t)(((uint64_t)(v_s.len)))); } +// -------- func xz.decoder.apply_filter_05_powerpc + +WUFFS_BASE__GENERATED_C_CODE +static uint8_t +wuffs_xz__decoder__apply_filter_05_powerpc( + 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 & 4227858435u) == 1207959553u) { + v_x = ((((uint32_t)((v_x & 67108860u) - v_p)) & 67108860u) | 1207959553u); + 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.apply_filter_07_arm WUFFS_BASE__GENERATED_C_CODE @@ -68271,6 +68309,9 @@ wuffs_xz__decoder__decode_block_header_sans_padding( if (v_filter_id == 4u) { self->private_impl.choosy_apply_non_final_filters = ( &wuffs_xz__decoder__apply_filter_04_x86); + } else if (v_filter_id == 5u) { + self->private_impl.choosy_apply_non_final_filters = ( + &wuffs_xz__decoder__apply_filter_05_powerpc); } else if (v_filter_id == 7u) { self->private_impl.choosy_apply_non_final_filters = ( &wuffs_xz__decoder__apply_filter_07_arm); diff --git a/std/xz/decode_filter.wuffs b/std/xz/decode_filter.wuffs index 5d3cbbfa..0f6ddb59 100644 --- a/std/xz/decode_filter.wuffs +++ b/std/xz/decode_filter.wuffs @@ -170,6 +170,36 @@ pri func decoder.apply_filter_04_x86!(dst_slice: slice base.u8) base.u8 { return s.length() as base.u8 } +pri func decoder.apply_filter_05_powerpc!(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 & 0xFC00_0003) == 0x4800_0001 { + x = (((x & 0x03FF_FFFC) ~mod- p) & 0x03FF_FFFC) | 0x4800_0001 + 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 +} + pri func decoder.apply_filter_07_arm!(dst_slice: slice base.u8) base.u8 { var s : slice base.u8 var p : base.u32 diff --git a/std/xz/decode_xz.wuffs b/std/xz/decode_xz.wuffs index 5887fbb7..1c23b52f 100644 --- a/std/xz/decode_xz.wuffs +++ b/std/xz/decode_xz.wuffs @@ -425,6 +425,8 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { this.filters[f] = filter_id as base.u32 if filter_id == 0x04 { choose apply_non_final_filters = [apply_filter_04_x86] + } else if filter_id == 0x05 { + choose apply_non_final_filters = [apply_filter_05_powerpc] } else if filter_id == 0x07 { choose apply_non_final_filters = [apply_filter_07_arm] } else if filter_id == 0x08 { diff --git a/test/3pdata/mzcat-checksums-of-xzsuite.txt b/test/3pdata/mzcat-checksums-of-xzsuite.txt index 3af4cef4..45fc633b 100644 --- a/test/3pdata/mzcat-checksums-of-xzsuite.txt +++ b/test/3pdata/mzcat-checksums-of-xzsuite.txt @@ -55,6 +55,7 @@ OK. 15a2a343 test/3pdata/xzsuite/good-1-check-crc64.xz OK. 15a2a343 test/3pdata/xzsuite/good-1-check-none.xz OK. 15a2a343 test/3pdata/xzsuite/good-1-check-sha256.xz OK. f7c66eb5 test/3pdata/xzsuite/good-1-delta-lzma2.tiff.xz +OK. 00000000 test/3pdata/xzsuite/good-1-empty-bcj-lzma2.xz OK. db4847fb test/3pdata/xzsuite/good-1-lzma2-1.xz OK. db4847fb test/3pdata/xzsuite/good-1-lzma2-2.xz OK. db4847fb test/3pdata/xzsuite/good-1-lzma2-3.xz diff --git a/test/data/artificial-xz-filter/make.go b/test/data/artificial-xz-filter/make.go index 2a6a6b19..e59459b0 100644 --- a/test/data/artificial-xz-filter/make.go +++ b/test/data/artificial-xz-filter/make.go @@ -38,6 +38,7 @@ func main1() error { // No test case generated for 04/x86, as the x86 CPU bytecode format is // complicated (variable length instructions). Test coverage is instead // provided by xz-tests-files's good-1-x86-lzma2.xz file. + {"05", "powerpc", genPowerpc}, {"07", "arm", genArm}, {"08", "armthumb", genArmthumb}, {"09", "sparc", genSparc}, @@ -72,6 +73,21 @@ const pi = "3.141592653589793238462643383279502884197169399375105820974944592307 // Call, Jump) filters. See xz-embedded's linux/lib/xz/xz_dec_bcj.c for C code // implementations. +func genPowerpc() []byte { + b := make256Bytes() + for i := 0; (i + 4) <= len(b); i += 4 { + x := peekU32BE(b[i:]) + switch pi[i>>2] & 1 { + case 0: + x = (x & 0x03FF_FFFC) | 0x4800_0001 + default: + continue + } + pokeU32BE(b[i:], x) + } + return b +} + func genArm() []byte { b := make256Bytes() for i := range b { diff --git a/test/data/artificial-xz-filter/xz-filter-05-fa3907fb-powerpc.dat b/test/data/artificial-xz-filter/xz-filter-05-fa3907fb-powerpc.dat new file mode 100644 index 00000000..9a723775 Binary files /dev/null and b/test/data/artificial-xz-filter/xz-filter-05-fa3907fb-powerpc.dat differ diff --git a/test/data/artificial-xz-filter/xz-filter-05-fa3907fb-powerpc.dat.xz b/test/data/artificial-xz-filter/xz-filter-05-fa3907fb-powerpc.dat.xz new file mode 100644 index 00000000..710ef30e Binary files /dev/null and b/test/data/artificial-xz-filter/xz-filter-05-fa3907fb-powerpc.dat.xz differ diff --git a/test/mzcat-checksums-of-data.txt b/test/mzcat-checksums-of-data.txt index 49830eba..2cc5d937 100644 --- a/test/mzcat-checksums-of-data.txt +++ b/test/mzcat-checksums-of-data.txt @@ -7,6 +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 +OK. fa3907fb test/data/artificial-xz-filter/xz-filter-05-fa3907fb-powerpc.dat.xz OK. 9a3fb8ae test/data/artificial-xz-filter/xz-filter-07-9a3fb8ae-arm.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