mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
cgen: have io_limit update meta.closed
This commit is contained in:
1 parent
8ad397fc93
commit
d7c48ae76b
2 files changed
+41
-13
No files matched your search
@@ -305,9 +305,9 @@ func (g *gen) writeStatementIOManip(b *buffer, n *a.IOManip, depth uint32) error
|
||||
if e.Operator() != 0 {
|
||||
prefix = aPrefix
|
||||
}
|
||||
cTyp, end, qualifier := "reader", "meta.wi", "const "
|
||||
cTyp, end, qualifier, isWriter := "reader", "meta.wi", "const ", false
|
||||
if e.MType().QID()[1] == t.IDIOWriter {
|
||||
cTyp, end, qualifier = "writer", "data.len", ""
|
||||
cTyp, end, qualifier, isWriter = "writer", "data.len", "", true
|
||||
}
|
||||
name := e.Ident().Str(g.tm)
|
||||
|
||||
@@ -350,6 +350,10 @@ func (g *gen) writeStatementIOManip(b *buffer, n *a.IOManip, depth uint32) error
|
||||
b.writes(");\n")
|
||||
|
||||
} else {
|
||||
if !isWriter {
|
||||
b.printf("const bool %s%d_closed_%s%s = %s%s->meta.closed;\n",
|
||||
oPrefix, ioBindNum, prefix, name, prefix, name)
|
||||
}
|
||||
b.printf("%suint8_t *%s%d_%s%s%s = %s%s%s;\n",
|
||||
qualifier, oPrefix, ioBindNum, io2Prefix, prefix, name, io2Prefix, prefix, name)
|
||||
b.printf("wuffs_base__io_%s__limit(&%s%s%s, %s%s%s,\n",
|
||||
@@ -360,11 +364,16 @@ func (g *gen) writeStatementIOManip(b *buffer, n *a.IOManip, depth uint32) error
|
||||
return err
|
||||
}
|
||||
b.writes(");\n")
|
||||
b.printf("if (%s%s) {\n%s%s->%s = ((size_t)(%s%s%s - %s%s->data.ptr));\n}\n",
|
||||
prefix, name,
|
||||
prefix, name, end,
|
||||
io2Prefix, prefix, name,
|
||||
prefix, name)
|
||||
b.printf("if (%s%s) {\n", prefix, name)
|
||||
b.printf("size_t n = ((size_t)(%s%s%s - %s%s->data.ptr));\n",
|
||||
io2Prefix, prefix, name, prefix, name)
|
||||
if !isWriter {
|
||||
b.printf("%s%s->meta.closed = %s%s->meta.closed && (%s%s->%s <= n);\n",
|
||||
prefix, name, prefix, name, prefix, name, end)
|
||||
}
|
||||
b.printf("%s%s->%s = n;\n",
|
||||
prefix, name, end)
|
||||
b.printf("}\n")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -393,11 +402,14 @@ func (g *gen) writeStatementIOManip(b *buffer, n *a.IOManip, depth uint32) error
|
||||
io2Prefix, prefix, name,
|
||||
oPrefix, ioBindNum, io2Prefix, prefix, name)
|
||||
if n.Keyword() == t.IDIOLimit {
|
||||
b.printf("if (%s%s) {\n%s%s->%s = ((size_t)(%s%s%s - %s%s->data.ptr));\n}\n",
|
||||
prefix, name,
|
||||
b.printf("if (%s%s) {\n", prefix, name)
|
||||
b.printf("%s%s->meta.closed = %s%d_closed_%s%s;\n",
|
||||
prefix, name, oPrefix, ioBindNum, prefix, name)
|
||||
b.printf("%s%s->%s = ((size_t)(%s%s%s - %s%s->data.ptr));\n",
|
||||
prefix, name, end,
|
||||
io2Prefix, prefix, name,
|
||||
prefix, name)
|
||||
b.printf("}\n")
|
||||
}
|
||||
}
|
||||
b.writes("}\n")
|
||||
|
||||
@@ -42688,11 +42688,14 @@ wuffs_png__decoder__decode_pass(
|
||||
self->private_impl.f_pass_workbuf_length),
|
||||
((uint64_t)(self->private_impl.f_workbuf_hist_pos_base + self->private_impl.f_workbuf_wi)));
|
||||
{
|
||||
const bool o_1_closed_a_src = a_src->meta.closed;
|
||||
const uint8_t *o_1_io2_a_src = io2_a_src;
|
||||
wuffs_base__io_reader__limit(&io2_a_src, iop_a_src,
|
||||
((uint64_t)(self->private_impl.f_chunk_length)));
|
||||
if (a_src) {
|
||||
a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
size_t n = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
a_src->meta.closed = a_src->meta.closed && (a_src->meta.wi <= n);
|
||||
a_src->meta.wi = n;
|
||||
}
|
||||
v_w_mark = ((uint64_t)(iop_v_w - io0_v_w));
|
||||
v_r_mark = ((uint64_t)(iop_a_src - io0_a_src));
|
||||
@@ -42715,6 +42718,7 @@ wuffs_png__decoder__decode_pass(
|
||||
wuffs_base__u64__sat_add_indirect(&self->private_impl.f_workbuf_wi, wuffs_base__io__count_since(v_w_mark, ((uint64_t)(iop_v_w - io0_v_w))));
|
||||
io2_a_src = o_1_io2_a_src;
|
||||
if (a_src) {
|
||||
a_src->meta.closed = o_1_closed_a_src;
|
||||
a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
}
|
||||
}
|
||||
@@ -43226,11 +43230,14 @@ wuffs_png__decoder__tell_me_more(
|
||||
if (self->private_impl.f_metadata_is_zlib_compressed) {
|
||||
if (self->private_impl.f_chunk_type == 1346585449) {
|
||||
{
|
||||
const bool o_0_closed_a_src = a_src->meta.closed;
|
||||
const uint8_t *o_0_io2_a_src = io2_a_src;
|
||||
wuffs_base__io_reader__limit(&io2_a_src, iop_a_src,
|
||||
((uint64_t)(self->private_impl.f_chunk_length)));
|
||||
if (a_src) {
|
||||
a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
size_t n = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
a_src->meta.closed = a_src->meta.closed && (a_src->meta.wi <= n);
|
||||
a_src->meta.wi = n;
|
||||
}
|
||||
v_r_mark = ((uint64_t)(iop_a_src - io0_a_src));
|
||||
{
|
||||
@@ -43252,6 +43259,7 @@ wuffs_png__decoder__tell_me_more(
|
||||
wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_chunk_length, ((uint32_t)((wuffs_base__io__count_since(v_r_mark, ((uint64_t)(iop_a_src - io0_a_src))) & 4294967295))));
|
||||
io2_a_src = o_0_io2_a_src;
|
||||
if (a_src) {
|
||||
a_src->meta.closed = o_0_closed_a_src;
|
||||
a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
}
|
||||
}
|
||||
@@ -43272,11 +43280,14 @@ wuffs_png__decoder__tell_me_more(
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
|
||||
} else if (self->private_impl.f_chunk_type == 1951945833) {
|
||||
{
|
||||
const bool o_1_closed_a_src = a_src->meta.closed;
|
||||
const uint8_t *o_1_io2_a_src = io2_a_src;
|
||||
wuffs_base__io_reader__limit(&io2_a_src, iop_a_src,
|
||||
((uint64_t)(self->private_impl.f_chunk_length)));
|
||||
if (a_src) {
|
||||
a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
size_t n = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
a_src->meta.closed = a_src->meta.closed && (a_src->meta.wi <= n);
|
||||
a_src->meta.wi = n;
|
||||
}
|
||||
v_r_mark = ((uint64_t)(iop_a_src - io0_a_src));
|
||||
{
|
||||
@@ -43298,6 +43309,7 @@ wuffs_png__decoder__tell_me_more(
|
||||
wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_chunk_length, ((uint32_t)((wuffs_base__io__count_since(v_r_mark, ((uint64_t)(iop_a_src - io0_a_src))) & 4294967295))));
|
||||
io2_a_src = o_1_io2_a_src;
|
||||
if (a_src) {
|
||||
a_src->meta.closed = o_1_closed_a_src;
|
||||
a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
}
|
||||
}
|
||||
@@ -43333,11 +43345,14 @@ wuffs_png__decoder__tell_me_more(
|
||||
wuffs_base__make_slice_u8(self->private_data.f_dst_palette, 1024),
|
||||
self->private_impl.f_ztxt_hist_pos);
|
||||
{
|
||||
const bool o_3_closed_a_src = a_src->meta.closed;
|
||||
const uint8_t *o_3_io2_a_src = io2_a_src;
|
||||
wuffs_base__io_reader__limit(&io2_a_src, iop_a_src,
|
||||
((uint64_t)(self->private_impl.f_chunk_length)));
|
||||
if (a_src) {
|
||||
a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
size_t n = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
a_src->meta.closed = a_src->meta.closed && (a_src->meta.wi <= n);
|
||||
a_src->meta.wi = n;
|
||||
}
|
||||
v_w_mark = ((uint64_t)(iop_v_w - io0_v_w));
|
||||
v_r_mark = ((uint64_t)(iop_a_src - io0_a_src));
|
||||
@@ -43357,6 +43372,7 @@ wuffs_png__decoder__tell_me_more(
|
||||
v_num_written = wuffs_base__io__count_since(v_w_mark, ((uint64_t)(iop_v_w - io0_v_w)));
|
||||
io2_a_src = o_3_io2_a_src;
|
||||
if (a_src) {
|
||||
a_src->meta.closed = o_3_closed_a_src;
|
||||
a_src->meta.wi = ((size_t)(io2_a_src - a_src->data.ptr));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user