std/xz: implement apply_filter_0a_arm64

This commit is contained in:
Nigel Tao committed 2024-02-11 11:42:40 +11:00
1 parent 8b3e598572
commit 76a17ce742
8 files changed
+138 -11

No files matched your search

+56
View File
@@ -66797,6 +66797,12 @@ wuffs_xz__decoder__apply_filter_09_sparc(
wuffs_xz__decoder* self,
wuffs_base__slice_u8 a_dst_slice);
WUFFS_BASE__GENERATED_C_CODE
static uint8_t
wuffs_xz__decoder__apply_filter_0a_arm64(
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(
@@ -67097,6 +67103,53 @@ wuffs_xz__decoder__apply_filter_09_sparc(
return ((uint8_t)(((uint64_t)(v_s.len))));
}
// -------- func xz.decoder.apply_filter_0a_arm64
WUFFS_BASE__GENERATED_C_CODE
static uint8_t
wuffs_xz__decoder__apply_filter_0a_arm64(
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;
uint32_t v_y = 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])) << 0u) |
(((uint32_t)(v_s.ptr[1u])) << 8u) |
(((uint32_t)(v_s.ptr[2u])) << 16u) |
(((uint32_t)(v_s.ptr[3u])) << 24u));
if ((v_x >> 26u) == 37u) {
v_y = ((uint32_t)(v_x - (v_p >> 2u)));
v_x = (2483027968u | (v_y & 67108863u));
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_s.ptr[3u] = ((uint8_t)((v_x >> 24u)));
} else if ((v_x & 2667577344u) == 2415919104u) {
v_y = (((v_x >> 29u) & 3u) | ((v_x >> 3u) & 2097148u));
if ((((uint32_t)(v_y + 131072u)) & 1835008u) == 0u) {
v_y -= (v_p >> 12u);
v_x &= 2415919135u;
v_x |= ((v_y & 3u) << 29u);
v_x |= ((v_y & 262140u) << 3u);
v_x |= (((uint32_t)(0u - (v_y & 131072u))) & 14680064u);
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_s.ptr[3u] = ((uint8_t)((v_x >> 24u)));
}
}
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
@@ -68111,6 +68164,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) {
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;
+48
View File
@@ -147,3 +147,51 @@ pri func decoder.apply_filter_09_sparc!(dst_slice: slice base.u8) base.u8 {
this.bcj_pos = p
return s.length() as base.u8
}
pri func decoder.apply_filter_0a_arm64!(dst_slice: slice base.u8) base.u8 {
var s : slice base.u8
var p : base.u32
var x : base.u32
var y : base.u32
s = args.dst_slice
p = this.bcj_pos
while s.length() >= 4,
post s.length() < 4,
{
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)
if (x >> 26) == 0x25 {
// Arm64 BL instruction.
y = x ~mod- (p >> 2)
x = 0x9400_0000 | (y & 0x03FF_FFFF)
s[0] = ((x >> 0x00) & 0xFF) as base.u8
s[1] = ((x >> 0x08) & 0xFF) as base.u8
s[2] = ((x >> 0x10) & 0xFF) as base.u8
s[3] = ((x >> 0x18) & 0xFF) as base.u8
} else if (x & 0x9F00_0000) == 0x9000_0000 {
// Arm64 ADRP instruction. We only modify relative addresses in the
// range +/-512 MiB.
y = ((x >> 29) & 0x03) | ((x >> 3) & 0x1F_FFFC)
if ((y ~mod+ 0x02_0000) & 0x1C_0000) == 0 {
y ~mod-= p >> 12
x &= 0x9000_001F
x |= (y & 3) << 29
x |= (y & 0x03_FFFC) << 3
x |= (0 ~mod- (y & 0x02_0000)) & 0xE0_0000
s[0] = ((x >> 0x00) & 0xFF) as base.u8
s[1] = ((x >> 0x08) & 0xFF) as base.u8
s[2] = ((x >> 0x10) & 0xFF) as base.u8
s[3] = ((x >> 0x18) & 0xFF) as base.u8
}
}
p ~mod+= 4
s = s[4 ..]
} endwhile
this.bcj_pos = p
return s.length() as base.u8
}
+2
View File
@@ -427,6 +427,8 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) {
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"
}
@@ -46,6 +46,7 @@ OK. 00000000 test/3pdata/xzsuite/good-0cat-empty.xz
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. 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
+30 -11
View File
@@ -38,6 +38,7 @@ func main1() error {
{"07", "arm", genArm},
{"08", "armthumb", genArmthumb},
{"09", "sparc", genSparc},
{"0a", "arm64", genArm64},
}
for _, recipe := range recipes {
@@ -69,9 +70,8 @@ const pi = "3.141592653589793238462643383279502884197169399375105820974944592307
// implementations.
func genArm() []byte {
b := make([]byte, 256)
b := make256Bytes()
for i := range b {
b[i] = byte(i)
if ((i & 3) == 3) &&
((pi[i>>2] & 1) != 0) {
b[i] = 0xEB
@@ -81,10 +81,7 @@ func genArm() []byte {
}
func genArmthumb() []byte {
b := make([]byte, 256)
for i := range b {
b[i] = byte(i)
}
b := make256Bytes()
for i := 0; (i + 4) <= len(b); {
x := peekU32LE(b[i:])
switch pi[i>>2] & 1 {
@@ -100,10 +97,7 @@ func genArmthumb() []byte {
}
func genSparc() []byte {
b := make([]byte, 256)
for i := range b {
b[i] = byte(i)
}
b := make256Bytes()
for i := 0; (i + 4) <= len(b); i += 4 {
x := peekU32BE(b[i:])
switch pi[i>>2] & 3 {
@@ -112,13 +106,38 @@ func genSparc() []byte {
case 1:
x = (x & 0x003F_FFFF) | 0x7FC0_0000
default:
// No-op.
continue
}
pokeU32BE(b[i:], x)
}
return b
}
func genArm64() []byte {
b := make256Bytes()
for i := 0; (i + 4) <= len(b); i += 4 {
x := peekU32LE(b[i:])
switch pi[i>>2] & 3 {
case 0:
x = (x & 0x03FF_FFFF) | 0x9400_0000
case 1:
x = (x & 0x60FF_FFFF) | 0x90C0_0000
default:
continue
}
pokeU32LE(b[i:], x)
}
return b
}
func make256Bytes() []byte {
b := make([]byte, 256)
for i := range b {
b[i] = byte(i)
}
return b
}
func peekU32BE(b []byte) uint32 {
return (uint32(b[0]) << 0x18) |
(uint32(b[1]) << 0x10) |
+1
View File
@@ -10,6 +10,7 @@ OK. 6ddef9db test/data/artificial-bzip2/huffman-258.bz2
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
OK. dfdb871b test/data/artificial-xz-filter/xz-filter-0a-dfdb871b-arm64.dat.xz
OK. acef87f1 test/data/enwik5.lzma
OK. acef87f1 test/data/enwik5.xz
OK. 3db2cdc6 test/data/midsummer.txt.bz2