diff --git a/internal/cgen/base/io-private.h b/internal/cgen/base/io-private.h index a9b4ca19..6aeb0fab 100644 --- a/internal/cgen/base/io-private.h +++ b/internal/cgen/base/io-private.h @@ -160,9 +160,8 @@ wuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_iop_w, return (uint32_t)(n); } -static inline wuffs_base__empty_struct // -wuffs_base__io_reader__set(wuffs_base__io_buffer** o, - wuffs_base__io_buffer* b, +static inline wuffs_base__io_buffer* // +wuffs_base__io_reader__set(wuffs_base__io_buffer* b, uint8_t** ptr_iop_r, uint8_t** ptr_io0_r, uint8_t** ptr_io1_r, @@ -174,15 +173,12 @@ wuffs_base__io_reader__set(wuffs_base__io_buffer** o, b->meta.pos = 0; b->meta.closed = false; - *o = b; *ptr_iop_r = data.ptr; *ptr_io0_r = data.ptr; *ptr_io1_r = data.ptr; *ptr_io2_r = data.ptr + data.len; - wuffs_base__empty_struct ret; - ret.private_impl = 0; - return ret; + return b; } static inline wuffs_base__slice_u8 // @@ -195,9 +191,8 @@ wuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) { return wuffs_base__make_slice_u8(NULL, 0); } -static inline wuffs_base__empty_struct // -wuffs_base__io_writer__set(wuffs_base__io_buffer** o, - wuffs_base__io_buffer* b, +static inline wuffs_base__io_buffer* // +wuffs_base__io_writer__set(wuffs_base__io_buffer* b, uint8_t** ptr_iop_w, uint8_t** ptr_io0_w, uint8_t** ptr_io1_w, @@ -209,15 +204,12 @@ wuffs_base__io_writer__set(wuffs_base__io_buffer** o, b->meta.pos = 0; b->meta.closed = false; - *o = b; *ptr_iop_w = data.ptr; *ptr_io0_w = data.ptr; *ptr_io1_w = data.ptr; *ptr_io2_w = data.ptr + data.len; - wuffs_base__empty_struct ret; - ret.private_impl = 0; - return ret; + return b; } // ---------------- I/O (Utility) diff --git a/internal/cgen/data.go b/internal/cgen/data.go index a2c6e06a..906b18b9 100644 --- a/internal/cgen/data.go +++ b/internal/cgen/data.go @@ -167,8 +167,8 @@ const baseIOPrivateH = "" + " n = (size_t)(length);\n }\n // TODO: unrolling 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_n_from_history 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_n_from_history_fast below.\n //\n // Alternatively, or additionally, have a sloppy_copy_n_from_history method\n // that copies 8 bytes at a time, possibly writing more than length bytes?\n for (; n >= 3; n -= 3) {\n *p++ = *q++;\n *p++ = *q++;\n *p++ = *q++;\n }\n for (; n; n--) {\n *p++ = *q++;\n }\n *ptr_iop_w = p;\n return length;\n}\n\n// wuffs_base__io_writer__copy_n_from_history_fast is like the\n// wuffs_base__io_writer__copy_n_from_history function above, but has stronger\n// pre-conditions. The caller needs to prove that:\n// - distance > " + "0\n// - distance <= (*ptr_iop_w - io1_w)\n// - length <= (io2_w - *ptr_iop_w)\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_history_fast(uint8_t** ptr_iop_w,\n uint8_t* io1_w,\n uint8_t* io2_w,\n uint32_t length,\n uint32_t distance) {\n uint8_t* p = *ptr_iop_w;\n uint8_t* q = p - distance;\n uint32_t n = length;\n for (; n >= 3; n -= 3) {\n *p++ = *q++;\n *p++ = *q++;\n *p++ = *q++;\n }\n for (; n; n--) {\n *p++ = *q++;\n }\n *ptr_iop_w = p;\n return length;\n}\n\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_reader(uint8_t** ptr_iop_w,\n uint8_t* io2_w,\n uint32_t length,\n uint8_t** ptr_iop_r,\n uint8_t* io2_r) {\n uint8_t* i" + "op_w = *ptr_iop_w;\n size_t n = length;\n if (n > ((size_t)(io2_w - iop_w))) {\n n = (size_t)(io2_w - iop_w);\n }\n uint8_t* iop_r = *ptr_iop_r;\n if (n > ((size_t)(io2_r - iop_r))) {\n n = (size_t)(io2_r - iop_r);\n }\n if (n > 0) {\n memmove(iop_w, iop_r, n);\n *ptr_iop_w += n;\n *ptr_iop_r += n;\n }\n return (uint32_t)(n);\n}\n\nstatic inline uint64_t //\nwuffs_base__io_writer__copy_from_slice(uint8_t** ptr_iop_w,\n uint8_t* io2_w,\n wuffs_base__slice_u8 src) {\n uint8_t* iop_w = *ptr_iop_w;\n size_t n = src.len;\n if (n > ((size_t)(io2_w - iop_w))) {\n n = (size_t)(io2_w - iop_w);\n }\n if (n > 0) {\n memmove(iop_w, src.ptr, n);\n *ptr_iop_w += n;\n }\n return (uint64_t)(n);\n}\n\nstatic inline uint32_t //\nwuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_iop_w,\n uint8_t* io2_w,\n uint32_t length,\n w" + - "uffs_base__slice_u8 src) {\n uint8_t* iop_w = *ptr_iop_w;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > ((size_t)(io2_w - iop_w))) {\n n = (size_t)(io2_w - iop_w);\n }\n if (n > 0) {\n memmove(iop_w, src.ptr, n);\n *ptr_iop_w += n;\n }\n return (uint32_t)(n);\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_reader__set(wuffs_base__io_buffer** o,\n wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_r,\n uint8_t** ptr_io0_r,\n uint8_t** ptr_io1_r,\n uint8_t** ptr_io2_r,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = data.len;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n *o = b;\n *ptr_iop_r = data.ptr;\n *ptr_io0_r = data.ptr;\n *ptr_io1_r = data.ptr;\n *ptr_io2_r = data.ptr + data.len;\n\n wuffs_base__empty_struct ret;\n ret.private_impl = 0;\n return ret;\n}\n\nstatic inline wuffs_base__sli" + - "ce_u8 //\nwuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) {\n if (n <= ((size_t)(io2_r - *ptr_iop_r))) {\n uint8_t* p = *ptr_iop_r;\n *ptr_iop_r += n;\n return wuffs_base__make_slice_u8(p, n);\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__io_writer__set(wuffs_base__io_buffer** o,\n wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_w,\n uint8_t** ptr_io0_w,\n uint8_t** ptr_io1_w,\n uint8_t** ptr_io2_w,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = 0;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n *o = b;\n *ptr_iop_w = data.ptr;\n *ptr_io0_w = data.ptr;\n *ptr_io1_w = data.ptr;\n *ptr_io2_w = data.ptr + data.len;\n\n wuffs_base__empty_struct ret;\n ret.private_impl = 0;\n return ret;\n}\n\n" + + "uffs_base__slice_u8 src) {\n uint8_t* iop_w = *ptr_iop_w;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > ((size_t)(io2_w - iop_w))) {\n n = (size_t)(io2_w - iop_w);\n }\n if (n > 0) {\n memmove(iop_w, src.ptr, n);\n *ptr_iop_w += n;\n }\n return (uint32_t)(n);\n}\n\nstatic inline wuffs_base__io_buffer* //\nwuffs_base__io_reader__set(wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_r,\n uint8_t** ptr_io0_r,\n uint8_t** ptr_io1_r,\n uint8_t** ptr_io2_r,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = data.len;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n *ptr_iop_r = data.ptr;\n *ptr_io0_r = data.ptr;\n *ptr_io1_r = data.ptr;\n *ptr_io2_r = data.ptr + data.len;\n\n return b;\n}\n\nstatic inline wuffs_base__slice_u8 //\nwuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) {\n if (n <= ((size_t)(io2_r - *ptr_i" + + "op_r))) {\n uint8_t* p = *ptr_iop_r;\n *ptr_iop_r += n;\n return wuffs_base__make_slice_u8(p, n);\n }\n return wuffs_base__make_slice_u8(NULL, 0);\n}\n\nstatic inline wuffs_base__io_buffer* //\nwuffs_base__io_writer__set(wuffs_base__io_buffer* b,\n uint8_t** ptr_iop_w,\n uint8_t** ptr_io0_w,\n uint8_t** ptr_io1_w,\n uint8_t** ptr_io2_w,\n wuffs_base__slice_u8 data) {\n b->data = data;\n b->meta.wi = 0;\n b->meta.ri = 0;\n b->meta.pos = 0;\n b->meta.closed = false;\n\n *ptr_iop_w = data.ptr;\n *ptr_io0_w = data.ptr;\n *ptr_io1_w = data.ptr;\n *ptr_io2_w = data.ptr + data.len;\n\n return b;\n}\n\n" + "" + "// ---------------- I/O (Utility)\n\n#define wuffs_base__utility__null_io_reader wuffs_base__null_io_reader\n#define wuffs_base__utility__null_io_writer wuffs_base__null_io_writer\n" + "" diff --git a/internal/cgen/statement.go b/internal/cgen/statement.go index 1cd06f00..c0f02afb 100644 --- a/internal/cgen/statement.go +++ b/internal/cgen/statement.go @@ -285,8 +285,8 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { } if n.Keyword() == t.IDIOBind { - b.printf("wuffs_base__io_%s__set(&%s%s, &%s%s, &%s%s%s, &%s%s%s, &%s%s%s, &%s%s%s,", - cTyp, prefix, name, uPrefix, name, iopPrefix, prefix, name, + b.printf("%s%s = wuffs_base__io_%s__set(&%s%s, &%s%s%s, &%s%s%s, &%s%s%s, &%s%s%s,", + prefix, name, cTyp, uPrefix, name, iopPrefix, prefix, name, io0Prefix, prefix, name, io1Prefix, prefix, name, io2Prefix, prefix, name) if err := g.writeExpr(b, n.Arg1(), 0); err != nil { return err diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index bd309d38..1559b267 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -4610,9 +4610,8 @@ wuffs_base__io_writer__copy_n_from_slice(uint8_t** ptr_iop_w, return (uint32_t)(n); } -static inline wuffs_base__empty_struct // -wuffs_base__io_reader__set(wuffs_base__io_buffer** o, - wuffs_base__io_buffer* b, +static inline wuffs_base__io_buffer* // +wuffs_base__io_reader__set(wuffs_base__io_buffer* b, uint8_t** ptr_iop_r, uint8_t** ptr_io0_r, uint8_t** ptr_io1_r, @@ -4624,15 +4623,12 @@ wuffs_base__io_reader__set(wuffs_base__io_buffer** o, b->meta.pos = 0; b->meta.closed = false; - *o = b; *ptr_iop_r = data.ptr; *ptr_io0_r = data.ptr; *ptr_io1_r = data.ptr; *ptr_io2_r = data.ptr + data.len; - wuffs_base__empty_struct ret; - ret.private_impl = 0; - return ret; + return b; } static inline wuffs_base__slice_u8 // @@ -4645,9 +4641,8 @@ wuffs_base__io_reader__take(uint8_t** ptr_iop_r, uint8_t* io2_r, uint64_t n) { return wuffs_base__make_slice_u8(NULL, 0); } -static inline wuffs_base__empty_struct // -wuffs_base__io_writer__set(wuffs_base__io_buffer** o, - wuffs_base__io_buffer* b, +static inline wuffs_base__io_buffer* // +wuffs_base__io_writer__set(wuffs_base__io_buffer* b, uint8_t** ptr_iop_w, uint8_t** ptr_io0_w, uint8_t** ptr_io1_w, @@ -4659,15 +4654,12 @@ wuffs_base__io_writer__set(wuffs_base__io_buffer** o, b->meta.pos = 0; b->meta.closed = false; - *o = b; *ptr_iop_w = data.ptr; *ptr_io0_w = data.ptr; *ptr_io1_w = data.ptr; *ptr_io2_w = data.ptr + data.len; - wuffs_base__empty_struct ret; - ret.private_impl = 0; - return ret; + return b; } // ---------------- I/O (Utility) @@ -10896,8 +10888,8 @@ wuffs_gif__decoder__decode_id_part2(wuffs_gif__decoder* self, uint8_t* o_0_io0_v_r = io0_v_r; uint8_t* o_0_io1_v_r = io1_v_r; uint8_t* o_0_io2_v_r = io2_v_r; - wuffs_base__io_reader__set( - &v_r, &u_r, &iop_v_r, &io0_v_r, &io1_v_r, &io2_v_r, + v_r = wuffs_base__io_reader__set( + &u_r, &iop_v_r, &io0_v_r, &io1_v_r, &io2_v_r, wuffs_base__slice_u8__subslice_ij( wuffs_base__make_slice_u8(self->private_data.f_compressed, 4096),