diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index c7afe066..4535f7af 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -409,6 +409,21 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct wuffs_base__io_writer__set( + wuffs_base__io_writer* o, + wuffs_base__io_buffer* b, + wuffs_base__slice_u8 s) { + b->ptr = s.ptr; + b->len = s.len; + b->wi = 0; + b->ri = 0; + b->closed = false; + o->private_impl.buf = b; + o->private_impl.bounds[0] = s.ptr; + o->private_impl.bounds[1] = s.ptr + s.len; + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( wuffs_base__io_writer* o, uint8_t* mark) { diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 95c127a5..21d24c35 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -97,7 +97,7 @@ const baseImpl = "" + " by 3 seems best for the std/deflate benchmarks, but that\n // is mostly because 3 is the minimum length for the deflate format. This\n // function implementation shouldn't overfit to that one format. Perhaps the\n // copy_from_history32 Wuffs method should also take an unroll hint argument,\n // and the cgen can look if that argument is the constant expression '3'.\n //\n // See also wuffs_base__io_writer__copy_from_history32__bco below.\n //\n // Alternatively, or additionally, have a sloppy_copy_from_history32 method\n // that copies 8 bytes at a time, possibly writing more than length bytes?\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\n// wuffs_base__io_writer__copy_from_history32__bco is a Bounds Check Optimized\n// version of the wuffs_base__io_writer__copy_from_history32 function above.\n// The caller needs to prove that:\n// - distance > 0\n// - distance <= (*ptr_pt" + "r - start)\n// - length <= (end - *ptr_ptr)\nstatic inline uint32_t wuffs_base__io_writer__copy_from_history32__bco(\n uint8_t** ptr_ptr,\n uint8_t* start,\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n uint8_t* ptr = *ptr_ptr;\n start = ptr - distance;\n uint32_t n = length;\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_reader32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n uint8_t** ptr_rptr,\n uint8_t* rend,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = length;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (n > rend - rptr) {\n n = rend - rptr;\n }\n if (n > 0) {\n memmove(wptr, rptr, n);\n *ptr_wptr += n;\n *ptr_rptr += n;\n }\n return n;\n}\n\nstatic inline uint64_t wuffs_base__io_writer__copy_from_slice(\n uint8_t** p" + "tr_wptr,\n uint8_t* wend,\n wuffs_base__slice_u8 src) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_slice32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n wuffs_base__slice_u8 src,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit(\n wuffs_base__io_reader* o,\n uint8_t* rptr,\n uint64_t limit) {\n if (o && ((o->private_impl.bounds[1] - rptr) > limit)) {\n o->private_impl.bounds[1] = rptr + limit;\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(\n wuffs_base__io_rea" + - "der* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark(\n wuffs_base__io_writer* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n" + + "der* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__set(\n wuffs_base__io_writer* o,\n wuffs_base__io_buffer* b,\n wuffs_base__slice_u8 s) {\n b->ptr = s.ptr;\n b->len = s.len;\n b->wi = 0;\n b->ri = 0;\n b->closed = false;\n o->private_impl.buf = b;\n o->private_impl.bounds[0] = s.ptr;\n o->private_impl.bounds[1] = s.ptr + s.len;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark(\n wuffs_base__io_writer* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n" + "" type template_args_short_read struct { diff --git a/cmd/wuffs-c/internal/cgen/expr.go b/cmd/wuffs-c/internal/cgen/expr.go index b6684854..b4111f64 100644 --- a/cmd/wuffs-c/internal/cgen/expr.go +++ b/cmd/wuffs-c/internal/cgen/expr.go @@ -376,6 +376,22 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare "&self->private_impl.f_lzw, WUFFS_VERSION, 0)") return nil } + if isThatMethod(g.tm, n, t.IDSet, 1) || isThatMethod(g.tm, n, t.IDSet, 2) { + typ := "reader" + if len(n.Args()) == 1 { + typ = "writer" + } + // TODO: don't hard-code v_w and u_w. + b.printf("wuffs_base__io_%s__set(&v_w, &u_w", typ) + for _, o := range n.Args() { + b.writeb(',') + if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesOptional, depth); err != nil { + return err + } + } + b.writes(")") + return nil + } // TODO. case t.IDOpenBracket: diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index f45ad9de..ba56f37a 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1533,6 +1533,21 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct wuffs_base__io_writer__set( + wuffs_base__io_writer* o, + wuffs_base__io_buffer* b, + wuffs_base__slice_u8 s) { + b->ptr = s.ptr; + b->len = s.len; + b->wi = 0; + b->ri = 0; + b->closed = false; + o->private_impl.buf = b; + o->private_impl.bounds[0] = s.ptr; + o->private_impl.bounds[1] = s.ptr + s.len; + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( wuffs_base__io_writer* o, uint8_t* mark) { diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 8fbc57b8..39b766ff 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1532,6 +1532,21 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct wuffs_base__io_writer__set( + wuffs_base__io_writer* o, + wuffs_base__io_buffer* b, + wuffs_base__slice_u8 s) { + b->ptr = s.ptr; + b->len = s.len; + b->wi = 0; + b->ri = 0; + b->closed = false; + o->private_impl.buf = b; + o->private_impl.bounds[0] = s.ptr; + o->private_impl.bounds[1] = s.ptr + s.len; + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( wuffs_base__io_writer* o, uint8_t* mark) { diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 1e3e24a2..208be215 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1624,6 +1624,21 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct wuffs_base__io_writer__set( + wuffs_base__io_writer* o, + wuffs_base__io_buffer* b, + wuffs_base__slice_u8 s) { + b->ptr = s.ptr; + b->len = s.len; + b->wi = 0; + b->ri = 0; + b->closed = false; + o->private_impl.buf = b; + o->private_impl.bounds[0] = s.ptr; + o->private_impl.bounds[1] = s.ptr + s.len; + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( wuffs_base__io_writer* o, uint8_t* mark) { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index b9426154..9f1f9549 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1643,6 +1643,21 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct wuffs_base__io_writer__set( + wuffs_base__io_writer* o, + wuffs_base__io_buffer* b, + wuffs_base__slice_u8 s) { + b->ptr = s.ptr; + b->len = s.len; + b->wi = 0; + b->ri = 0; + b->closed = false; + o->private_impl.buf = b; + o->private_impl.bounds[0] = s.ptr; + o->private_impl.bounds[1] = s.ptr + s.len; + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( wuffs_base__io_writer* o, uint8_t* mark) { @@ -2883,6 +2898,12 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id( { wuffs_base__io_reader o_0_a_src = a_src; wuffs_base__io_writer o_0_v_w = v_w; + wuffs_base__io_writer__set( + &v_w, &u_w, + wuffs_base__slice_u8__subslice_i( + ((wuffs_base__slice_u8){ + .ptr = self->private_impl.f_uncompressed, .len = 4096}), + self->private_impl.f_uncompressed_index)); 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); { diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 2134af6e..a2056ce4 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1827,6 +1827,21 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct wuffs_base__io_writer__set( + wuffs_base__io_writer* o, + wuffs_base__io_buffer* b, + wuffs_base__slice_u8 s) { + b->ptr = s.ptr; + b->len = s.len; + b->wi = 0; + b->ri = 0; + b->closed = false; + o->private_impl.buf = b; + o->private_impl.bounds[0] = s.ptr; + o->private_impl.bounds[1] = s.ptr + s.len; + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( wuffs_base__io_writer* o, uint8_t* mark) { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 26922cca..0a5b95de 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1827,6 +1827,21 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark( return ((wuffs_base__empty_struct){}); } +static inline wuffs_base__empty_struct wuffs_base__io_writer__set( + wuffs_base__io_writer* o, + wuffs_base__io_buffer* b, + wuffs_base__slice_u8 s) { + b->ptr = s.ptr; + b->len = s.len; + b->wi = 0; + b->ri = 0; + b->closed = false; + o->private_impl.buf = b; + o->private_impl.bounds[0] = s.ptr; + o->private_impl.bounds[1] = s.ptr + s.len; + return ((wuffs_base__empty_struct){}); +} + static inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark( wuffs_base__io_writer* o, uint8_t* mark) { diff --git a/lang/builtin/builtin.go b/lang/builtin/builtin.go index eb232005..7a090ff5 100644 --- a/lang/builtin/builtin.go +++ b/lang/builtin/builtin.go @@ -117,6 +117,7 @@ var Funcs = []string{ "io_reader.read_u64le?()(ret u64)", "io_reader.available()(ret u64)", + "io_reader.set!(s slice u8, closed bool)()", "io_reader.set_limit!(l u64)()", "io_reader.set_mark!()()", "io_reader.since_mark()(ret slice u8)", @@ -135,6 +136,7 @@ var Funcs = []string{ "io_writer.write_u64le?(x u64)()", "io_writer.available()(ret u64)", + "io_writer.set!(s slice u8)()", "io_writer.set_limit!(l u64)()", "io_writer.set_mark!()()", "io_writer.since_mark()(ret slice u8)", diff --git a/lang/token/list.go b/lang/token/list.go index 83e0748a..e83fb177 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -467,6 +467,7 @@ const ( IDSinceMark = ID(0x212) IDMax = ID(0x213) IDMin = ID(0x214) + IDSet = ID(0x215) ) var builtInsByID = [nBuiltInIDs]string{ @@ -659,6 +660,7 @@ var builtInsByID = [nBuiltInIDs]string{ IDSinceMark: "since_mark", IDMax: "max", IDMin: "min", + IDSet: "set", } var builtInsByName = map[string]ID{} diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index a0edcd4e..f9448700 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -342,6 +342,7 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() { while true { var w base.io_writer io_bind (in.src, w) { + w.set!(s:this.uncompressed[this.uncompressed_index:]) // TODO: enforce that calling r.set_limit has a precondition // that r.is_bound(), and that you can't suspend inside an // io_bind? Otherwise, the cgen implementation becomes more