diff --git a/cmd/puffs-c/internal/cgen/base-impl.h b/cmd/puffs-c/internal/cgen/base-impl.h index 79e0c321..804c7596 100644 --- a/cmd/puffs-c/internal/cgen/base-impl.h +++ b/cmd/puffs-c/internal/cgen/base-impl.h @@ -65,7 +65,7 @@ static inline uint32_t puffs_base_load_u32le(uint8_t* p) { ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i( +static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_i( puffs_base_slice_u8 s, uint64_t i) { if ((i <= SIZE_MAX) && (i <= s.len)) { @@ -77,7 +77,7 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i( return ((puffs_base_slice_u8){}); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j( +static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_j( puffs_base_slice_u8 s, uint64_t j) { if ((j <= SIZE_MAX) && (j <= s.len)) { @@ -86,10 +86,8 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j( return ((puffs_base_slice_u8){}); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_ij( - puffs_base_slice_u8 s, - uint64_t i, - uint64_t j) { +static inline puffs_base_slice_u8 +puffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) { if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) { return ((puffs_base_slice_u8){ .ptr = s.ptr + i, diff --git a/cmd/puffs-c/internal/cgen/data.go b/cmd/puffs-c/internal/cgen/data.go index 998cc1fd..c28307f5 100644 --- a/cmd/puffs-c/internal/cgen/data.go +++ b/cmd/puffs-c/internal/cgen/data.go @@ -14,9 +14,9 @@ const baseHeader = "" + const baseImpl = "" + "#ifndef PUFFS_BASE_IMPL_H\n#define PUFFS_BASE_IMPL_H\n\n// Use of this source code is governed by a BSD-style license that can be found\n// in the LICENSE file.\n\n#define PUFFS_IGNORE_POTENTIALLY_UNUSED_VARIABLE(x) (void)(x)\n\n// Use switch cases for coroutine suspension points, similar to the technique\n// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use a trivial macro instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define PUFFS_COROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n case n:\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define PUFFS_LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define PUFFS_UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n// Declare the printf prototype. The generated code shouldn't need this at all,\n// but it's useful for manual printf debugging.\nextern int printf(const char* __restrict __format, ...);\n#else\n#define PUFFS_LIKELY(expr) (expr)\n#de" + "fine PUFFS_UNLIKELY(expr) (expr)\n#endif\n\n// ---------------- Static Inline Functions\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 puffs .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\nstatic inline uint16_t puffs_base_load_u16be(uint8_t* p) {\n return ((uint16_t)(p[0]) << 8) | ((uint16_t)(p[1" + - "]) << 0);\n}\n\nstatic inline uint16_t puffs_base_load_u16le(uint8_t* p) {\n return ((uint16_t)(p[0]) << 0) | ((uint16_t)(p[1]) << 8);\n}\n\nstatic inline uint32_t puffs_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 puffs_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 puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i(\n puffs_base_slice_u8 s,\n uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((puffs_base_slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((puffs_base_slice_u8){});\n}\n\nstatic inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j(\n puffs_base_slice_u8 s,\n uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((puffs_base_slice_u8){.ptr = s.ptr, .len = j});\n }\n r" + - "eturn ((puffs_base_slice_u8){});\n}\n\nstatic inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_ij(\n puffs_base_slice_u8 s,\n uint64_t i,\n uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((puffs_base_slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((puffs_base_slice_u8){});\n}\n\n// puffs_base_slice_u8_prefix returns up to the first n bytes of s.\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_prefix(\n puffs_base_slice_u8 s,\n uint64_t n) {\n if ((uint64_t)(s.len) > n) {\n s.len = n;\n }\n return s;\n}\n\n// puffs_base_slice_u8_suffix returns up to the last n bytes of s.\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_suffix(\n puffs_base_slice_u8 s,\n uint64_t n) {\n if ((uint64_t)(s.len) > n) {\n s.ptr += (uint64_t)(s.len) - n;\n s.len = n;\n }\n return s;\n}\n\n// puffs_base_slice_u8_copy_from calls memmove(dst.ptr, src.ptr, n) where n is\n// the minimum of dst.len and src.len.\n//\n// Passing a puffs_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 puffs_base_slice_u8_copy_from(puffs_base_slice_u8 dst,\n puffs_base_slice_u8 src) {\n size_t n = dst.len < src.len ? dst.len : src.len;\n if (n > 0) {\n memmove(dst.ptr, src.ptr, n);\n }\n return n;\n}\n\n#endif // PUFFS_BASE_IMPL_H\n" + + "]) << 0);\n}\n\nstatic inline uint16_t puffs_base_load_u16le(uint8_t* p) {\n return ((uint16_t)(p[0]) << 0) | ((uint16_t)(p[1]) << 8);\n}\n\nstatic inline uint32_t puffs_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 puffs_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 puffs_base_slice_u8 puffs_base_slice_u8_subslice_i(\n puffs_base_slice_u8 s,\n uint64_t i) {\n if ((i <= SIZE_MAX) && (i <= s.len)) {\n return ((puffs_base_slice_u8){\n .ptr = s.ptr + i,\n .len = s.len - i,\n });\n }\n return ((puffs_base_slice_u8){});\n}\n\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_j(\n puffs_base_slice_u8 s,\n uint64_t j) {\n if ((j <= SIZE_MAX) && (j <= s.len)) {\n return ((puffs_base_slice_u8){.ptr = s.ptr, .len = j});\n }\n return ((pu" + + "ffs_base_slice_u8){});\n}\n\nstatic inline puffs_base_slice_u8\npuffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) {\n if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {\n return ((puffs_base_slice_u8){\n .ptr = s.ptr + i,\n .len = j - i,\n });\n }\n return ((puffs_base_slice_u8){});\n}\n\n// puffs_base_slice_u8_prefix returns up to the first n bytes of s.\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_prefix(\n puffs_base_slice_u8 s,\n uint64_t n) {\n if ((uint64_t)(s.len) > n) {\n s.len = n;\n }\n return s;\n}\n\n// puffs_base_slice_u8_suffix returns up to the last n bytes of s.\nstatic inline puffs_base_slice_u8 puffs_base_slice_u8_suffix(\n puffs_base_slice_u8 s,\n uint64_t n) {\n if ((uint64_t)(s.len) > n) {\n s.ptr += (uint64_t)(s.len) - n;\n s.len = n;\n }\n return s;\n}\n\n// puffs_base_slice_u8_copy_from calls memmove(dst.ptr, src.ptr, n) where n is\n// the minimum of dst.len and src.len.\n//\n// Passing a puffs_base_slice_u8 with all fields NULL or zer" + + "o (a valid, empty\n// slice) is valid and results in a no-op.\nstatic inline uint64_t puffs_base_slice_u8_copy_from(puffs_base_slice_u8 dst,\n puffs_base_slice_u8 src) {\n size_t n = dst.len < src.len ? dst.len : src.len;\n if (n > 0) {\n memmove(dst.ptr, src.ptr, n);\n }\n return n;\n}\n\n#endif // PUFFS_BASE_IMPL_H\n" + "" type template_args_short_read struct { diff --git a/cmd/puffs-c/internal/cgen/expr.go b/cmd/puffs-c/internal/cgen/expr.go index 15dae3db..2c395560 100644 --- a/cmd/puffs-c/internal/cgen/expr.go +++ b/cmd/puffs-c/internal/cgen/expr.go @@ -213,11 +213,11 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare rhs := n.RHS().Expr() switch { case mhs != nil && rhs == nil: - b.writes("puffs_base_make_slice_u8_subslice_i(") + b.writes("puffs_base_slice_u8_subslice_i(") case mhs == nil && rhs != nil: - b.writes("puffs_base_make_slice_u8_subslice_j(") + b.writes("puffs_base_slice_u8_subslice_j(") case mhs != nil && rhs != nil: - b.writes("puffs_base_make_slice_u8_subslice_ij(") + b.writes("puffs_base_slice_u8_subslice_ij(") } lhsIsArray := lhs.MType().Decorator().Key() == t.KeyOpenBracket diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 3bea6c6d..bbe0a2e5 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -348,7 +348,7 @@ static inline uint32_t puffs_base_load_u32le(uint8_t* p) { ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i( +static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_i( puffs_base_slice_u8 s, uint64_t i) { if ((i <= SIZE_MAX) && (i <= s.len)) { @@ -360,7 +360,7 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i( return ((puffs_base_slice_u8){}); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j( +static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_j( puffs_base_slice_u8 s, uint64_t j) { if ((j <= SIZE_MAX) && (j <= s.len)) { @@ -369,10 +369,8 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j( return ((puffs_base_slice_u8){}); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_ij( - puffs_base_slice_u8 s, - uint64_t i, - uint64_t j) { +static inline puffs_base_slice_u8 +puffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) { if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) { return ((puffs_base_slice_u8){ .ptr = s.ptr + i, @@ -684,13 +682,13 @@ puffs_flate_status puffs_flate_decoder_decode(puffs_flate_decoder* self, self->private_impl.f_history_index = 32768; } else { v_n = puffs_base_slice_u8_copy_from( - puffs_base_make_slice_u8_subslice_i( + puffs_base_slice_u8_subslice_i( ((puffs_base_slice_u8){.ptr = self->private_impl.f_history, .len = 32768}), self->private_impl.f_history_index & 32767), v_written); if (v_n < ((uint64_t)(v_written.len))) { - v_written = puffs_base_make_slice_u8_subslice_i(v_written, v_n); + v_written = puffs_base_slice_u8_subslice_i(v_written, v_n); v_n = puffs_base_slice_u8_copy_from( ((puffs_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 aae1173a..e4adc0e4 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -318,7 +318,7 @@ static inline uint32_t puffs_base_load_u32le(uint8_t* p) { ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i( +static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_i( puffs_base_slice_u8 s, uint64_t i) { if ((i <= SIZE_MAX) && (i <= s.len)) { @@ -330,7 +330,7 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_i( return ((puffs_base_slice_u8){}); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j( +static inline puffs_base_slice_u8 puffs_base_slice_u8_subslice_j( puffs_base_slice_u8 s, uint64_t j) { if ((j <= SIZE_MAX) && (j <= s.len)) { @@ -339,10 +339,8 @@ static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_j( return ((puffs_base_slice_u8){}); } -static inline puffs_base_slice_u8 puffs_base_make_slice_u8_subslice_ij( - puffs_base_slice_u8 s, - uint64_t i, - uint64_t j) { +static inline puffs_base_slice_u8 +puffs_base_slice_u8_subslice_ij(puffs_base_slice_u8 s, uint64_t i, uint64_t j) { if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) { return ((puffs_base_slice_u8){ .ptr = s.ptr + i,