From 38b101d170e457c9a173221544e4b019e67edc61 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 26 Nov 2021 19:46:36 +1100 Subject: [PATCH] Push std/png decoder.tell_me_more goto_done later --- release/c/wuffs-unsupported-snapshot.c | 174 ++++++++++++------------- std/png/decode_png.wuffs | 4 +- 2 files changed, 89 insertions(+), 89 deletions(-) diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index f2a4cb35..9106c86a 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -40946,96 +40946,96 @@ wuffs_png__decoder__tell_me_more( } } label__loop__break:; + if (self->private_impl.f_metadata_fourcc == 1263947851) { + self->private_impl.f_metadata_fourcc = 1263947862; + if (self->private_impl.f_chunk_type == 1951945833) { + if (self->private_impl.f_chunk_length <= 1) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + self->private_impl.f_chunk_length -= 2; + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint8_t t_3 = *iop_a_src++; + v_c = t_3; + } + if (v_c == 0) { + self->private_impl.f_metadata_is_zlib_compressed = false; + } else if (v_c == 1) { + self->private_impl.f_metadata_is_zlib_compressed = true; + } else { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint8_t t_4 = *iop_a_src++; + v_c = t_4; + } + if ((v_c != 0) && self->private_impl.f_metadata_is_zlib_compressed) { + status = wuffs_base__make_status(wuffs_png__error__unsupported_png_compression_method); + goto exit; + } + self->private_impl.f_metadata_fourcc -= 2; + while (self->private_impl.f_metadata_fourcc != 1263947862) { + self->private_impl.f_metadata_fourcc += 1; + while (true) { + if (self->private_impl.f_chunk_length <= 0) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + self->private_impl.f_chunk_length -= 1; + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint8_t t_5 = *iop_a_src++; + v_c = t_5; + } + if (v_c == 0) { + goto label__0__break; + } + } + label__0__break:; + } + } else if (self->private_impl.f_chunk_type == 1951945850) { + if (self->private_impl.f_chunk_length <= 0) { + status = wuffs_base__make_status(wuffs_png__error__bad_chunk); + goto exit; + } + self->private_impl.f_chunk_length -= 1; + { + WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); + if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { + status = wuffs_base__make_status(wuffs_base__suspension__short_read); + goto suspend; + } + uint8_t t_6 = *iop_a_src++; + v_c = t_6; + } + if (v_c != 0) { + status = wuffs_base__make_status(wuffs_png__error__unsupported_png_compression_method); + goto exit; + } + self->private_impl.f_metadata_is_zlib_compressed = true; + } + self->private_impl.f_call_sequence = 2; + status = wuffs_base__make_status(NULL); + goto ok; + } goto label__goto_done__break; } label__goto_done__break:; - if (self->private_impl.f_metadata_fourcc == 1263947851) { - self->private_impl.f_metadata_fourcc = 1263947862; - if (self->private_impl.f_chunk_type == 1951945833) { - if (self->private_impl.f_chunk_length <= 1) { - status = wuffs_base__make_status(wuffs_png__error__bad_chunk); - goto exit; - } - self->private_impl.f_chunk_length -= 2; - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(12); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { - status = wuffs_base__make_status(wuffs_base__suspension__short_read); - goto suspend; - } - uint8_t t_3 = *iop_a_src++; - v_c = t_3; - } - if (v_c == 0) { - self->private_impl.f_metadata_is_zlib_compressed = false; - } else if (v_c == 1) { - self->private_impl.f_metadata_is_zlib_compressed = true; - } else { - status = wuffs_base__make_status(wuffs_png__error__bad_chunk); - goto exit; - } - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { - status = wuffs_base__make_status(wuffs_base__suspension__short_read); - goto suspend; - } - uint8_t t_4 = *iop_a_src++; - v_c = t_4; - } - if ((v_c != 0) && self->private_impl.f_metadata_is_zlib_compressed) { - status = wuffs_base__make_status(wuffs_png__error__unsupported_png_compression_method); - goto exit; - } - self->private_impl.f_metadata_fourcc -= 2; - while (self->private_impl.f_metadata_fourcc != 1263947862) { - self->private_impl.f_metadata_fourcc += 1; - while (true) { - if (self->private_impl.f_chunk_length <= 0) { - status = wuffs_base__make_status(wuffs_png__error__bad_chunk); - goto exit; - } - self->private_impl.f_chunk_length -= 1; - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(14); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { - status = wuffs_base__make_status(wuffs_base__suspension__short_read); - goto suspend; - } - uint8_t t_5 = *iop_a_src++; - v_c = t_5; - } - if (v_c == 0) { - goto label__0__break; - } - } - label__0__break:; - } - } else if (self->private_impl.f_chunk_type == 1951945850) { - if (self->private_impl.f_chunk_length <= 0) { - status = wuffs_base__make_status(wuffs_png__error__bad_chunk); - goto exit; - } - self->private_impl.f_chunk_length -= 1; - { - WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15); - if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) { - status = wuffs_base__make_status(wuffs_base__suspension__short_read); - goto suspend; - } - uint8_t t_6 = *iop_a_src++; - v_c = t_6; - } - if (v_c != 0) { - status = wuffs_base__make_status(wuffs_png__error__unsupported_png_compression_method); - goto exit; - } - self->private_impl.f_metadata_is_zlib_compressed = true; - } - self->private_impl.f_call_sequence = 2; - status = wuffs_base__make_status(NULL); - goto ok; - } if (self->private_impl.f_chunk_length != 0) { status = wuffs_base__make_status(wuffs_png__error__bad_chunk); goto exit; diff --git a/std/png/decode_png.wuffs b/std/png/decode_png.wuffs index 580bd81a..5e6842af 100644 --- a/std/png/decode_png.wuffs +++ b/std/png/decode_png.wuffs @@ -1596,8 +1596,6 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform } endwhile } } endwhile.loop - break.goto_done - }} endwhile.goto_done // Key-value pairs come in... pairs. if this.metadata_fourcc == 'KVPK'be { @@ -1654,6 +1652,8 @@ pub func decoder.tell_me_more?(dst: base.io_writer, minfo: nptr base.more_inform this.call_sequence = 2 return ok } + break.goto_done + }} endwhile.goto_done if this.chunk_length <> 0 { return "#bad chunk"