diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 95d4094c..8703e81c 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -169,12 +169,13 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { if e.Operator() != 0 { prefix = aPrefix } - name := e.Ident().Str(g.tm) - // TODO: stash the whole io_reader, not just its bounds. - for j := 0; j < 2; j++ { - b.printf("uint8_t* %s%d_bounds%d_%s%s = %s%s.private_impl.bounds[%d];\n", - oPrefix, ioBindNum, j, prefix, name, prefix, name, j) + cTyp := "reader" + if e.MType().QID()[1] == t.IDIOWriter { + cTyp = "writer" } + name := e.Ident().Str(g.tm) + b.printf("wuffs_base__io_%s %s%d_%s%s = %s%s;\n", + cTyp, oPrefix, ioBindNum, prefix, name, prefix, name) } for _, o := range n.Body() { @@ -190,10 +191,8 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { prefix = aPrefix } name := e.Ident().Str(g.tm) - for j := 1; j >= 0; j-- { - b.printf("%s%s.private_impl.bounds[%d] = %s%d_bounds%d_%s%s;\n", - prefix, name, j, oPrefix, ioBindNum, j, prefix, name) - } + b.printf("%s%s = %s%d_%s%s;\n", + prefix, name, oPrefix, ioBindNum, prefix, name) } b.writes("}\n") return nil diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 8f206b47..152c570d 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -2878,10 +2878,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( while (true) { v_w = ((wuffs_base__io_writer){}); { - uint8_t* o_0_bounds0_a_src = a_src.private_impl.bounds[0]; - uint8_t* o_0_bounds1_a_src = a_src.private_impl.bounds[1]; - uint8_t* o_0_bounds0_v_w = v_w.private_impl.bounds[0]; - uint8_t* o_0_bounds1_v_w = v_w.private_impl.bounds[1]; + wuffs_base__io_reader o_0_a_src = a_src; + wuffs_base__io_writer o_0_v_w = v_w; wuffs_base__io_reader__set_limit(&a_src, b_rptr_src, v_block_size); wuffs_base__io_reader__set_mark(&a_src, b_rptr_src); { @@ -2905,10 +2903,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( a_src.private_impl.bounds[0]), }) .len))); - v_w.private_impl.bounds[1] = o_0_bounds1_v_w; - v_w.private_impl.bounds[0] = o_0_bounds0_v_w; - a_src.private_impl.bounds[1] = o_0_bounds1_a_src; - a_src.private_impl.bounds[0] = o_0_bounds0_a_src; + v_w = o_0_v_w; + a_src = o_0_a_src; } if (v_z == 0) { self->private_impl.f_previous_lzw_decode_ended_abruptly = false;