diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index 9b6fad55..c03066cb 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -402,6 +402,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } @@ -434,6 +439,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 0bbb3899..aad8ebd7 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -96,9 +96,9 @@ const baseImpl = "" + " NULL (i.e. implicit, callee-calculated) bounds.\n return buf ? ((buf->ptr <= o.private_impl.bounds[0]) &&\n (o.private_impl.bounds[0] <= o.private_impl.bounds[1]) &&\n (o.private_impl.bounds[1] <= buf->ptr + buf->len))\n : ((o.private_impl.bounds[0] == NULL) &&\n (o.private_impl.bounds[1] == NULL));\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_history32(\n uint8_t** ptr_ptr,\n uint8_t* start,\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n if (!distance) {\n return 0;\n }\n uint8_t* ptr = *ptr_ptr;\n if ((size_t)(ptr - start) < (size_t)(distance)) {\n return 0;\n }\n start = ptr - distance;\n size_t n = end - ptr;\n if ((size_t)(length) > n) {\n length = n;\n } else {\n n = 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 th" + "e\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_ptr - 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** ptr_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\n// TODO: delete.\nstatic inline wuffs_base__io_reader wuffs_base__io_reader__limit(\n wuffs_base__io_reader* o,\n uint64_t* ptr_to_len) {\n wuffs_base__io_reader ret = *o;\n ret.private_impl.limit.ptr_to_len = ptr_to_len;\n ret.private_impl.limit.next = &o->private_impl.limit;\n return ret;\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit(\n wuffs_base__io_reader* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bou" + - "nds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,\n uint64_t limit,\n size_t ri_override) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + ri_override;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__mark(\n wuffs_base__io_reader* 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_limit(\n wuffs_base__io_writer* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;\n if ((o->private_impl.bounds[1] - p) > limit) {\n " + - " o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__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" + + "*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\n// TODO: delete.\nstatic inline wuffs_base__io_reader wuffs_base__io_reader__limit(\n wuffs_base__io_reader* o,\n uint64_t* ptr_to_len) {\n wuffs_base__io_reader ret = *o;\n ret.private_impl.limit.ptr_to_len = ptr_to_len;\n ret.private_impl.limit.next = &o->private_impl.limit;\n return ret;\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit(\n wuffs_base__io_reader* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri;\n uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi;\n if " + + "(!o->private_impl.bounds[0]) {\n o->private_impl.bounds[0] = p;\n o->private_impl.bounds[1] = q;\n }\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct\nwuffs_base__io_reader__set_limit_internal(wuffs_base__io_reader* o,\n uint64_t limit,\n size_t ri_override) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + ri_override;\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__mark(\n wuffs_base__io_reader* 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_limit(\n wuffs_base__io_wr" + + "iter* o,\n uint64_t limit) {\n if (o && o->private_impl.buf) {\n uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi;\n uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len;\n if (!o->private_impl.bounds[0]) {\n o->private_impl.bounds[0] = p;\n o->private_impl.bounds[1] = q;\n }\n if ((o->private_impl.bounds[1] - p) > limit) {\n o->private_impl.bounds[1] = p + limit;\n }\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__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/gen/c/std/adler32.c b/gen/c/std/adler32.c index 7a3c5f4f..00461f30 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1527,6 +1527,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } @@ -1559,6 +1564,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index c36c96c2..73def338 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1526,6 +1526,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } @@ -1558,6 +1563,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index dc47a844..708faf0e 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1618,6 +1618,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } @@ -1650,6 +1655,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 821fc547..f65504ba 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1634,6 +1634,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } @@ -1666,6 +1671,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 7eb96599..66d82f7f 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1822,6 +1822,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } @@ -1854,6 +1859,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 1ed723aa..8b9d6a9c 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1822,6 +1822,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->ri; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->wi; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; } @@ -1854,6 +1859,11 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set_limit( uint64_t limit) { if (o && o->private_impl.buf) { uint8_t* p = o->private_impl.buf->ptr + o->private_impl.buf->wi; + uint8_t* q = o->private_impl.buf->ptr + o->private_impl.buf->len; + if (!o->private_impl.bounds[0]) { + o->private_impl.bounds[0] = p; + o->private_impl.bounds[1] = q; + } if ((o->private_impl.bounds[1] - p) > limit) { o->private_impl.bounds[1] = p + limit; }