From 250257e3c0eb548223a99c0ce6970e184bb20ccc Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 9 Feb 2019 19:49:09 +1100 Subject: [PATCH] Spin out some cgen fields to a private_data struct --- cmd/wuffs-c/internal/cgen/builtin.go | 4 +- cmd/wuffs-c/internal/cgen/cgen.go | 41 ++- cmd/wuffs-c/internal/cgen/var.go | 2 +- release/c/wuffs-unsupported-snapshot.c | 410 +++++++++++++------------ 4 files changed, 242 insertions(+), 215 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index cf869325..acec5380 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -592,7 +592,7 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error g.currFunk.usesScratch = true // TODO: don't hard-code [0], and allow recursive coroutines. - scratchName := fmt.Sprintf("self->private_impl.%s%s[0].scratch", + scratchName := fmt.Sprintf("self->private_data.%s%s[0].scratch", sPrefix, g.currFunk.astFunc.FuncName().Str(g.tm)) b.printf("%s = ", scratchName) @@ -666,7 +666,7 @@ func (g *gen) writeReadUxxAsUyy(b *buffer, n *a.Expr, preName string, xx uint8, g.currFunk.usesScratch = true // TODO: don't hard-code [0], and allow recursive coroutines. - scratchName := fmt.Sprintf("self->private_impl.%s%s[0].scratch", + scratchName := fmt.Sprintf("self->private_data.%s%s[0].scratch", sPrefix, g.currFunk.astFunc.FuncName().Str(g.tm)) b.printf("if (WUFFS_BASE__LIKELY(io1_a_src - iop_a_src >= %d)) {", xx/8) diff --git a/cmd/wuffs-c/internal/cgen/cgen.go b/cmd/wuffs-c/internal/cgen/cgen.go index 70e8dc6c..59348ff0 100644 --- a/cmd/wuffs-c/internal/cgen/cgen.go +++ b/cmd/wuffs-c/internal/cgen/cgen.go @@ -726,12 +726,15 @@ func (g *gen) writeConstList(b *buffer, n *a.Expr) error { } func (g *gen) writeStructPrivateImpl(b *buffer, n *a.Struct) error { - b.writes("// Do not access the private_impl's fields directly. There is no API/ABI\n") - b.writes("// compatibility or safety guarantee if you do so. Instead, use the\n") - b.writes("// wuffs_foo__bar__baz functions.\n") + // TODO: allow max depth > 1 for recursive coroutines. + const maxDepth = 1 + + b.writes("// Do not access the private_impl's or private_data's fields directly. There\n") + b.writes("// is no API/ABI compatibility or safety guarantee if you do so. Instead, use\n") + b.writes("// the wuffs_foo__bar__baz functions.\n") b.writes("//\n") - b.writes("// It is a struct, not a struct*, so that the outermost wuffs_foo__bar\n") - b.writes("// struct can be stack allocated when WUFFS_IMPLEMENTATION is defined.\n") + b.writes("// It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct\n") + b.writes("// can be stack allocated when WUFFS_IMPLEMENTATION is defined.\n\n") b.writes("struct {\n") if n.Classy() { @@ -752,9 +755,6 @@ func (g *gen) writeStructPrivateImpl(b *buffer, n *a.Struct) error { } if n.Classy() { - // TODO: allow max depth > 1 for recursive coroutines. - const maxDepth = 1 - b.writeb('\n') for _, file := range g.files { for _, tld := range file.TopLevelDecls() { @@ -774,7 +774,14 @@ func (g *gen) writeStructPrivateImpl(b *buffer, n *a.Struct) error { } } - b.writeb('\n') + } + b.writes("} private_impl;\n\n") + + { + oldOuterLenB0 := len(*b) + b.writes("struct {\n") + oldOuterLenB1 := len(*b) + for _, file := range g.files { for _, tld := range file.TopLevelDecls() { if tld.Kind() != a.KFunc { @@ -789,9 +796,9 @@ func (g *gen) writeStructPrivateImpl(b *buffer, n *a.Struct) error { continue } - oldLenB0 := len(*b) + oldInnerLenB0 := len(*b) b.writes("struct {\n") - oldLenB1 := len(*b) + oldInnerLenB1 := len(*b) if k.coroSuspPoint != 0 { if err := g.writeVars(b, &k, true); err != nil { return err @@ -800,15 +807,21 @@ func (g *gen) writeStructPrivateImpl(b *buffer, n *a.Struct) error { if k.usesScratch { b.writes("uint64_t scratch;\n") } - if oldLenB1 != len(*b) { + if oldInnerLenB1 != len(*b) { b.printf("} %s%s[%d];\n", sPrefix, o.FuncName().Str(g.tm), maxDepth) } else { - *b = (*b)[:oldLenB0] + *b = (*b)[:oldInnerLenB0] } } } + + if oldOuterLenB1 != len(*b) { + b.writes("} private_data;\n\n") + } else { + *b = (*b)[:oldOuterLenB0] + } } - b.writes("} private_impl;\n\n") + return nil } diff --git a/cmd/wuffs-c/internal/cgen/var.go b/cmd/wuffs-c/internal/cgen/var.go index d337fc46..d92b3fff 100644 --- a/cmd/wuffs-c/internal/cgen/var.go +++ b/cmd/wuffs-c/internal/cgen/var.go @@ -229,7 +229,7 @@ func (g *gen) writeResumeSuspend1(b *buffer, f *funk, n *a.Var, suspend bool) er local := fmt.Sprintf("%s%s", vPrefix, n.Name().Str(g.tm)) lhs := local // TODO: don't hard-code [0], and allow recursive coroutines. - rhs := fmt.Sprintf("self->private_impl.%s%s[0].%s", sPrefix, g.currFunk.astFunc.FuncName().Str(g.tm), lhs) + rhs := fmt.Sprintf("self->private_data.%s%s[0].%s", sPrefix, g.currFunk.astFunc.FuncName().Str(g.tm), lhs) if suspend { lhs, rhs = rhs, lhs } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 1dadf51e..f59760c9 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -2554,12 +2554,13 @@ wuffs_adler32__hasher__update(wuffs_adler32__hasher* self, struct wuffs_adler32__hasher__struct { #ifdef WUFFS_IMPLEMENTATION - // Do not access the private_impl's fields directly. There is no API/ABI - // compatibility or safety guarantee if you do so. Instead, use the - // wuffs_foo__bar__baz functions. + // Do not access the private_impl's or private_data's fields directly. There + // is no API/ABI compatibility or safety guarantee if you do so. Instead, use + // the wuffs_foo__bar__baz functions. // - // It is a struct, not a struct*, so that the outermost wuffs_foo__bar - // struct can be stack allocated when WUFFS_IMPLEMENTATION is defined. + // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct + // can be stack allocated when WUFFS_IMPLEMENTATION is defined. + struct { uint32_t magic; uint32_t active_coroutine; @@ -2684,12 +2685,13 @@ wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self, struct wuffs_crc32__ieee_hasher__struct { #ifdef WUFFS_IMPLEMENTATION - // Do not access the private_impl's fields directly. There is no API/ABI - // compatibility or safety guarantee if you do so. Instead, use the - // wuffs_foo__bar__baz functions. + // Do not access the private_impl's or private_data's fields directly. There + // is no API/ABI compatibility or safety guarantee if you do so. Instead, use + // the wuffs_foo__bar__baz functions. // - // It is a struct, not a struct*, so that the outermost wuffs_foo__bar - // struct can be stack allocated when WUFFS_IMPLEMENTATION is defined. + // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct + // can be stack allocated when WUFFS_IMPLEMENTATION is defined. + struct { uint32_t magic; uint32_t active_coroutine; @@ -2839,12 +2841,13 @@ wuffs_deflate__decoder__decode_io_writer(wuffs_deflate__decoder* self, struct wuffs_deflate__decoder__struct { #ifdef WUFFS_IMPLEMENTATION - // Do not access the private_impl's fields directly. There is no API/ABI - // compatibility or safety guarantee if you do so. Instead, use the - // wuffs_foo__bar__baz functions. + // Do not access the private_impl's or private_data's fields directly. There + // is no API/ABI compatibility or safety guarantee if you do so. Instead, use + // the wuffs_foo__bar__baz functions. // - // It is a struct, not a struct*, so that the outermost wuffs_foo__bar - // struct can be stack allocated when WUFFS_IMPLEMENTATION is defined. + // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct + // can be stack allocated when WUFFS_IMPLEMENTATION is defined. + struct { uint32_t magic; uint32_t active_coroutine; @@ -2863,7 +2866,9 @@ struct wuffs_deflate__decoder__struct { uint32_t p_decode_uncompressed[1]; uint32_t p_init_dynamic_huffman[1]; uint32_t p_decode_huffman_slow[1]; + } private_impl; + struct { struct { uint32_t v_final; } s_decode_blocks[1]; @@ -2898,7 +2903,7 @@ struct wuffs_deflate__decoder__struct { uint32_t v_hlen; uint32_t v_hdist; } s_decode_huffman_slow[1]; - } private_impl; + } private_data; #else // WUFFS_IMPLEMENTATION @@ -3043,12 +3048,13 @@ wuffs_lzw__decoder__flush(wuffs_lzw__decoder* self); struct wuffs_lzw__decoder__struct { #ifdef WUFFS_IMPLEMENTATION - // Do not access the private_impl's fields directly. There is no API/ABI - // compatibility or safety guarantee if you do so. Instead, use the - // wuffs_foo__bar__baz functions. + // Do not access the private_impl's or private_data's fields directly. There + // is no API/ABI compatibility or safety guarantee if you do so. Instead, use + // the wuffs_foo__bar__baz functions. // - // It is a struct, not a struct*, so that the outermost wuffs_foo__bar - // struct can be stack allocated when WUFFS_IMPLEMENTATION is defined. + // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct + // can be stack allocated when WUFFS_IMPLEMENTATION is defined. + struct { uint32_t magic; uint32_t active_coroutine; @@ -3072,7 +3078,6 @@ struct wuffs_lzw__decoder__struct { uint32_t p_decode_io_writer[1]; uint32_t p_write_to[1]; - } private_impl; #else // WUFFS_IMPLEMENTATION @@ -3253,12 +3258,13 @@ wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self, struct wuffs_gif__decoder__struct { #ifdef WUFFS_IMPLEMENTATION - // Do not access the private_impl's fields directly. There is no API/ABI - // compatibility or safety guarantee if you do so. Instead, use the - // wuffs_foo__bar__baz functions. + // Do not access the private_impl's or private_data's fields directly. There + // is no API/ABI compatibility or safety guarantee if you do so. Instead, use + // the wuffs_foo__bar__baz functions. // - // It is a struct, not a struct*, so that the outermost wuffs_foo__bar - // struct can be stack allocated when WUFFS_IMPLEMENTATION is defined. + // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct + // can be stack allocated when WUFFS_IMPLEMENTATION is defined. + struct { uint32_t magic; uint32_t active_coroutine; @@ -3310,7 +3316,9 @@ struct wuffs_gif__decoder__struct { uint32_t p_decode_id_part0[1]; uint32_t p_decode_id_part1[1]; uint32_t p_decode_id_part2[1]; + } private_impl; + struct { struct { uint64_t scratch; } s_skip_frame[1]; @@ -3350,7 +3358,7 @@ struct wuffs_gif__decoder__struct { wuffs_base__status v_lzw_status; uint64_t scratch; } s_decode_id_part2[1]; - } private_impl; + } private_data; #else // WUFFS_IMPLEMENTATION @@ -3531,12 +3539,13 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, struct wuffs_gzip__decoder__struct { #ifdef WUFFS_IMPLEMENTATION - // Do not access the private_impl's fields directly. There is no API/ABI - // compatibility or safety guarantee if you do so. Instead, use the - // wuffs_foo__bar__baz functions. + // Do not access the private_impl's or private_data's fields directly. There + // is no API/ABI compatibility or safety guarantee if you do so. Instead, use + // the wuffs_foo__bar__baz functions. // - // It is a struct, not a struct*, so that the outermost wuffs_foo__bar - // struct can be stack allocated when WUFFS_IMPLEMENTATION is defined. + // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct + // can be stack allocated when WUFFS_IMPLEMENTATION is defined. + struct { uint32_t magic; uint32_t active_coroutine; @@ -3546,7 +3555,9 @@ struct wuffs_gzip__decoder__struct { wuffs_deflate__decoder f_flate; uint32_t p_decode_io_writer[1]; + } private_impl; + struct { struct { uint8_t v_flags; uint32_t v_checksum_got; @@ -3554,7 +3565,7 @@ struct wuffs_gzip__decoder__struct { uint32_t v_checksum_want; uint64_t scratch; } s_decode_io_writer[1]; - } private_impl; + } private_data; #else // WUFFS_IMPLEMENTATION @@ -3702,12 +3713,13 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, struct wuffs_zlib__decoder__struct { #ifdef WUFFS_IMPLEMENTATION - // Do not access the private_impl's fields directly. There is no API/ABI - // compatibility or safety guarantee if you do so. Instead, use the - // wuffs_foo__bar__baz functions. + // Do not access the private_impl's or private_data's fields directly. There + // is no API/ABI compatibility or safety guarantee if you do so. Instead, use + // the wuffs_foo__bar__baz functions. // - // It is a struct, not a struct*, so that the outermost wuffs_foo__bar - // struct can be stack allocated when WUFFS_IMPLEMENTATION is defined. + // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct + // can be stack allocated when WUFFS_IMPLEMENTATION is defined. + struct { uint32_t magic; uint32_t active_coroutine; @@ -3717,12 +3729,14 @@ struct wuffs_zlib__decoder__struct { wuffs_deflate__decoder f_flate; uint32_t p_decode_io_writer[1]; + } private_impl; + struct { struct { uint32_t v_checksum_got; uint64_t scratch; } s_decode_io_writer[1]; - } private_impl; + } private_data; #else // WUFFS_IMPLEMENTATION @@ -6440,7 +6454,7 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_blocks[0]; if (coro_susp_point) { - v_final = self->private_impl.s_decode_blocks[0].v_final; + v_final = self->private_data.s_decode_blocks[0].v_final; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -6558,7 +6572,7 @@ wuffs_deflate__decoder__decode_blocks(wuffs_deflate__decoder* self, goto suspend; suspend: self->private_impl.p_decode_blocks[0] = coro_susp_point; - self->private_impl.s_decode_blocks[0].v_final = v_final; + self->private_data.s_decode_blocks[0].v_final = v_final; goto exit; exit: @@ -6615,7 +6629,7 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_uncompressed[0]; if (coro_susp_point) { - v_length = self->private_impl.s_decode_uncompressed[0].v_length; + v_length = self->private_data.s_decode_uncompressed[0].v_length; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -6635,7 +6649,7 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, t_0 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { - self->private_impl.s_decode_uncompressed[0].scratch = 0; + self->private_data.s_decode_uncompressed[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { @@ -6643,7 +6657,7 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, goto suspend; } uint64_t* scratch = - &self->private_impl.s_decode_uncompressed[0].scratch; + &self->private_data.s_decode_uncompressed[0].scratch; uint32_t num_bits_0 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -6689,7 +6703,7 @@ wuffs_deflate__decoder__decode_uncompressed(wuffs_deflate__decoder* self, goto suspend; suspend: self->private_impl.p_decode_uncompressed[0] = coro_susp_point; - self->private_impl.s_decode_uncompressed[0].v_length = v_length; + self->private_data.s_decode_uncompressed[0].v_length = v_length; goto exit; exit: @@ -6785,18 +6799,18 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, uint32_t coro_susp_point = self->private_impl.p_init_dynamic_huffman[0]; if (coro_susp_point) { - v_bits = self->private_impl.s_init_dynamic_huffman[0].v_bits; - v_n_bits = self->private_impl.s_init_dynamic_huffman[0].v_n_bits; - v_n_lit = self->private_impl.s_init_dynamic_huffman[0].v_n_lit; - v_n_dist = self->private_impl.s_init_dynamic_huffman[0].v_n_dist; - v_n_clen = self->private_impl.s_init_dynamic_huffman[0].v_n_clen; - v_i = self->private_impl.s_init_dynamic_huffman[0].v_i; - v_mask = self->private_impl.s_init_dynamic_huffman[0].v_mask; - v_table_entry = self->private_impl.s_init_dynamic_huffman[0].v_table_entry; + v_bits = self->private_data.s_init_dynamic_huffman[0].v_bits; + v_n_bits = self->private_data.s_init_dynamic_huffman[0].v_n_bits; + v_n_lit = self->private_data.s_init_dynamic_huffman[0].v_n_lit; + v_n_dist = self->private_data.s_init_dynamic_huffman[0].v_n_dist; + v_n_clen = self->private_data.s_init_dynamic_huffman[0].v_n_clen; + v_i = self->private_data.s_init_dynamic_huffman[0].v_i; + v_mask = self->private_data.s_init_dynamic_huffman[0].v_mask; + v_table_entry = self->private_data.s_init_dynamic_huffman[0].v_table_entry; v_n_extra_bits = - self->private_impl.s_init_dynamic_huffman[0].v_n_extra_bits; - v_rep_symbol = self->private_impl.s_init_dynamic_huffman[0].v_rep_symbol; - v_rep_count = self->private_impl.s_init_dynamic_huffman[0].v_rep_count; + self->private_data.s_init_dynamic_huffman[0].v_n_extra_bits; + v_rep_symbol = self->private_data.s_init_dynamic_huffman[0].v_rep_symbol; + v_rep_count = self->private_data.s_init_dynamic_huffman[0].v_rep_count; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -6978,17 +6992,17 @@ wuffs_deflate__decoder__init_dynamic_huffman(wuffs_deflate__decoder* self, goto suspend; suspend: self->private_impl.p_init_dynamic_huffman[0] = coro_susp_point; - self->private_impl.s_init_dynamic_huffman[0].v_bits = v_bits; - self->private_impl.s_init_dynamic_huffman[0].v_n_bits = v_n_bits; - self->private_impl.s_init_dynamic_huffman[0].v_n_lit = v_n_lit; - self->private_impl.s_init_dynamic_huffman[0].v_n_dist = v_n_dist; - self->private_impl.s_init_dynamic_huffman[0].v_n_clen = v_n_clen; - self->private_impl.s_init_dynamic_huffman[0].v_i = v_i; - self->private_impl.s_init_dynamic_huffman[0].v_mask = v_mask; - self->private_impl.s_init_dynamic_huffman[0].v_table_entry = v_table_entry; - self->private_impl.s_init_dynamic_huffman[0].v_n_extra_bits = v_n_extra_bits; - self->private_impl.s_init_dynamic_huffman[0].v_rep_symbol = v_rep_symbol; - self->private_impl.s_init_dynamic_huffman[0].v_rep_count = v_rep_count; + self->private_data.s_init_dynamic_huffman[0].v_bits = v_bits; + self->private_data.s_init_dynamic_huffman[0].v_n_bits = v_n_bits; + self->private_data.s_init_dynamic_huffman[0].v_n_lit = v_n_lit; + self->private_data.s_init_dynamic_huffman[0].v_n_dist = v_n_dist; + self->private_data.s_init_dynamic_huffman[0].v_n_clen = v_n_clen; + self->private_data.s_init_dynamic_huffman[0].v_i = v_i; + self->private_data.s_init_dynamic_huffman[0].v_mask = v_mask; + self->private_data.s_init_dynamic_huffman[0].v_table_entry = v_table_entry; + self->private_data.s_init_dynamic_huffman[0].v_n_extra_bits = v_n_extra_bits; + self->private_data.s_init_dynamic_huffman[0].v_rep_symbol = v_rep_symbol; + self->private_data.s_init_dynamic_huffman[0].v_rep_count = v_rep_count; goto exit; exit: @@ -7605,19 +7619,19 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_huffman_slow[0]; if (coro_susp_point) { - v_bits = self->private_impl.s_decode_huffman_slow[0].v_bits; - v_n_bits = self->private_impl.s_decode_huffman_slow[0].v_n_bits; - v_table_entry = self->private_impl.s_decode_huffman_slow[0].v_table_entry; + v_bits = self->private_data.s_decode_huffman_slow[0].v_bits; + v_n_bits = self->private_data.s_decode_huffman_slow[0].v_n_bits; + v_table_entry = self->private_data.s_decode_huffman_slow[0].v_table_entry; v_table_entry_n_bits = - self->private_impl.s_decode_huffman_slow[0].v_table_entry_n_bits; - v_lmask = self->private_impl.s_decode_huffman_slow[0].v_lmask; - v_dmask = self->private_impl.s_decode_huffman_slow[0].v_dmask; - v_redir_top = self->private_impl.s_decode_huffman_slow[0].v_redir_top; - v_redir_mask = self->private_impl.s_decode_huffman_slow[0].v_redir_mask; - v_length = self->private_impl.s_decode_huffman_slow[0].v_length; - v_dist_minus_1 = self->private_impl.s_decode_huffman_slow[0].v_dist_minus_1; - v_hlen = self->private_impl.s_decode_huffman_slow[0].v_hlen; - v_hdist = self->private_impl.s_decode_huffman_slow[0].v_hdist; + self->private_data.s_decode_huffman_slow[0].v_table_entry_n_bits; + v_lmask = self->private_data.s_decode_huffman_slow[0].v_lmask; + v_dmask = self->private_data.s_decode_huffman_slow[0].v_dmask; + v_redir_top = self->private_data.s_decode_huffman_slow[0].v_redir_top; + v_redir_mask = self->private_data.s_decode_huffman_slow[0].v_redir_mask; + v_length = self->private_data.s_decode_huffman_slow[0].v_length; + v_dist_minus_1 = self->private_data.s_decode_huffman_slow[0].v_dist_minus_1; + v_hlen = self->private_data.s_decode_huffman_slow[0].v_hlen; + v_hdist = self->private_data.s_decode_huffman_slow[0].v_hdist; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -7938,19 +7952,19 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self, goto suspend; suspend: self->private_impl.p_decode_huffman_slow[0] = coro_susp_point; - self->private_impl.s_decode_huffman_slow[0].v_bits = v_bits; - self->private_impl.s_decode_huffman_slow[0].v_n_bits = v_n_bits; - self->private_impl.s_decode_huffman_slow[0].v_table_entry = v_table_entry; - self->private_impl.s_decode_huffman_slow[0].v_table_entry_n_bits = + self->private_data.s_decode_huffman_slow[0].v_bits = v_bits; + self->private_data.s_decode_huffman_slow[0].v_n_bits = v_n_bits; + self->private_data.s_decode_huffman_slow[0].v_table_entry = v_table_entry; + self->private_data.s_decode_huffman_slow[0].v_table_entry_n_bits = v_table_entry_n_bits; - self->private_impl.s_decode_huffman_slow[0].v_lmask = v_lmask; - self->private_impl.s_decode_huffman_slow[0].v_dmask = v_dmask; - self->private_impl.s_decode_huffman_slow[0].v_redir_top = v_redir_top; - self->private_impl.s_decode_huffman_slow[0].v_redir_mask = v_redir_mask; - self->private_impl.s_decode_huffman_slow[0].v_length = v_length; - self->private_impl.s_decode_huffman_slow[0].v_dist_minus_1 = v_dist_minus_1; - self->private_impl.s_decode_huffman_slow[0].v_hlen = v_hlen; - self->private_impl.s_decode_huffman_slow[0].v_hdist = v_hdist; + self->private_data.s_decode_huffman_slow[0].v_lmask = v_lmask; + self->private_data.s_decode_huffman_slow[0].v_dmask = v_dmask; + self->private_data.s_decode_huffman_slow[0].v_redir_top = v_redir_top; + self->private_data.s_decode_huffman_slow[0].v_redir_mask = v_redir_mask; + self->private_data.s_decode_huffman_slow[0].v_length = v_length; + self->private_data.s_decode_huffman_slow[0].v_dist_minus_1 = v_dist_minus_1; + self->private_data.s_decode_huffman_slow[0].v_hlen = v_hlen; + self->private_data.s_decode_huffman_slow[0].v_hdist = v_hdist; goto exit; exit: @@ -8949,17 +8963,17 @@ wuffs_gif__decoder__skip_frame(wuffs_gif__decoder* self, v_flags = t_0; } if ((v_flags & 128) != 0) { - self->private_impl.s_skip_frame[0].scratch = + self->private_data.s_skip_frame[0].scratch = (((uint32_t)(3)) << (1 + (v_flags & 7))); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (self->private_impl.s_skip_frame[0].scratch > + if (self->private_data.s_skip_frame[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_skip_frame[0].scratch -= io1_a_src - iop_a_src; + self->private_data.s_skip_frame[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_skip_frame[0].scratch; + iop_a_src += self->private_data.s_skip_frame[0].scratch; } WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { @@ -9235,8 +9249,8 @@ wuffs_gif__decoder__decode_header(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_header[0]; if (coro_susp_point) { - memcpy(v_c, self->private_impl.s_decode_header[0].v_c, sizeof(v_c)); - v_i = self->private_impl.s_decode_header[0].v_i; + memcpy(v_c, self->private_data.s_decode_header[0].v_c, sizeof(v_c)); + v_i = self->private_data.s_decode_header[0].v_i; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -9268,8 +9282,8 @@ wuffs_gif__decoder__decode_header(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.p_decode_header[0] = coro_susp_point; - memcpy(self->private_impl.s_decode_header[0].v_c, v_c, sizeof(v_c)); - self->private_impl.s_decode_header[0].v_i = v_i; + memcpy(self->private_data.s_decode_header[0].v_c, v_c, sizeof(v_c)); + self->private_data.s_decode_header[0].v_i = v_i; goto exit; exit: @@ -9310,10 +9324,10 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_lsd[0]; if (coro_susp_point) { - v_flags = self->private_impl.s_decode_lsd[0].v_flags; + v_flags = self->private_data.s_decode_lsd[0].v_flags; v_num_palette_entries = - self->private_impl.s_decode_lsd[0].v_num_palette_entries; - v_i = self->private_impl.s_decode_lsd[0].v_i; + self->private_data.s_decode_lsd[0].v_num_palette_entries; + v_i = self->private_data.s_decode_lsd[0].v_i; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -9325,14 +9339,14 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, t_0 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { - self->private_impl.s_decode_lsd[0].scratch = 0; + self->private_data.s_decode_lsd[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_lsd[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_lsd[0].scratch; uint32_t num_bits_0 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -9354,14 +9368,14 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, t_1 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { - self->private_impl.s_decode_lsd[0].scratch = 0; + self->private_data.s_decode_lsd[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_lsd[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_lsd[0].scratch; uint32_t num_bits_1 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -9385,16 +9399,16 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, uint8_t t_2 = *iop_a_src++; v_flags = t_2; } - self->private_impl.s_decode_lsd[0].scratch = 2; + self->private_data.s_decode_lsd[0].scratch = 2; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); - if (self->private_impl.s_decode_lsd[0].scratch > + if (self->private_data.s_decode_lsd[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_decode_lsd[0].scratch -= io1_a_src - iop_a_src; + self->private_data.s_decode_lsd[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_decode_lsd[0].scratch; + iop_a_src += self->private_data.s_decode_lsd[0].scratch; if ((v_flags & 128) != 0) { v_num_palette_entries = (((uint32_t)(1)) << (1 + (v_flags & 7))); v_i = 0; @@ -9406,14 +9420,14 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, t_3 = ((uint32_t)(wuffs_base__load_u24be(iop_a_src))); iop_a_src += 3; } else { - self->private_impl.s_decode_lsd[0].scratch = 0; + self->private_data.s_decode_lsd[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_lsd[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_lsd[0].scratch; uint32_t num_bits_3 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; @@ -9457,10 +9471,10 @@ wuffs_gif__decoder__decode_lsd(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.p_decode_lsd[0] = coro_susp_point; - self->private_impl.s_decode_lsd[0].v_flags = v_flags; - self->private_impl.s_decode_lsd[0].v_num_palette_entries = + self->private_data.s_decode_lsd[0].v_flags = v_flags; + self->private_data.s_decode_lsd[0].v_num_palette_entries = v_num_palette_entries; - self->private_impl.s_decode_lsd[0].v_i = v_i; + self->private_data.s_decode_lsd[0].v_i = v_i; goto exit; exit: @@ -9622,16 +9636,16 @@ wuffs_gif__decoder__skip_blocks(wuffs_gif__decoder* self, status = NULL; goto ok; } - self->private_impl.s_skip_blocks[0].scratch = ((uint32_t)(v_block_size)); + self->private_data.s_skip_blocks[0].scratch = ((uint32_t)(v_block_size)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (self->private_impl.s_skip_blocks[0].scratch > + if (self->private_data.s_skip_blocks[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_skip_blocks[0].scratch -= io1_a_src - iop_a_src; + self->private_data.s_skip_blocks[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_skip_blocks[0].scratch; + iop_a_src += self->private_data.s_skip_blocks[0].scratch; } goto ok; @@ -9683,9 +9697,9 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_ae[0]; if (coro_susp_point) { - v_block_size = self->private_impl.s_decode_ae[0].v_block_size; - v_not_animexts = self->private_impl.s_decode_ae[0].v_not_animexts; - v_not_netscape = self->private_impl.s_decode_ae[0].v_not_netscape; + v_block_size = self->private_data.s_decode_ae[0].v_block_size; + v_not_animexts = self->private_data.s_decode_ae[0].v_not_animexts; + v_not_netscape = self->private_data.s_decode_ae[0].v_not_netscape; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -9705,16 +9719,16 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, goto ok; } if (v_block_size != 11) { - self->private_impl.s_decode_ae[0].scratch = ((uint32_t)(v_block_size)); + self->private_data.s_decode_ae[0].scratch = ((uint32_t)(v_block_size)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); - if (self->private_impl.s_decode_ae[0].scratch > + if (self->private_data.s_decode_ae[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_decode_ae[0].scratch -= io1_a_src - iop_a_src; + self->private_data.s_decode_ae[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_decode_ae[0].scratch; + iop_a_src += self->private_data.s_decode_ae[0].scratch; goto label_0_break; } v_not_animexts = false; @@ -9749,16 +9763,16 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, v_block_size = t_2; } if (v_block_size != 3) { - self->private_impl.s_decode_ae[0].scratch = ((uint32_t)(v_block_size)); + self->private_data.s_decode_ae[0].scratch = ((uint32_t)(v_block_size)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - if (self->private_impl.s_decode_ae[0].scratch > + if (self->private_data.s_decode_ae[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_decode_ae[0].scratch -= io1_a_src - iop_a_src; + self->private_data.s_decode_ae[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_decode_ae[0].scratch; + iop_a_src += self->private_data.s_decode_ae[0].scratch; goto label_0_break; } { @@ -9771,16 +9785,16 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, v_c = t_3; } if (v_c != 1) { - self->private_impl.s_decode_ae[0].scratch = 2; + self->private_data.s_decode_ae[0].scratch = 2; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); - if (self->private_impl.s_decode_ae[0].scratch > + if (self->private_data.s_decode_ae[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_decode_ae[0].scratch -= io1_a_src - iop_a_src; + self->private_data.s_decode_ae[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_decode_ae[0].scratch; + iop_a_src += self->private_data.s_decode_ae[0].scratch; goto label_0_break; } { @@ -9790,14 +9804,14 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, t_4 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { - self->private_impl.s_decode_ae[0].scratch = 0; + self->private_data.s_decode_ae[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_ae[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_ae[0].scratch; uint32_t num_bits_4 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -9843,9 +9857,9 @@ wuffs_gif__decoder__decode_ae(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.p_decode_ae[0] = coro_susp_point; - self->private_impl.s_decode_ae[0].v_block_size = v_block_size; - self->private_impl.s_decode_ae[0].v_not_animexts = v_not_animexts; - self->private_impl.s_decode_ae[0].v_not_netscape = v_not_netscape; + self->private_data.s_decode_ae[0].v_block_size = v_block_size; + self->private_data.s_decode_ae[0].v_not_animexts = v_not_animexts; + self->private_data.s_decode_ae[0].v_not_netscape = v_not_netscape; goto exit; exit: @@ -9931,14 +9945,14 @@ wuffs_gif__decoder__decode_gc(wuffs_gif__decoder* self, t_2 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { - self->private_impl.s_decode_gc[0].scratch = 0; + self->private_data.s_decode_gc[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_gc[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_gc[0].scratch; uint32_t num_bits_2 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -10034,14 +10048,14 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, t_0 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { - self->private_impl.s_decode_id_part0[0].scratch = 0; + self->private_data.s_decode_id_part0[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_id_part0[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_id_part0[0].scratch; uint32_t num_bits_0 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -10063,14 +10077,14 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, t_1 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { - self->private_impl.s_decode_id_part0[0].scratch = 0; + self->private_data.s_decode_id_part0[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_id_part0[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_id_part0[0].scratch; uint32_t num_bits_1 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -10092,14 +10106,14 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, t_2 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { - self->private_impl.s_decode_id_part0[0].scratch = 0; + self->private_data.s_decode_id_part0[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_id_part0[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_id_part0[0].scratch; uint32_t num_bits_2 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -10122,14 +10136,14 @@ wuffs_gif__decoder__decode_id_part0(wuffs_gif__decoder* self, t_3 = ((uint32_t)(wuffs_base__load_u16le(iop_a_src))); iop_a_src += 2; } else { - self->private_impl.s_decode_id_part0[0].scratch = 0; + self->private_data.s_decode_id_part0[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_id_part0[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_id_part0[0].scratch; uint32_t num_bits_3 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -10207,8 +10221,8 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_id_part1[0]; if (coro_susp_point) { v_num_palette_entries = - self->private_impl.s_decode_id_part1[0].v_num_palette_entries; - v_i = self->private_impl.s_decode_id_part1[0].v_i; + self->private_data.s_decode_id_part1[0].v_num_palette_entries; + v_i = self->private_data.s_decode_id_part1[0].v_i; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -10239,7 +10253,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, t_1 = ((uint32_t)(wuffs_base__load_u24be(iop_a_src))); iop_a_src += 3; } else { - self->private_impl.s_decode_id_part1[0].scratch = 0; + self->private_data.s_decode_id_part1[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { @@ -10247,7 +10261,7 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, goto suspend; } uint64_t* scratch = - &self->private_impl.s_decode_id_part1[0].scratch; + &self->private_data.s_decode_id_part1[0].scratch; uint32_t num_bits_1 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; @@ -10356,9 +10370,9 @@ wuffs_gif__decoder__decode_id_part1(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.p_decode_id_part1[0] = coro_susp_point; - self->private_impl.s_decode_id_part1[0].v_num_palette_entries = + self->private_data.s_decode_id_part1[0].v_num_palette_entries = v_num_palette_entries; - self->private_impl.s_decode_id_part1[0].v_i = v_i; + self->private_data.s_decode_id_part1[0].v_i = v_i; goto exit; exit: @@ -10408,10 +10422,10 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_id_part2[0]; if (coro_susp_point) { - v_block_size = self->private_impl.s_decode_id_part2[0].v_block_size; + v_block_size = self->private_data.s_decode_id_part2[0].v_block_size; v_need_block_size = - self->private_impl.s_decode_id_part2[0].v_need_block_size; - v_lzw_status = self->private_impl.s_decode_id_part2[0].v_lzw_status; + self->private_data.s_decode_id_part2[0].v_need_block_size; + v_lzw_status = self->private_data.s_decode_id_part2[0].v_lzw_status; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -10531,18 +10545,18 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, if (wuffs_base__status__is_ok(v_lzw_status)) { self->private_impl.f_previous_lzw_decode_ended_abruptly = false; if (v_need_block_size || (v_block_size > 0)) { - self->private_impl.s_decode_id_part2[0].scratch = + self->private_data.s_decode_id_part2[0].scratch = ((uint32_t)(v_block_size)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3); - if (self->private_impl.s_decode_id_part2[0].scratch > + if (self->private_data.s_decode_id_part2[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_decode_id_part2[0].scratch -= + self->private_data.s_decode_id_part2[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_decode_id_part2[0].scratch; + iop_a_src += self->private_data.s_decode_id_part2[0].scratch; if (a_src.private_impl.buf) { a_src.private_impl.buf->meta.ri = iop_a_src - a_src.private_impl.buf->data.ptr; @@ -10586,9 +10600,9 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, goto suspend; suspend: self->private_impl.p_decode_id_part2[0] = coro_susp_point; - self->private_impl.s_decode_id_part2[0].v_block_size = v_block_size; - self->private_impl.s_decode_id_part2[0].v_need_block_size = v_need_block_size; - self->private_impl.s_decode_id_part2[0].v_lzw_status = v_lzw_status; + self->private_data.s_decode_id_part2[0].v_block_size = v_block_size; + self->private_data.s_decode_id_part2[0].v_need_block_size = v_need_block_size; + self->private_data.s_decode_id_part2[0].v_lzw_status = v_lzw_status; goto exit; exit: @@ -10879,11 +10893,11 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_io_writer[0]; if (coro_susp_point) { - v_flags = self->private_impl.s_decode_io_writer[0].v_flags; - v_checksum_got = self->private_impl.s_decode_io_writer[0].v_checksum_got; + v_flags = self->private_data.s_decode_io_writer[0].v_flags; + v_checksum_got = self->private_data.s_decode_io_writer[0].v_checksum_got; v_decoded_length_got = - self->private_impl.s_decode_io_writer[0].v_decoded_length_got; - v_checksum_want = self->private_impl.s_decode_io_writer[0].v_checksum_want; + self->private_data.s_decode_io_writer[0].v_decoded_length_got; + v_checksum_want = self->private_data.s_decode_io_writer[0].v_checksum_want; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -10936,16 +10950,16 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, uint8_t t_3 = *iop_a_src++; v_flags = t_3; } - self->private_impl.s_decode_io_writer[0].scratch = 6; + self->private_data.s_decode_io_writer[0].scratch = 6; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); - if (self->private_impl.s_decode_io_writer[0].scratch > + if (self->private_data.s_decode_io_writer[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_decode_io_writer[0].scratch -= io1_a_src - iop_a_src; + self->private_data.s_decode_io_writer[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_decode_io_writer[0].scratch; + iop_a_src += self->private_data.s_decode_io_writer[0].scratch; if ((v_flags & 4) != 0) { { WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6); @@ -10954,7 +10968,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, t_4 = wuffs_base__load_u16le(iop_a_src); iop_a_src += 2; } else { - self->private_impl.s_decode_io_writer[0].scratch = 0; + self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { @@ -10962,7 +10976,7 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, goto suspend; } uint64_t* scratch = - &self->private_impl.s_decode_io_writer[0].scratch; + &self->private_data.s_decode_io_writer[0].scratch; uint32_t num_bits_4 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -10977,17 +10991,17 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, } v_xlen = t_4; } - self->private_impl.s_decode_io_writer[0].scratch = ((uint32_t)(v_xlen)); + self->private_data.s_decode_io_writer[0].scratch = ((uint32_t)(v_xlen)); WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8); - if (self->private_impl.s_decode_io_writer[0].scratch > + if (self->private_data.s_decode_io_writer[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_decode_io_writer[0].scratch -= + self->private_data.s_decode_io_writer[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_decode_io_writer[0].scratch; + iop_a_src += self->private_data.s_decode_io_writer[0].scratch; } if ((v_flags & 8) != 0) { while (true) { @@ -11024,17 +11038,17 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, label_1_break:; } if ((v_flags & 2) != 0) { - self->private_impl.s_decode_io_writer[0].scratch = 2; + self->private_data.s_decode_io_writer[0].scratch = 2; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11); - if (self->private_impl.s_decode_io_writer[0].scratch > + if (self->private_data.s_decode_io_writer[0].scratch > ((uint64_t)(io1_a_src - iop_a_src))) { - self->private_impl.s_decode_io_writer[0].scratch -= + self->private_data.s_decode_io_writer[0].scratch -= io1_a_src - iop_a_src; iop_a_src = io1_a_src; status = wuffs_base__suspension__short_read; goto suspend; } - iop_a_src += self->private_impl.s_decode_io_writer[0].scratch; + iop_a_src += self->private_data.s_decode_io_writer[0].scratch; } if ((v_flags & 224) != 0) { status = wuffs_gzip__error__bad_encoding_flags; @@ -11087,14 +11101,14 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, t_8 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { - self->private_impl.s_decode_io_writer[0].scratch = 0; + self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_io_writer[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_io_writer[0].scratch; uint32_t num_bits_8 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -11116,14 +11130,14 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, t_9 = wuffs_base__load_u32le(iop_a_src); iop_a_src += 4; } else { - self->private_impl.s_decode_io_writer[0].scratch = 0; + self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(16); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_io_writer[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_io_writer[0].scratch; uint32_t num_bits_9 = *scratch >> 56; *scratch <<= 8; *scratch >>= 8; @@ -11155,11 +11169,11 @@ wuffs_gzip__decoder__decode_io_writer(wuffs_gzip__decoder* self, suspend: self->private_impl.p_decode_io_writer[0] = coro_susp_point; self->private_impl.active_coroutine = 1; - self->private_impl.s_decode_io_writer[0].v_flags = v_flags; - self->private_impl.s_decode_io_writer[0].v_checksum_got = v_checksum_got; - self->private_impl.s_decode_io_writer[0].v_decoded_length_got = + self->private_data.s_decode_io_writer[0].v_flags = v_flags; + self->private_data.s_decode_io_writer[0].v_checksum_got = v_checksum_got; + self->private_data.s_decode_io_writer[0].v_decoded_length_got = v_decoded_length_got; - self->private_impl.s_decode_io_writer[0].v_checksum_want = v_checksum_want; + self->private_data.s_decode_io_writer[0].v_checksum_want = v_checksum_want; goto exit; exit: @@ -11348,7 +11362,7 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, uint32_t coro_susp_point = self->private_impl.p_decode_io_writer[0]; if (coro_susp_point) { - v_checksum_got = self->private_impl.s_decode_io_writer[0].v_checksum_got; + v_checksum_got = self->private_data.s_decode_io_writer[0].v_checksum_got; } switch (coro_susp_point) { WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0; @@ -11360,14 +11374,14 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, t_0 = wuffs_base__load_u16be(iop_a_src); iop_a_src += 2; } else { - self->private_impl.s_decode_io_writer[0].scratch = 0; + self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_io_writer[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_io_writer[0].scratch; uint32_t num_bits_0 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; @@ -11443,14 +11457,14 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, t_2 = wuffs_base__load_u32be(iop_a_src); iop_a_src += 4; } else { - self->private_impl.s_decode_io_writer[0].scratch = 0; + self->private_data.s_decode_io_writer[0].scratch = 0; WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5); while (true) { if (WUFFS_BASE__UNLIKELY(iop_a_src == io1_a_src)) { status = wuffs_base__suspension__short_read; goto suspend; } - uint64_t* scratch = &self->private_impl.s_decode_io_writer[0].scratch; + uint64_t* scratch = &self->private_data.s_decode_io_writer[0].scratch; uint32_t num_bits_2 = *scratch & 0xFF; *scratch >>= 8; *scratch <<= 8; @@ -11481,7 +11495,7 @@ wuffs_zlib__decoder__decode_io_writer(wuffs_zlib__decoder* self, suspend: self->private_impl.p_decode_io_writer[0] = coro_susp_point; self->private_impl.active_coroutine = 1; - self->private_impl.s_decode_io_writer[0].v_checksum_got = v_checksum_got; + self->private_data.s_decode_io_writer[0].v_checksum_got = v_checksum_got; goto exit; exit: