diff --git a/cmd/wuffs-c/internal/cgen/base-impl.h b/cmd/wuffs-c/internal/cgen/base-impl.h index 075a958e..c7950136 100644 --- a/cmd/wuffs-c/internal/cgen/base-impl.h +++ b/cmd/wuffs-c/internal/cgen/base-impl.h @@ -171,7 +171,7 @@ static inline wuffs_base__slice_u8 wuffs_base__slice_u8__prefix( } // wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s. -static inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix( +static inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix( wuffs_base__slice_u8 s, uint64_t up_to) { if ((uint64_t)(s.len) > up_to) { diff --git a/cmd/wuffs-c/internal/cgen/builtin.go b/cmd/wuffs-c/internal/cgen/builtin.go index 93b51fae..fd3d20a3 100644 --- a/cmd/wuffs-c/internal/cgen/builtin.go +++ b/cmd/wuffs-c/internal/cgen/builtin.go @@ -119,7 +119,7 @@ func (g *gen) writeBuiltin(b *buffer, n *a.Expr, rp replacementPolicy, depth uin } if isThatMethod(g.tm, n, t.IDSuffix, 1) { // TODO: don't assume that the slice is a slice of base.u8. - b.writes("wuffs_base__slice_u8_suffix(") + b.writes("wuffs_base__slice_u8__suffix(") x := n.LHS().Expr().LHS().Expr() if err := g.writeExpr(b, x, rp, depth); err != nil { return err diff --git a/cmd/wuffs-c/internal/cgen/data.go b/cmd/wuffs-c/internal/cgen/data.go index b4bd7144..38e6d338 100644 --- a/cmd/wuffs-c/internal/cgen/data.go +++ b/cmd/wuffs-c/internal/cgen/data.go @@ -88,7 +88,7 @@ const baseImpl = "" + " 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" + + "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" + "" + diff --git a/gen/c/std/adler32.c b/gen/c/std/adler32.c index ba3cdf2b..a1369cf4 100644 --- a/gen/c/std/adler32.c +++ b/gen/c/std/adler32.c @@ -1295,7 +1295,7 @@ static inline wuffs_base__slice_u8 wuffs_base__slice_u8__prefix( } // wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s. -static inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix( +static inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix( wuffs_base__slice_u8 s, uint64_t up_to) { if ((uint64_t)(s.len) > up_to) { diff --git a/gen/c/std/crc32.c b/gen/c/std/crc32.c index 6539d8bb..0a6e37fa 100644 --- a/gen/c/std/crc32.c +++ b/gen/c/std/crc32.c @@ -1294,7 +1294,7 @@ static inline wuffs_base__slice_u8 wuffs_base__slice_u8__prefix( } // wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s. -static inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix( +static inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix( wuffs_base__slice_u8 s, uint64_t up_to) { if ((uint64_t)(s.len) > up_to) { diff --git a/gen/c/std/deflate.c b/gen/c/std/deflate.c index bb34b7c5..4f61f66e 100644 --- a/gen/c/std/deflate.c +++ b/gen/c/std/deflate.c @@ -1386,7 +1386,7 @@ static inline wuffs_base__slice_u8 wuffs_base__slice_u8__prefix( } // wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s. -static inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix( +static inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix( wuffs_base__slice_u8 s, uint64_t up_to) { if ((uint64_t)(s.len) > up_to) { @@ -1890,7 +1890,7 @@ wuffs_deflate__status wuffs_deflate__decoder__decode( .len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]), }); if (((uint64_t)(v_written.len)) >= 32768) { - v_written = wuffs_base__slice_u8_suffix(v_written, 32768); + v_written = wuffs_base__slice_u8__suffix(v_written, 32768); wuffs_base__slice_u8__copy_from_slice( ((wuffs_base__slice_u8){.ptr = self->private_impl.f_history, .len = 32768}), diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 273c95c9..e0b7de38 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -1408,7 +1408,7 @@ static inline wuffs_base__slice_u8 wuffs_base__slice_u8__prefix( } // wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s. -static inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix( +static inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix( wuffs_base__slice_u8 s, uint64_t up_to) { if ((uint64_t)(s.len) > up_to) { diff --git a/gen/c/std/gzip.c b/gen/c/std/gzip.c index 79b792cd..188356bc 100644 --- a/gen/c/std/gzip.c +++ b/gen/c/std/gzip.c @@ -1589,7 +1589,7 @@ static inline wuffs_base__slice_u8 wuffs_base__slice_u8__prefix( } // wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s. -static inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix( +static inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix( wuffs_base__slice_u8 s, uint64_t up_to) { if ((uint64_t)(s.len) > up_to) { diff --git a/gen/c/std/zlib.c b/gen/c/std/zlib.c index 2b87d6eb..1f0aa8b7 100644 --- a/gen/c/std/zlib.c +++ b/gen/c/std/zlib.c @@ -1589,7 +1589,7 @@ static inline wuffs_base__slice_u8 wuffs_base__slice_u8__prefix( } // wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s. -static inline wuffs_base__slice_u8 wuffs_base__slice_u8_suffix( +static inline wuffs_base__slice_u8 wuffs_base__slice_u8__suffix( wuffs_base__slice_u8 s, uint64_t up_to) { if ((uint64_t)(s.len) > up_to) {