From 6f4db1b138205e3d0c3178c63698b176ac014fa8 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Mon, 12 Feb 2024 20:15:45 +1100 Subject: [PATCH] std/xz: implement apply_filter_06_ia64 --- release/c/wuffs-unsupported-snapshot.c | 92 ++++++++++++++++- std/xz/decode_filter.wuffs | 95 ++++++++++++++++++ std/xz/decode_xz.wuffs | 6 +- test/data/artificial-xz-filter/make.go | 60 +++++++++++ .../xz-filter-06-e147593e-ia64.dat | 2 + .../xz-filter-06-e147593e-ia64.dat.xz | Bin 0 -> 312 bytes test/mzcat-checksums-of-data.txt | 1 + 7 files changed, 249 insertions(+), 7 deletions(-) create mode 100644 test/data/artificial-xz-filter/xz-filter-06-e147593e-ia64.dat create mode 100644 test/data/artificial-xz-filter/xz-filter-06-e147593e-ia64.dat.xz diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 1d269973..d560a8d9 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -66774,6 +66774,14 @@ WUFFS_XZ__FILTER_04_X86_MASK_TO_XOR_OPERAND[8] WUFFS_BASE__POTENTIALLY_UNUSED = 4294967295u, 16777215u, 65535u, 65535u, 255u, 255u, 255u, 255u, }; +static const uint8_t +WUFFS_XZ__FILTER_06_IA64_BRANCH_TABLE[32] WUFFS_BASE__POTENTIALLY_UNUSED = { + 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, + 4u, 4u, 6u, 6u, 0u, 0u, 7u, 7u, + 4u, 4u, 0u, 0u, 4u, 4u, 0u, 0u, +}; + static const uint8_t WUFFS_XZ__CHECKSUM_LENGTH[4] WUFFS_BASE__POTENTIALLY_UNUSED = { 0u, 4u, 8u, 32u, @@ -66807,6 +66815,12 @@ 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_06_ia64( + 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( @@ -67149,6 +67163,76 @@ wuffs_xz__decoder__apply_filter_05_powerpc( return ((uint8_t)(((uint64_t)(v_s.len)))); } +// -------- func xz.decoder.apply_filter_06_ia64 + +WUFFS_BASE__GENERATED_C_CODE +static uint8_t +wuffs_xz__decoder__apply_filter_06_ia64( + 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_mask = 0; + uint32_t v_slot = 0; + uint32_t v_bit_pos = 0; + uint32_t v_byte_pos = 0; + uint32_t v_bit_res = 0; + uint64_t v_x = 0; + uint32_t v_j = 0; + uint64_t v_norm = 0; + uint32_t v_addr = 0; + + v_s = a_dst_slice; + v_p = self->private_impl.f_bcj_pos; + while (((uint64_t)(v_s.len)) >= 16u) { + v_mask = ((uint32_t)(WUFFS_XZ__FILTER_06_IA64_BRANCH_TABLE[((uint8_t)(v_s.ptr[0u] & 31u))])); + v_slot = 0u; + while (true) { + do { + if (((v_mask >> v_slot) & 1u) == 0u) { + break; + } + v_bit_pos = ((v_slot * 41u) + 5u); + v_byte_pos = (v_bit_pos >> 3u); + v_bit_res = (v_bit_pos & 7u); + v_x = 0u; + v_j = 0u; + while (v_j < 6u) { + v_x |= (((uint64_t)(v_s.ptr[(v_j + v_byte_pos)])) << (8u * v_j)); + v_j += 1u; + } + v_norm = (v_x >> v_bit_res); + if ((((v_norm >> 37u) & 15u) != 5u) || (((v_norm >> 9u) & 7u) != 0u)) { + break; + } + v_addr = ((uint32_t)(((v_norm >> 13u) & 1048575u))); + v_addr |= (((uint32_t)(((v_norm >> 36u) & 1u))) << 20u); + v_addr <<= 4u; + v_addr -= v_p; + v_addr >>= 4u; + v_norm &= 18446743996400148479u; + v_norm |= (((uint64_t)((v_addr & 1048575u))) << 13u); + v_norm |= (((uint64_t)((v_addr & 1048576u))) << 16u); + v_x &= ((((uint64_t)(1u)) << v_bit_res) - 1u); + v_x |= ((uint64_t)(v_norm << v_bit_res)); + v_j = 0u; + while (v_j < 6u) { + v_s.ptr[(v_j + v_byte_pos)] = ((uint8_t)((v_x >> (8u * v_j)))); + v_j += 1u; + } + } while (0); + if (v_slot >= 2u) { + break; + } + v_slot += 1u; + } + v_p += 16u; + v_s = wuffs_base__slice_u8__subslice_i(v_s, 16u); + } + 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 @@ -68312,6 +68396,9 @@ wuffs_xz__decoder__decode_block_header_sans_padding( } 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 == 6u) { + self->private_impl.choosy_apply_non_final_filters = ( + &wuffs_xz__decoder__apply_filter_06_ia64); } else if (v_filter_id == 7u) { self->private_impl.choosy_apply_non_final_filters = ( &wuffs_xz__decoder__apply_filter_07_arm); @@ -68321,12 +68408,9 @@ wuffs_xz__decoder__decode_block_header_sans_padding( } else if (v_filter_id == 9u) { self->private_impl.choosy_apply_non_final_filters = ( &wuffs_xz__decoder__apply_filter_09_sparc); - } else if (v_filter_id == 10u) { + } else { self->private_impl.choosy_apply_non_final_filters = ( &wuffs_xz__decoder__apply_filter_0a_arm64); - } else { - status = wuffs_base__make_status(wuffs_xz__error__unsupported_filter); - goto exit; } { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); diff --git a/std/xz/decode_filter.wuffs b/std/xz/decode_filter.wuffs index 0f6ddb59..fbc4dbe0 100644 --- a/std/xz/decode_filter.wuffs +++ b/std/xz/decode_filter.wuffs @@ -200,6 +200,101 @@ pri func decoder.apply_filter_05_powerpc!(dst_slice: slice base.u8) base.u8 { return s.length() as base.u8 } +pri const FILTER_06_IA64_BRANCH_TABLE : roarray[32] base.u8[..= 7] = [ + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, + 4, 4, 6, 6, 0, 0, 7, 7, + 4, 4, 0, 0, 4, 4, 0, 0, +] + +pri func decoder.apply_filter_06_ia64!(dst_slice: slice base.u8) base.u8 { + var s : slice base.u8 + var p : base.u32 + var mask : base.u32[..= 7] + var slot : base.u32[..= 2] + var bit_pos : base.u32[..= 87] + var byte_pos : base.u32[..= 10] + var bit_res : base.u32[..= 7] + var x : base.u64 + var j : base.u32 + var norm : base.u64 + var addr : base.u32 + + s = args.dst_slice + p = this.bcj_pos + + while s.length() >= 16, + post s.length() < 16, + { + mask = FILTER_06_IA64_BRANCH_TABLE[s[0] & 0x1F] as base.u32 + + slot = 0 + while true, + inv s.length() >= 16, + { + while.goto_done true, + inv s.length() >= 16, + {{ + if ((mask >> slot) & 1) == 0 { + break.goto_done + } + + bit_pos = (slot * 41) + 5 + byte_pos = bit_pos >> 3 + bit_res = bit_pos & 7 + + x = 0 + j = 0 + while j < 6, + inv s.length() >= 16, + { + x |= (s[j + byte_pos] as base.u64) << (8 * j) + j += 1 + } endwhile + + norm = x >> bit_res + if (((norm >> 37) & 0x0F) <> 0x05) or + (((norm >> 9) & 0x07) <> 0x00) { + break.goto_done + } + + addr = ((norm >> 13) & 0x0F_FFFF) as base.u32 + addr |= (((norm >> 36) & 1) as base.u32) << 20 + addr <<= 4 + addr ~mod-= p + addr >>= 4 + + norm &= 0xFFFF_FFEE_0000_1FFF + norm |= ((addr & 0x0F_FFFF) as base.u64) << 13 + norm |= ((addr & 0x10_0000) as base.u64) << (36 - 20) + + x &= ((1 as base.u64) << bit_res) - 1 + x |= norm ~mod<< bit_res + j = 0 + while j < 6, + inv s.length() >= 16, + { + s[j + byte_pos] = ((x >> (8 * j)) & 0xFF) as base.u8 + j += 1 + } endwhile + + break.goto_done + }} endwhile.goto_done + + if slot >= 2 { + break + } + slot += 1 + } endwhile + + p ~mod+= 16 + s = s[16 ..] + } 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 1c23b52f..2e74b62d 100644 --- a/std/xz/decode_xz.wuffs +++ b/std/xz/decode_xz.wuffs @@ -427,16 +427,16 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) { 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 == 0x06 { + choose apply_non_final_filters = [apply_filter_06_ia64] } else if filter_id == 0x07 { choose apply_non_final_filters = [apply_filter_07_arm] } else if filter_id == 0x08 { choose apply_non_final_filters = [apply_filter_08_armthumb] } else if filter_id == 0x09 { choose apply_non_final_filters = [apply_filter_09_sparc] - } else if filter_id == 0x0A { - choose apply_non_final_filters = [apply_filter_0a_arm64] } else { - return "#unsupported filter" + choose apply_non_final_filters = [apply_filter_0a_arm64] } // We only support a zero BCJ offset. c8 = args.src.read_u8?() diff --git a/test/data/artificial-xz-filter/make.go b/test/data/artificial-xz-filter/make.go index e59459b0..4a583acc 100644 --- a/test/data/artificial-xz-filter/make.go +++ b/test/data/artificial-xz-filter/make.go @@ -39,6 +39,7 @@ func main1() error { // complicated (variable length instructions). Test coverage is instead // provided by xz-tests-files's good-1-x86-lzma2.xz file. {"05", "powerpc", genPowerpc}, + {"06", "ia64", genIa64}, {"07", "arm", genArm}, {"08", "armthumb", genArmthumb}, {"09", "sparc", genSparc}, @@ -88,6 +89,65 @@ func genPowerpc() []byte { return b } +func genIa64() []byte { + var bitMasks = [8]uint64{0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F} + interveneIndex := 0 + + b := make256Bytes() + for i := 0; (i + 16) <= len(b); i += 16 { + mask := 0 + switch pi[i>>2] & 3 { + case 0: + continue + case 1: + b[i], mask = 0x10, 4 + case 2: + b[i], mask = 0x12, 6 + case 3: + b[i], mask = 0x16, 7 + } + + loopUntilIntervention: + for true { + for slot, bitPos := 0, 5; slot < 3; slot, bitPos = slot+1, bitPos+41 { + if ((mask >> slot) & 1) == 0 { + continue + } + bytePos := bitPos >> 3 + bitRes := bitPos & 7 + instr := uint64(0) + for j := 0; j < 6; j++ { + instr |= uint64(b[i+j+bytePos]) << (8 * j) + } + + intervene := (pi[interveneIndex%len(pi)] & 3) == 0 + interveneIndex++ + if !intervene { + continue + } + norm := instr >> bitRes + norm = (norm &^ 0x01E0_0000_0000) | 0x00A0_0000_0000 + norm = (norm &^ 0x0E00) | 0x0000 + newInstr := (instr & bitMasks[bitRes]) | (norm << bitRes) + for j := 0; j < 6; j++ { + b[i+j+bytePos] = uint8(newInstr >> (8 * j)) + } + + instr = uint64(0) + for j := 0; j < 6; j++ { + instr |= uint64(b[i+j+bytePos]) << (8 * j) + } + norm = instr >> bitRes + if ((norm>>37)&0x0F) == 0x05 && ((norm>>9)&0x07) == 0x00 { + break loopUntilIntervention + } + panic("intervention failed") + } + } + } + return b +} + func genArm() []byte { b := make256Bytes() for i := range b { diff --git a/test/data/artificial-xz-filter/xz-filter-06-e147593e-ia64.dat b/test/data/artificial-xz-filter/xz-filter-06-e147593e-ia64.dat new file mode 100644 index 00000000..00835764 --- /dev/null +++ b/test/data/artificial-xz-filter/xz-filter-06-e147593e-ia64.dat @@ -0,0 +1,2 @@ + + _!"#$%&$()*+,-./0123456789:;<=>?BCDUFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmno1rstUvwxyz{|}~�‚ƒ„…†‡ˆ‰Š‹ˆ�Ž_�‘’“”•–—˜™š›œ�žŸ¡¢£¤¥¦§¨©ª«¨­®_±²³´µ6´¸¹ª»¼½¾¿ÂÃÄÕÆÇÈÉÊËÌÍÎÏÑÒÓÔÕÖרÙÚÛØÝÞ_áâãäåæçèéêëèíî_ðñòóôõö÷øùúûüýþÿ \ No newline at end of file diff --git a/test/data/artificial-xz-filter/xz-filter-06-e147593e-ia64.dat.xz b/test/data/artificial-xz-filter/xz-filter-06-e147593e-ia64.dat.xz new file mode 100644 index 0000000000000000000000000000000000000000..d6d012d695ed389ddd3b679170724c45dba09864 GIT binary patch literal 312 zcmexsUKJ6=z`*kC+7>q^Mm7dTMll99^}j(682&SSi)G+ua0p)(FaE~)Wc)LxW19l+ zt8ZWFzU^XrEaR=cFN0Tmor`?#8M6EAv~N2++7?JW-eNuLb6@iD$~y@mE2^GJCVme! zVV!F5R7Zzp@>=(jOa;A9&MYTaOO{1luCjdhY<8fzMN9kv$=uBvSH2$KpYHF#DN}r~ ze9v~j=Qi)(=$N}5{Hf?Y_xZohHJ_#w?(q7|>^b>-b5e`t+v9azOBT#{HEYt3_v_cy z-W6k!mALlFe&$C;SGLW@7edx9J-u~{nDL?sY=&y#rgGut7e1)!`?`LrYmI7pFz*Ea zf!FD}t@cI>rsr??-ng_m@{`rd9VQ7+k1ov?^WwVvS~!h?f#HAImuK5T{z@@0PGV|c XVqjPh^o)Juk@Vk83=9kmERj(Ft(uZd literal 0 HcmV?d00001 diff --git a/test/mzcat-checksums-of-data.txt b/test/mzcat-checksums-of-data.txt index 2cc5d937..1424200c 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. 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. 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