std/xz: refactor apply_non_final_filters

This commit is contained in:
Nigel Tao committed 2024-02-09 20:18:56 +11:00
1 parent 2b4e8ce6a2
commit 98dae3c1c0
3 files changed
+104 -95

No files matched your search

+56 -56
View File
@@ -66759,6 +66759,12 @@ WUFFS_XZ__CHECKSUM_LENGTH[4] WUFFS_BASE__POTENTIALLY_UNUSED = {
// ---------------- Private Function Prototypes
WUFFS_BASE__GENERATED_C_CODE
static wuffs_base__empty_struct
wuffs_xz__decoder__apply_non_final_filters(
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(
@@ -66779,12 +66785,6 @@ wuffs_xz__decoder__decode_block_header_sans_padding(
wuffs_xz__decoder* self,
wuffs_base__io_buffer* a_src);
WUFFS_BASE__GENERATED_C_CODE
static wuffs_base__empty_struct
wuffs_xz__decoder__apply_non_final_filters(
wuffs_xz__decoder* self,
wuffs_base__slice_u8 a_dst_slice);
// ---------------- VTables
const wuffs_base__io_transformer__func_ptrs
@@ -66901,6 +66901,56 @@ sizeof__wuffs_xz__decoder(void) {
// ---------------- Function Implementations
// -------- func xz.decoder.apply_non_final_filters
WUFFS_BASE__GENERATED_C_CODE
static wuffs_base__empty_struct
wuffs_xz__decoder__apply_non_final_filters(
wuffs_xz__decoder* self,
wuffs_base__slice_u8 a_dst_slice) {
uint32_t v_f = 0;
uint64_t v_i = 0;
uint32_t v_filter_id = 0;
uint32_t v_delta_dist = 0;
uint32_t v_delta_pos = 0;
uint8_t v_c8 = 0;
if (self->private_impl.f_num_non_final_filters <= 0u) {
return wuffs_base__make_empty_struct();
}
v_f = (self->private_impl.f_num_non_final_filters - 1u);
while (true) {
v_filter_id = (self->private_impl.f_filters[v_f] & 127u);
if (v_filter_id == 3u) {
v_delta_dist = (((self->private_impl.f_filters[v_f] >> 8u) & 255u) + 1u);
v_delta_pos = (self->private_impl.f_filters[v_f] >> 24u);
v_i = 0u;
while (v_i < ((uint64_t)(a_dst_slice.len))) {
v_c8 = a_dst_slice.ptr[v_i];
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
v_c8 += self->private_data.f_filter_data[v_f][(((uint32_t)(v_delta_dist + v_delta_pos)) & 255u)];
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
self->private_data.f_filter_data[v_f][(v_delta_pos & 255u)] = v_c8;
v_delta_pos -= 1u;
a_dst_slice.ptr[v_i] = v_c8;
v_i += 1u;
}
self->private_impl.f_filters[v_f] &= 65535u;
self->private_impl.f_filters[v_f] |= ((uint32_t)(v_delta_pos << 24u));
}
if (v_f <= 0u) {
break;
}
v_f -= 1u;
}
return wuffs_base__make_empty_struct();
}
// -------- func xz.decoder.get_quirk
WUFFS_BASE__GENERATED_C_CODE
@@ -67936,56 +67986,6 @@ wuffs_xz__decoder__decode_block_header_sans_padding(
return status;
}
// -------- func xz.decoder.apply_non_final_filters
WUFFS_BASE__GENERATED_C_CODE
static wuffs_base__empty_struct
wuffs_xz__decoder__apply_non_final_filters(
wuffs_xz__decoder* self,
wuffs_base__slice_u8 a_dst_slice) {
uint32_t v_f = 0;
uint64_t v_i = 0;
uint32_t v_filter_id = 0;
uint32_t v_delta_dist = 0;
uint32_t v_delta_pos = 0;
uint8_t v_c8 = 0;
if (self->private_impl.f_num_non_final_filters <= 0u) {
return wuffs_base__make_empty_struct();
}
v_f = (self->private_impl.f_num_non_final_filters - 1u);
while (true) {
v_filter_id = (self->private_impl.f_filters[v_f] & 127u);
if (v_filter_id == 3u) {
v_delta_dist = (((self->private_impl.f_filters[v_f] >> 8u) & 255u) + 1u);
v_delta_pos = (self->private_impl.f_filters[v_f] >> 24u);
v_i = 0u;
while (v_i < ((uint64_t)(a_dst_slice.len))) {
v_c8 = a_dst_slice.ptr[v_i];
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wconversion"
#endif
v_c8 += self->private_data.f_filter_data[v_f][(((uint32_t)(v_delta_dist + v_delta_pos)) & 255u)];
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
self->private_data.f_filter_data[v_f][(v_delta_pos & 255u)] = v_c8;
v_delta_pos -= 1u;
a_dst_slice.ptr[v_i] = v_c8;
v_i += 1u;
}
self->private_impl.f_filters[v_f] &= 65535u;
self->private_impl.f_filters[v_f] |= ((uint32_t)(v_delta_pos << 24u));
}
if (v_f <= 0u) {
break;
}
v_f -= 1u;
}
return wuffs_base__make_empty_struct();
}
#endif // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XZ)
#if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+48
View File
@@ -0,0 +1,48 @@
// Copyright 2023 The Wuffs Authors.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
//
// SPDX-License-Identifier: Apache-2.0 OR MIT
pri func decoder.apply_non_final_filters!(dst_slice: slice base.u8) {
var f : base.u32[..= 2]
var i : base.u64
var filter_id : base.u32[..= 0x7F]
var delta_dist : base.u32[..= 0x100]
var delta_pos : base.u32
var c8 : base.u8
if this.num_non_final_filters <= 0 {
return nothing
}
f = this.num_non_final_filters - 1
while true {
filter_id = this.filters[f] & 0x7F
if filter_id == 0x03 { // Delta.
delta_dist = ((this.filters[f] >> 8) & 0xFF) + 1
delta_pos = this.filters[f] >> 24
i = 0
while i < args.dst_slice.length() {
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.dst_slice.length())
c8 = args.dst_slice[i]
c8 ~mod+= this.filter_data[f][(delta_dist ~mod+ delta_pos) & 0xFF]
this.filter_data[f][delta_pos & 0xFF] = c8
delta_pos ~mod-= 1
args.dst_slice[i] = c8
i += 1
} endwhile
this.filters[f] &= 0xFFFF
this.filters[f] |= (delta_pos ~mod<< 24)
}
if f <= 0 {
break
}
f -= 1
} endwhile
}
-39
View File
@@ -411,45 +411,6 @@ pri func decoder.decode_block_header_sans_padding?(src: base.io_reader) {
}
}
pri func decoder.apply_non_final_filters!(dst_slice: slice base.u8) {
var f : base.u32[..= 2]
var i : base.u64
var filter_id : base.u32[..= 0x7F]
var delta_dist : base.u32[..= 0x100]
var delta_pos : base.u32
var c8 : base.u8
if this.num_non_final_filters <= 0 {
return nothing
}
f = this.num_non_final_filters - 1
while true {
filter_id = this.filters[f] & 0x7F
if filter_id == 0x03 { // Delta.
delta_dist = ((this.filters[f] >> 8) & 0xFF) + 1
delta_pos = this.filters[f] >> 24
i = 0
while i < args.dst_slice.length() {
assert i < 0xFFFF_FFFF_FFFF_FFFF via "a < b: a < c; c <= b"(c: args.dst_slice.length())
c8 = args.dst_slice[i]
c8 ~mod+= this.filter_data[f][(delta_dist ~mod+ delta_pos) & 0xFF]
this.filter_data[f][delta_pos & 0xFF] = c8
delta_pos ~mod-= 1
args.dst_slice[i] = c8
i += 1
} endwhile
this.filters[f] &= 0xFFFF
this.filters[f] |= (delta_pos ~mod<< 24)
}
if f <= 0 {
break
}
f -= 1
} endwhile
}
pri const CHECKSUM_LENGTH : roarray[4] base.u8 = [
0x00, // 0: None.
0x04, // 1: CRC-32.