From a641f9ad3cf6a22ed729a1cb9c6923d9604f54e1 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 17 May 2018 10:07:48 +1000 Subject: [PATCH] Rename some rptr arguments --- cmd/wuffs-c/internal/cgen/base-impl.h | 60 +++++++++++++-------------- cmd/wuffs-c/internal/cgen/data.go | 6 +-- gen/c/std/adler32.c | 60 +++++++++++++-------------- gen/c/std/crc32.c | 60 +++++++++++++-------------- gen/c/std/deflate.c | 60 +++++++++++++-------------- gen/c/std/gif.c | 60 +++++++++++++-------------- gen/c/std/gzip.c | 60 +++++++++++++-------------- gen/c/std/zlib.c | 60 +++++++++++++-------------- 8 files changed, 213 insertions(+), 213 deletions(-) diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index c7950136..13f65f52 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -334,70 +334,70 @@ static inline uint32_t wuffs_base__io_writer__copy_from_history32__bco( } static inline uint32_t wuffs_base__io_writer__copy_from_reader32( - uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, + uint8_t** ptr_ioptr_r, + uint8_t* iobounds1_r, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = length; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } - uint8_t* rptr = *ptr_rptr; - if (n > rend - rptr) { - n = rend - rptr; + uint8_t* ioptr_r = *ptr_ioptr_r; + if (n > iobounds1_r - ioptr_r) { + n = iobounds1_r - ioptr_r; } if (n > 0) { - memmove(wptr, rptr, n); - *ptr_wptr += n; - *ptr_rptr += n; + memmove(ioptr_w, ioptr_r, n); + *ptr_ioptr_w += n; + *ptr_ioptr_r += n; } return n; } static inline uint64_t wuffs_base__io_writer__copy_from_slice( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline uint32_t wuffs_base__io_writer__copy_from_slice32( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; if (n > length) { n = length; } - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( wuffs_base__io_reader* o, - uint8_t* rptr, + uint8_t* ioptr_r, uint64_t limit) { - if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { - o->private_impl.bounds[1] = rptr + limit; + if (o && ((o->private_impl.bounds[1] - ioptr_r) > limit)) { + o->private_impl.bounds[1] = ioptr_r + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index 38e6d338..574f5ad0 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -95,9 +95,9 @@ const baseImpl = "" + "// ---------------- I/O\n\nstatic inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) {\n return (buf.ptr || (buf.len == 0)) && (buf.len >= buf.wi) &&\n (buf.wi >= buf.ri);\n}\n\nstatic inline bool wuffs_base__io_reader__is_eof(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n return buf && buf->closed && (buf->ptr + buf->wi == o.private_impl.bounds[1]);\n}\n\nstatic inline bool wuffs_base__io_reader__is_valid(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow 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 bool wuf" + "fs_base__io_writer__is_valid(wuffs_base__io_writer o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\n // Note: if making this function public (i.e. moving it to base-header.h), it\n // also needs to allow 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 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(\n wuffs_base__io_writer* o,\n wuffs_base__io_buffer* b,\n uint8_t** ioptr1_ptr,\n uint8_t** ioptr2_ptr,\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 *ioptr1_ptr = s.ptr;\n *ioptr2_ptr = 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" + + "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_ioptr_w,\n uint8_t* iobounds1_w,\n uint8_t** ptr_ioptr_r,\n uint8_t* iobounds1_r,\n uint32_t length) {\n uint8_t* ioptr_w = *ptr_ioptr_w;\n size_t n = length;\n if (n > iobounds1_w - ioptr_w) {\n n = iobounds1_w - ioptr_w;\n }\n uint8_t* ioptr_r = *ptr_ioptr_r;\n if (n > iobounds1_r - ioptr_r) {\n n = iobounds1_r - ioptr_r;\n }\n if (n > 0) {\n memmove(ioptr_w, ioptr_r, n);\n *ptr_ioptr_w += n;\n *ptr_ioptr_r += n;\n }\n return " + + "n;\n}\n\nstatic inline uint64_t wuffs_base__io_writer__copy_from_slice(\n uint8_t** ptr_ioptr_w,\n uint8_t* iobounds1_w,\n wuffs_base__slice_u8 src) {\n uint8_t* ioptr_w = *ptr_ioptr_w;\n size_t n = src.len;\n if (n > iobounds1_w - ioptr_w) {\n n = iobounds1_w - ioptr_w;\n }\n if (n > 0) {\n memmove(ioptr_w, src.ptr, n);\n *ptr_ioptr_w += n;\n }\n return n;\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_slice32(\n uint8_t** ptr_ioptr_w,\n uint8_t* iobounds1_w,\n wuffs_base__slice_u8 src,\n uint32_t length) {\n uint8_t* ioptr_w = *ptr_ioptr_w;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > iobounds1_w - ioptr_w) {\n n = iobounds1_w - ioptr_w;\n }\n if (n > 0) {\n memmove(ioptr_w, src.ptr, n);\n *ptr_ioptr_w += 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* ioptr_r,\n uint64_t limit) {\n if (o && ((o->private_impl.bounds[1] - ioptr_r) > limit)) {\n o->private" + + "_impl.bounds[1] = ioptr_r + 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_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(\n wuffs_base__io_writer* o,\n wuffs_base__io_buffer* b,\n uint8_t** ioptr1_ptr,\n uint8_t** ioptr2_ptr,\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 *ioptr1_ptr = s.ptr;\n *ioptr2_ptr = 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/gen/c/std/adler32.c b/gen/c/std/adler32.c index a1369cf4..c726506f 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1458,70 +1458,70 @@ static inline uint32_t wuffs_base__io_writer__copy_from_history32__bco( } static inline uint32_t wuffs_base__io_writer__copy_from_reader32( - uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, + uint8_t** ptr_ioptr_r, + uint8_t* iobounds1_r, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = length; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } - uint8_t* rptr = *ptr_rptr; - if (n > rend - rptr) { - n = rend - rptr; + uint8_t* ioptr_r = *ptr_ioptr_r; + if (n > iobounds1_r - ioptr_r) { + n = iobounds1_r - ioptr_r; } if (n > 0) { - memmove(wptr, rptr, n); - *ptr_wptr += n; - *ptr_rptr += n; + memmove(ioptr_w, ioptr_r, n); + *ptr_ioptr_w += n; + *ptr_ioptr_r += n; } return n; } static inline uint64_t wuffs_base__io_writer__copy_from_slice( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline uint32_t wuffs_base__io_writer__copy_from_slice32( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; if (n > length) { n = length; } - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( wuffs_base__io_reader* o, - uint8_t* rptr, + uint8_t* ioptr_r, uint64_t limit) { - if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { - o->private_impl.bounds[1] = rptr + limit; + if (o && ((o->private_impl.bounds[1] - ioptr_r) > limit)) { + o->private_impl.bounds[1] = ioptr_r + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 0a6e37fa..d9692ac8 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1457,70 +1457,70 @@ static inline uint32_t wuffs_base__io_writer__copy_from_history32__bco( } static inline uint32_t wuffs_base__io_writer__copy_from_reader32( - uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, + uint8_t** ptr_ioptr_r, + uint8_t* iobounds1_r, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = length; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } - uint8_t* rptr = *ptr_rptr; - if (n > rend - rptr) { - n = rend - rptr; + uint8_t* ioptr_r = *ptr_ioptr_r; + if (n > iobounds1_r - ioptr_r) { + n = iobounds1_r - ioptr_r; } if (n > 0) { - memmove(wptr, rptr, n); - *ptr_wptr += n; - *ptr_rptr += n; + memmove(ioptr_w, ioptr_r, n); + *ptr_ioptr_w += n; + *ptr_ioptr_r += n; } return n; } static inline uint64_t wuffs_base__io_writer__copy_from_slice( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline uint32_t wuffs_base__io_writer__copy_from_slice32( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; if (n > length) { n = length; } - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( wuffs_base__io_reader* o, - uint8_t* rptr, + uint8_t* ioptr_r, uint64_t limit) { - if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { - o->private_impl.bounds[1] = rptr + limit; + if (o && ((o->private_impl.bounds[1] - ioptr_r) > limit)) { + o->private_impl.bounds[1] = ioptr_r + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index b8a6a0ac..b778d886 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1549,70 +1549,70 @@ static inline uint32_t wuffs_base__io_writer__copy_from_history32__bco( } static inline uint32_t wuffs_base__io_writer__copy_from_reader32( - uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, + uint8_t** ptr_ioptr_r, + uint8_t* iobounds1_r, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = length; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } - uint8_t* rptr = *ptr_rptr; - if (n > rend - rptr) { - n = rend - rptr; + uint8_t* ioptr_r = *ptr_ioptr_r; + if (n > iobounds1_r - ioptr_r) { + n = iobounds1_r - ioptr_r; } if (n > 0) { - memmove(wptr, rptr, n); - *ptr_wptr += n; - *ptr_rptr += n; + memmove(ioptr_w, ioptr_r, n); + *ptr_ioptr_w += n; + *ptr_ioptr_r += n; } return n; } static inline uint64_t wuffs_base__io_writer__copy_from_slice( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline uint32_t wuffs_base__io_writer__copy_from_slice32( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; if (n > length) { n = length; } - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( wuffs_base__io_reader* o, - uint8_t* rptr, + uint8_t* ioptr_r, uint64_t limit) { - if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { - o->private_impl.bounds[1] = rptr + limit; + if (o && ((o->private_impl.bounds[1] - ioptr_r) > limit)) { + o->private_impl.bounds[1] = ioptr_r + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 62d1fcc0..8e0d2b6e 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1571,70 +1571,70 @@ static inline uint32_t wuffs_base__io_writer__copy_from_history32__bco( } static inline uint32_t wuffs_base__io_writer__copy_from_reader32( - uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, + uint8_t** ptr_ioptr_r, + uint8_t* iobounds1_r, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = length; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } - uint8_t* rptr = *ptr_rptr; - if (n > rend - rptr) { - n = rend - rptr; + uint8_t* ioptr_r = *ptr_ioptr_r; + if (n > iobounds1_r - ioptr_r) { + n = iobounds1_r - ioptr_r; } if (n > 0) { - memmove(wptr, rptr, n); - *ptr_wptr += n; - *ptr_rptr += n; + memmove(ioptr_w, ioptr_r, n); + *ptr_ioptr_w += n; + *ptr_ioptr_r += n; } return n; } static inline uint64_t wuffs_base__io_writer__copy_from_slice( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline uint32_t wuffs_base__io_writer__copy_from_slice32( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; if (n > length) { n = length; } - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( wuffs_base__io_reader* o, - uint8_t* rptr, + uint8_t* ioptr_r, uint64_t limit) { - if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { - o->private_impl.bounds[1] = rptr + limit; + if (o && ((o->private_impl.bounds[1] - ioptr_r) > limit)) { + o->private_impl.bounds[1] = ioptr_r + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index dc9bbbdf..7d6721fd 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1752,70 +1752,70 @@ static inline uint32_t wuffs_base__io_writer__copy_from_history32__bco( } static inline uint32_t wuffs_base__io_writer__copy_from_reader32( - uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, + uint8_t** ptr_ioptr_r, + uint8_t* iobounds1_r, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = length; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } - uint8_t* rptr = *ptr_rptr; - if (n > rend - rptr) { - n = rend - rptr; + uint8_t* ioptr_r = *ptr_ioptr_r; + if (n > iobounds1_r - ioptr_r) { + n = iobounds1_r - ioptr_r; } if (n > 0) { - memmove(wptr, rptr, n); - *ptr_wptr += n; - *ptr_rptr += n; + memmove(ioptr_w, ioptr_r, n); + *ptr_ioptr_w += n; + *ptr_ioptr_r += n; } return n; } static inline uint64_t wuffs_base__io_writer__copy_from_slice( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline uint32_t wuffs_base__io_writer__copy_from_slice32( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; if (n > length) { n = length; } - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( wuffs_base__io_reader* o, - uint8_t* rptr, + uint8_t* ioptr_r, uint64_t limit) { - if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { - o->private_impl.bounds[1] = rptr + limit; + if (o && ((o->private_impl.bounds[1] - ioptr_r) > limit)) { + o->private_impl.bounds[1] = ioptr_r + limit; } return ((wuffs_base__empty_struct){}); } diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index b1226f55..8787b4ee 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1752,70 +1752,70 @@ static inline uint32_t wuffs_base__io_writer__copy_from_history32__bco( } static inline uint32_t wuffs_base__io_writer__copy_from_reader32( - uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, + uint8_t** ptr_ioptr_r, + uint8_t* iobounds1_r, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = length; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } - uint8_t* rptr = *ptr_rptr; - if (n > rend - rptr) { - n = rend - rptr; + uint8_t* ioptr_r = *ptr_ioptr_r; + if (n > iobounds1_r - ioptr_r) { + n = iobounds1_r - ioptr_r; } if (n > 0) { - memmove(wptr, rptr, n); - *ptr_wptr += n; - *ptr_rptr += n; + memmove(ioptr_w, ioptr_r, n); + *ptr_ioptr_w += n; + *ptr_ioptr_r += n; } return n; } static inline uint64_t wuffs_base__io_writer__copy_from_slice( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline uint32_t wuffs_base__io_writer__copy_from_slice32( - uint8_t** ptr_wptr, - uint8_t* wend, + uint8_t** ptr_ioptr_w, + uint8_t* iobounds1_w, wuffs_base__slice_u8 src, uint32_t length) { - uint8_t* wptr = *ptr_wptr; + uint8_t* ioptr_w = *ptr_ioptr_w; size_t n = src.len; if (n > length) { n = length; } - if (n > wend - wptr) { - n = wend - wptr; + if (n > iobounds1_w - ioptr_w) { + n = iobounds1_w - ioptr_w; } if (n > 0) { - memmove(wptr, src.ptr, n); - *ptr_wptr += n; + memmove(ioptr_w, src.ptr, n); + *ptr_ioptr_w += n; } return n; } static inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit( wuffs_base__io_reader* o, - uint8_t* rptr, + uint8_t* ioptr_r, uint64_t limit) { - if (o && ((o->private_impl.bounds[1] - rptr) > limit)) { - o->private_impl.bounds[1] = rptr + limit; + if (o && ((o->private_impl.bounds[1] - ioptr_r) > limit)) { + o->private_impl.bounds[1] = ioptr_r + limit; } return ((wuffs_base__empty_struct){}); }