mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
std/xz: implement apply_filter_08_armthumb
This commit is contained in:
1 parent
03bb04d80c
commit
8b3e598572
7 files changed
+124
No files matched your search
@@ -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_08_armthumb(
|
||||
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(
|
||||
@@ -67018,6 +67024,46 @@ wuffs_xz__decoder__apply_filter_07_arm(
|
||||
return ((uint8_t)(((uint64_t)(v_s.len))));
|
||||
}
|
||||
|
||||
// -------- func xz.decoder.apply_filter_08_armthumb
|
||||
|
||||
WUFFS_BASE__GENERATED_C_CODE
|
||||
static uint8_t
|
||||
wuffs_xz__decoder__apply_filter_08_armthumb(
|
||||
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 = ((uint32_t)(self->private_impl.f_bcj_pos + 4u));
|
||||
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 & 4160813056u) != 4160811008u) {
|
||||
v_p += 2u;
|
||||
v_s = wuffs_base__slice_u8__subslice_i(v_s, 2u);
|
||||
continue;
|
||||
}
|
||||
v_y = ((((uint32_t)(((uint8_t)(v_s.ptr[0u] & 255u)))) << 11u) |
|
||||
(((uint32_t)(((uint8_t)(v_s.ptr[1u] & 7u)))) << 19u) |
|
||||
(((uint32_t)(((uint8_t)(v_s.ptr[2u] & 255u)))) << 0u) |
|
||||
(((uint32_t)(((uint8_t)(v_s.ptr[3u] & 7u)))) << 8u));
|
||||
v_y = (((uint32_t)(((uint32_t)(v_y << 1u)) - v_p)) >> 1u);
|
||||
v_s.ptr[0u] = ((uint8_t)((v_y >> 11u)));
|
||||
v_s.ptr[1u] = ((uint8_t)((((v_y >> 19u) & 7u) | 240u)));
|
||||
v_s.ptr[2u] = ((uint8_t)((v_y >> 0u)));
|
||||
v_s.ptr[3u] = ((uint8_t)((((v_y >> 8u) & 7u) | 248u)));
|
||||
v_p += 4u;
|
||||
v_s = wuffs_base__slice_u8__subslice_i(v_s, 4u);
|
||||
}
|
||||
self->private_impl.f_bcj_pos = ((uint32_t)(v_p - 4u));
|
||||
return ((uint8_t)(((uint64_t)(v_s.len))));
|
||||
}
|
||||
|
||||
// -------- func xz.decoder.apply_filter_09_sparc
|
||||
|
||||
WUFFS_BASE__GENERATED_C_CODE
|
||||
@@ -68059,6 +68105,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 == 8u) {
|
||||
self->private_impl.choosy_apply_non_final_filters = (
|
||||
&wuffs_xz__decoder__apply_filter_08_armthumb);
|
||||
} else if (v_filter_id == 9u) {
|
||||
self->private_impl.choosy_apply_non_final_filters = (
|
||||
&wuffs_xz__decoder__apply_filter_09_sparc);
|
||||
|
||||
@@ -79,6 +79,44 @@ pri func decoder.apply_filter_07_arm!(dst_slice: slice base.u8) base.u8 {
|
||||
return s.length() as base.u8
|
||||
}
|
||||
|
||||
pri func decoder.apply_filter_08_armthumb!(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 ~mod+ 4
|
||||
|
||||
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 & 0xF800_F800) <> 0xF800_F000 {
|
||||
p ~mod+= 2
|
||||
s = s[2 ..]
|
||||
continue
|
||||
}
|
||||
y = (((s[0] & 0xFF) as base.u32) << 0x0B) |
|
||||
(((s[1] & 0x07) as base.u32) << 0x13) |
|
||||
(((s[2] & 0xFF) as base.u32) << 0x00) |
|
||||
(((s[3] & 0x07) as base.u32) << 0x08)
|
||||
y = ((y ~mod<< 1) ~mod- p) >> 1
|
||||
s[0] = (((y >> 0x0B) & 0xFF)) as base.u8
|
||||
s[1] = (((y >> 0x13) & 0x07) | 0xF0) as base.u8
|
||||
s[2] = (((y >> 0x00) & 0xFF)) as base.u8
|
||||
s[3] = (((y >> 0x08) & 0x07) | 0xF8) as base.u8
|
||||
p ~mod+= 4
|
||||
s = s[4 ..]
|
||||
} endwhile
|
||||
|
||||
this.bcj_pos = p ~mod- 4
|
||||
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
|
||||
|
||||
@@ -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 == 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 {
|
||||
|
||||
@@ -36,6 +36,7 @@ func main1() error {
|
||||
generator func() []byte
|
||||
}{
|
||||
{"07", "arm", genArm},
|
||||
{"08", "armthumb", genArmthumb},
|
||||
{"09", "sparc", genSparc},
|
||||
}
|
||||
|
||||
@@ -79,6 +80,25 @@ func genArm() []byte {
|
||||
return b
|
||||
}
|
||||
|
||||
func genArmthumb() []byte {
|
||||
b := make([]byte, 256)
|
||||
for i := range b {
|
||||
b[i] = byte(i)
|
||||
}
|
||||
for i := 0; (i + 4) <= len(b); {
|
||||
x := peekU32LE(b[i:])
|
||||
switch pi[i>>2] & 1 {
|
||||
case 0:
|
||||
i += 2
|
||||
case 1:
|
||||
x = (x & 0x07FF_07FF) | 0xF800_F000
|
||||
pokeU32LE(b[i:], x)
|
||||
i += 4
|
||||
}
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
func genSparc() []byte {
|
||||
b := make([]byte, 256)
|
||||
for i := range b {
|
||||
@@ -106,9 +126,23 @@ func peekU32BE(b []byte) uint32 {
|
||||
(uint32(b[3]) << 0x00)
|
||||
}
|
||||
|
||||
func peekU32LE(b []byte) uint32 {
|
||||
return (uint32(b[0]) << 0x00) |
|
||||
(uint32(b[1]) << 0x08) |
|
||||
(uint32(b[2]) << 0x10) |
|
||||
(uint32(b[3]) << 0x18)
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
|
||||
func pokeU32LE(b []byte, x uint32) {
|
||||
b[0] = uint8(x >> 0x00)
|
||||
b[1] = uint8(x >> 0x08)
|
||||
b[2] = uint8(x >> 0x10)
|
||||
b[3] = uint8(x >> 0x18)
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@@ -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. 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. acef87f1 test/data/enwik5.lzma
|
||||
OK. acef87f1 test/data/enwik5.xz
|
||||
|
||||
Reference in new issue
Block a user