diff --git a/cmd/wuffs-c/internal/cgen/base-header.h b/cmd/wuffs-c/internal/cgen/base-header.h index fdf6c975..31df3d67 100644 --- a/cmd/wuffs-c/internal/cgen/base-header.h +++ b/cmd/wuffs-c/internal/cgen/base-header.h @@ -161,38 +161,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index 0f363df4..669f93b1 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -124,6 +124,8 @@ static inline uint64_t wuffs_base__load_u64le(uint8_t* p) { ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56); } +// -------- + static inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i( wuffs_base__slice_u8 s, uint64_t i) { @@ -194,6 +196,40 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( return length; } +// -------- + +static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_add(*x, y); +} + +static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_sub(*x, y); +} + +static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_add(*x, y); +} + +static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_sub(*x, y); +} + +static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_add(*x, y); +} + +static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_sub(*x, y); +} + +static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_add(*x, y); +} + +static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_sub(*x, y); +} + // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index a61d09d9..6e4724a7 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -25,8 +25,7 @@ const baseHeader = "" + "// --------\n\nstatic inline uint8_t wuffs_base__u8__min(uint8_t x, uint8_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint8_t wuffs_base__u8__max(uint8_t x, uint8_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint16_t wuffs_base__u16__min(uint16_t x, uint16_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint16_t wuffs_base__u16__max(uint16_t x, uint16_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint32_t wuffs_base__u32__min(uint32_t x, uint32_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint32_t wuffs_base__u32__max(uint32_t x, uint32_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint64_t wuffs_base__u64__min(uint64_t x, uint64_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint64_t wuffs_base__u64__max(uint64_t x, uint64_t y) {\n return x > y ? x : y;\n}\n\n" + "" + "// --------\n\n// Saturating arithmetic (sat_add, sat_sub) branchless bit-twiddling algorithms\n// are per https://locklessinc.com/articles/sat_arithmetic/\n//\n// It is important that the underlying types are unsigned integers, as signed\n// integer arithmetic overflow is undefined behavior in C.\n\nstatic inline uint8_t wuffs_base__u8__sat_add(uint8_t x, uint8_t y) {\n uint8_t res = x + y;\n res |= -(res < x);\n return res;\n}\n\nstatic inline uint8_t wuffs_base__u8__sat_sub(uint8_t x, uint8_t y) {\n uint8_t res = x - y;\n res &= -(res <= x);\n return res;\n}\n\nstatic inline uint16_t wuffs_base__u16__sat_add(uint16_t x, uint16_t y) {\n uint16_t res = x + y;\n res |= -(res < x);\n return res;\n}\n\nstatic inline uint16_t wuffs_base__u16__sat_sub(uint16_t x, uint16_t y) {\n uint16_t res = x - y;\n res &= -(res <= x);\n return res;\n}\n\nstatic inline uint32_t wuffs_base__u32__sat_add(uint32_t x, uint32_t y) {\n uint32_t res = x + y;\n res |= -(res < x);\n return res;\n}\n\nstatic inline uint32_t wuffs_base__u32__sat_sub(uint32_t x" + - ", uint32_t y) {\n uint32_t res = x - y;\n res &= -(res <= x);\n return res;\n}\n\nstatic inline uint64_t wuffs_base__u64__sat_add(uint64_t x, uint64_t y) {\n uint64_t res = x + y;\n res |= -(res < x);\n return res;\n}\n\nstatic inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) {\n uint64_t res = x - y;\n res &= -(res <= x);\n return res;\n}\n\nstatic inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) {\n *x = wuffs_base__u8__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) {\n *x = wuffs_base__u8__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) {\n *x = wuffs_base__u16__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) {\n *x = wuffs_base__u16__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) {\n *x = wuffs_base__u32__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x," + - " uint32_t y) {\n *x = wuffs_base__u32__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) {\n *x = wuffs_base__u64__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) {\n *x = wuffs_base__u64__sat_sub(*x, y);\n}\n\n" + + ", uint32_t y) {\n uint32_t res = x - y;\n res &= -(res <= x);\n return res;\n}\n\nstatic inline uint64_t wuffs_base__u64__sat_add(uint64_t x, uint64_t y) {\n uint64_t res = x + y;\n res |= -(res < x);\n return res;\n}\n\nstatic inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) {\n uint64_t res = x - y;\n res &= -(res <= x);\n return res;\n}\n\n" + "" + "// ---------------- Ranges and Rects\n\n// Ranges are either inclusive (\"range_ii\") or exclusive (\"range_ie\") on the\n// high end. Both the \"ii\" and \"ie\" flavors are useful in practice.\n//\n// The \"ei\" and \"ee\" flavors also exist in theory, but aren't widely used. In\n// Wuffs, the low end is always inclusive.\n//\n// The \"ii\" (closed interval) flavor is useful when refining e.g. \"the set of\n// all uint32_t values\" to a contiguous subset: \"uint32_t values in the closed\n// interval [M, N]\", for uint32_t values M and N. An unrefined type (in other\n// words, the set of all uint32_t values) is not representable in the \"ie\"\n// flavor because if N equals ((1<<32) - 1) then (N + 1) will overflow.\n//\n// On the other hand, the \"ie\" (half-open interval) flavor is recommended by\n// Dijkstra's \"Why numbering should start at zero\" at\n// http://www.cs.utexas.edu/users/EWD/ewd08xx/EWD831.PDF and a further\n// discussion of motivating rationale is at\n// https://www.quora.com/Why-are-Python-ranges-half-open-exclusive-instead-of-close" + "d-inclusive\n//\n// For example, with \"ie\", the number of elements in \"uint32_t values in the\n// half-open interval [M, N)\" is equal to max(0, N-M). Furthermore, that number\n// of elements (in one dimension, a length, in two dimensions, a width or\n// height) is itself representable as a uint32_t without overflow, again for\n// uint32_t values M and N. In the contrasting \"ii\" flavor, the length of the\n// closed interval [0, (1<<32) - 1] is 1<<32, which cannot be represented as a\n// uint32_t. In Wuffs, because of this potential overflow, the \"ie\" flavor has\n// length / width / height methods, but the \"ii\" flavor does not.\n//\n// It is valid for min > max (for range_ii) or for min >= max (for range_ie),\n// in which case the range is empty. There are multiple representations of an\n// empty range.\n\ntypedef struct {\n uint32_t min_inclusive;\n uint32_t max_inclusive;\n} wuffs_base__range_ii_u32;\n\nstatic inline bool wuffs_base__range_ii_u32__is_empty(\n wuffs_base__range_ii_u32 r) {\n return r.min_inclusive > r.max_inc" + @@ -84,9 +83,12 @@ const baseImpl = "" + "bugging.\n// #include \n\n// The helpers below are functions, instead of macros, because their arguments\n// can be an expression that we shouldn't evaluate more than once.\n//\n// They are in base-impl.h and hence copy/pasted into every generated C file,\n// instead of being in some \"base.c\" file, since a design goal is that users of\n// the generated C code can often just #include a single .c file, such as\n// \"gif.c\", without having to additionally include or otherwise build and link\n// a \"base.c\" file.\n//\n// They are static, so that linking multiple wuffs .o files won't complain about\n// duplicate function definitions.\n//\n// They are explicitly marked inline, even if modern compilers don't use the\n// inline attribute to guide optimizations such as inlining, to avoid the\n// -Wunused-function warning, and we like to compile with -Wall -Werror.\n\n" + "" + "// ---------------- Fundamentals\n\nstatic inline uint16_t wuffs_base__load_u16be(uint8_t* p) {\n return ((uint16_t)(p[0]) << 8) | ((uint16_t)(p[1]) << 0);\n}\n\nstatic inline uint16_t wuffs_base__load_u16le(uint8_t* p) {\n return ((uint16_t)(p[0]) << 0) | ((uint16_t)(p[1]) << 8);\n}\n\nstatic inline uint32_t wuffs_base__load_u32be(uint8_t* p) {\n return ((uint32_t)(p[0]) << 24) | ((uint32_t)(p[1]) << 16) |\n ((uint32_t)(p[2]) << 8) | ((uint32_t)(p[3]) << 0);\n}\n\nstatic inline uint32_t wuffs_base__load_u32le(uint8_t* p) {\n return ((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) |\n ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24);\n}\n\nstatic inline uint64_t wuffs_base__load_u64be(uint8_t* p) {\n return ((uint64_t)(p[0]) << 56) | ((uint64_t)(p[1]) << 48) |\n ((uint64_t)(p[2]) << 40) | ((uint64_t)(p[3]) << 32) |\n ((uint64_t)(p[4]) << 24) | ((uint64_t)(p[5]) << 16) |\n ((uint64_t)(p[6]) << 8) | ((uint64_t)(p[7]) << 0);\n}\n\nstatic inline uint64_t wuffs_base__load_u64le(uint8_t* p) {\n" + - " return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) |\n ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24) |\n ((uint64_t)(p[4]) << 32) | ((uint64_t)(p[5]) << 40) |\n ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56);\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i(\n wuffs_base__slice_u8 s,\n uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_j(\n wuffs_base__slice_u8 s,\n uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){.ptr = s.ptr, .len = j});\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_ij(\n wuffs_base__slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice" + - "_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s.\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__prefix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s.\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.ptr += (uint64_t)(s.len) - up_to;\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr,\n// length) where length is the minimum of dst.len and src.len.\n//\n// Passing a wuffs_base__slice_u8 with all fields NULL or zero (a valid, empty\n// slice) is valid and results in a no-op.\nstatic inline uint64_t wuffs_base__slice_u8__copy_from_slice(\n wuffs_base__slice_u8 dst,\n " + - " wuffs_base__slice_u8 src) {\n size_t length = dst.len < src.len ? dst.len : src.len;\n if (length > 0) {\n memmove(dst.ptr, src.ptr, length);\n }\n return length;\n}\n\n" + + " return ((uint64_t)(p[0]) << 0) | ((uint64_t)(p[1]) << 8) |\n ((uint64_t)(p[2]) << 16) | ((uint64_t)(p[3]) << 24) |\n ((uint64_t)(p[4]) << 32) | ((uint64_t)(p[5]) << 40) |\n ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56);\n}\n\n" + + "" + + "// --------\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i(\n wuffs_base__slice_u8 s,\n uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_j(\n wuffs_base__slice_u8 s,\n uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){.ptr = s.ptr, .len = j});\n }\n return ((wuffs_base__slice_u8){});\n}\n\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_ij(\n wuffs_base__slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((wuffs_base__slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((wuffs_base__slice_u8){});\n}\n\n// wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s.\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8__pr" + + "efix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s.\nstatic inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix(\n wuffs_base__slice_u8 s,\n uint64_t up_to) {\n if ((uint64_t)(s.len) > up_to) {\n s.ptr += (uint64_t)(s.len) - up_to;\n s.len = up_to;\n }\n return s;\n}\n\n// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr,\n// length) where length is the minimum of dst.len and src.len.\n//\n// Passing a wuffs_base__slice_u8 with all fields NULL or zero (a valid, empty\n// slice) is valid and results in a no-op.\nstatic inline uint64_t wuffs_base__slice_u8__copy_from_slice(\n wuffs_base__slice_u8 dst,\n wuffs_base__slice_u8 src) {\n size_t length = dst.len < src.len ? dst.len : src.len;\n if (length > 0) {\n memmove(dst.ptr, src.ptr, length);\n }\n return length;\n}\n\n" + + "" + + "// --------\n\nstatic inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) {\n *x = wuffs_base__u8__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) {\n *x = wuffs_base__u8__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) {\n *x = wuffs_base__u16__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) {\n *x = wuffs_base__u16__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) {\n *x = wuffs_base__u32__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) {\n *x = wuffs_base__u32__sat_sub(*x, y);\n}\n\nstatic inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) {\n *x = wuffs_base__u64__sat_add(*x, y);\n}\n\nstatic inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) {\n *x = wuffs_base__u64__sat_sub(*x, y);\n}\n\n" + "" + "// ---------------- 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_valid(wuffs_base__io_reader o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\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 wuffs_base__io_writer__is_valid(wuffs_base__io_writer o) {\n wuffs_base__io_buffer* buf = o.private_impl.buf;\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, // May be NULL, meaning an unmarked io_writer.\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n if (!start || !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 // Altern" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index 43c0af94..6fe966ce 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the @@ -1246,6 +1214,8 @@ static inline uint64_t wuffs_base__load_u64le(uint8_t* p) { ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56); } +// -------- + static inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i( wuffs_base__slice_u8 s, uint64_t i) { @@ -1316,6 +1286,40 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( return length; } +// -------- + +static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_add(*x, y); +} + +static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_sub(*x, y); +} + +static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_add(*x, y); +} + +static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_sub(*x, y); +} + +static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_add(*x, y); +} + +static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_sub(*x, y); +} + +static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_add(*x, y); +} + +static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_sub(*x, y); +} + // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index fea2e463..7df7699a 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the @@ -1245,6 +1213,8 @@ static inline uint64_t wuffs_base__load_u64le(uint8_t* p) { ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56); } +// -------- + static inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i( wuffs_base__slice_u8 s, uint64_t i) { @@ -1315,6 +1285,40 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( return length; } +// -------- + +static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_add(*x, y); +} + +static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_sub(*x, y); +} + +static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_add(*x, y); +} + +static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_sub(*x, y); +} + +static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_add(*x, y); +} + +static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_sub(*x, y); +} + +static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_add(*x, y); +} + +static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_sub(*x, y); +} + // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index 6e5627f9..d810d7f6 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the @@ -1337,6 +1305,8 @@ static inline uint64_t wuffs_base__load_u64le(uint8_t* p) { ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56); } +// -------- + static inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i( wuffs_base__slice_u8 s, uint64_t i) { @@ -1407,6 +1377,40 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( return length; } +// -------- + +static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_add(*x, y); +} + +static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_sub(*x, y); +} + +static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_add(*x, y); +} + +static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_sub(*x, y); +} + +static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_add(*x, y); +} + +static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_sub(*x, y); +} + +static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_add(*x, y); +} + +static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_sub(*x, y); +} + // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index ab4ef3c2..2a069862 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the @@ -1355,6 +1323,8 @@ static inline uint64_t wuffs_base__load_u64le(uint8_t* p) { ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56); } +// -------- + static inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i( wuffs_base__slice_u8 s, uint64_t i) { @@ -1425,6 +1395,40 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( return length; } +// -------- + +static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_add(*x, y); +} + +static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_sub(*x, y); +} + +static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_add(*x, y); +} + +static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_sub(*x, y); +} + +static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_add(*x, y); +} + +static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_sub(*x, y); +} + +static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_add(*x, y); +} + +static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_sub(*x, y); +} + // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 07199aee..7716a6b4 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the @@ -1541,6 +1509,8 @@ static inline uint64_t wuffs_base__load_u64le(uint8_t* p) { ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56); } +// -------- + static inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i( wuffs_base__slice_u8 s, uint64_t i) { @@ -1611,6 +1581,40 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( return length; } +// -------- + +static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_add(*x, y); +} + +static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_sub(*x, y); +} + +static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_add(*x, y); +} + +static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_sub(*x, y); +} + +static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_add(*x, y); +} + +static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_sub(*x, y); +} + +static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_add(*x, y); +} + +static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_sub(*x, y); +} + // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 8478d4a0..ad8c9b72 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the @@ -1541,6 +1509,8 @@ static inline uint64_t wuffs_base__load_u64le(uint8_t* p) { ((uint64_t)(p[6]) << 48) | ((uint64_t)(p[7]) << 56); } +// -------- + static inline wuffs_base__slice_u8 wuffs_base__slice_u8__subslice_i( wuffs_base__slice_u8 s, uint64_t i) { @@ -1611,6 +1581,40 @@ static inline uint64_t wuffs_base__slice_u8__copy_from_slice( return length; } +// -------- + +static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_add(*x, y); +} + +static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { + *x = wuffs_base__u8__sat_sub(*x, y); +} + +static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_add(*x, y); +} + +static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { + *x = wuffs_base__u16__sat_sub(*x, y); +} + +static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_add(*x, y); +} + +static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { + *x = wuffs_base__u32__sat_sub(*x, y); +} + +static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_add(*x, y); +} + +static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { + *x = wuffs_base__u64__sat_sub(*x, y); +} + // ---------------- I/O static inline bool wuffs_base__io_buffer__is_valid(wuffs_base__io_buffer buf) { diff --git a/gen/h/std/adler32.h b/gen/h/std/adler32.h index 7ce88553..88b68bf3 100644 --- a/gen/h/std/adler32.h +++ b/gen/h/std/adler32.h @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the diff --git a/gen/h/std/crc32.h b/gen/h/std/crc32.h index 3f3236c1..6bc60ded 100644 --- a/gen/h/std/crc32.h +++ b/gen/h/std/crc32.h @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the diff --git a/gen/h/std/deflate.h b/gen/h/std/deflate.h index ba5c3204..a783161d 100644 --- a/gen/h/std/deflate.h +++ b/gen/h/std/deflate.h @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the diff --git a/gen/h/std/gif.h b/gen/h/std/gif.h index b617b2b7..91defc65 100644 --- a/gen/h/std/gif.h +++ b/gen/h/std/gif.h @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the diff --git a/gen/h/std/gzip.h b/gen/h/std/gzip.h index cee3c787..66d44d59 100644 --- a/gen/h/std/gzip.h +++ b/gen/h/std/gzip.h @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the diff --git a/gen/h/std/zlib.h b/gen/h/std/zlib.h index a3b9354d..9879e1c8 100644 --- a/gen/h/std/zlib.h +++ b/gen/h/std/zlib.h @@ -164,38 +164,6 @@ static inline uint64_t wuffs_base__u64__sat_sub(uint64_t x, uint64_t y) { return res; } -static inline void wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_add(*x, y); -} - -static inline void wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) { - *x = wuffs_base__u8__sat_sub(*x, y); -} - -static inline void wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_add(*x, y); -} - -static inline void wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) { - *x = wuffs_base__u16__sat_sub(*x, y); -} - -static inline void wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_add(*x, y); -} - -static inline void wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) { - *x = wuffs_base__u32__sat_sub(*x, y); -} - -static inline void wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_add(*x, y); -} - -static inline void wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) { - *x = wuffs_base__u64__sat_sub(*x, y); -} - // ---------------- Ranges and Rects // Ranges are either inclusive ("range_ii") or exclusive ("range_ie") on the