From 587be36759c52e816b711e0ce3fc22ea8a95401d Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 13 Oct 2017 11:06:14 +1100 Subject: [PATCH] Re-order cgen/base-impl.h methods for consistency. --- cmd/puffs-c/internal/cgen/base-impl.h | 42 +++++++++++++-------------- cmd/puffs-c/internal/cgen/data.go | 4 +-- gen/c/std/flate.c | 42 +++++++++++++-------------- gen/c/std/gif.c | 42 +++++++++++++-------------- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/base-impl.h b/cmd/puffs-c/internal/cgen/base-impl.h index 5ec9499a..324d1b55 100644 --- a/cmd/puffs-c/internal/cgen/base-impl.h +++ b/cmd/puffs-c/internal/cgen/base-impl.h @@ -154,27 +154,6 @@ static inline uint64_t puffs_base_slice_u8_copy_from_slice( return n; } -static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, - uint32_t length) { - uint8_t* wptr = *ptr_wptr; - if (length > (wend - wptr)) { - length = wend - wptr; - } - uint8_t* rptr = *ptr_rptr; - if (length > (rend - rptr)) { - length = rend - rptr; - } - if (length > 0) { - memmove(wptr, rptr, length); - *ptr_wptr += length; - *ptr_rptr += length; - } - return length; -} - static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, uint8_t* start, uint8_t* end, @@ -210,4 +189,25 @@ static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, return length; } +static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, + uint8_t* wend, + uint8_t** ptr_rptr, + uint8_t* rend, + uint32_t length) { + uint8_t* wptr = *ptr_wptr; + if (length > (wend - wptr)) { + length = wend - wptr; + } + uint8_t* rptr = *ptr_rptr; + if (length > (rend - rptr)) { + length = rend - rptr; + } + if (length > 0) { + memmove(wptr, rptr, length); + *ptr_wptr += length; + *ptr_rptr += length; + } + return length; +} + #endif // PUFFS_BASE_IMPL_H diff --git a/cmd/puffs-c/internal/cgen/data.go b/cmd/puffs-c/internal/cgen/data.go index f286d25f..befa51b7 100644 --- a/cmd/puffs-c/internal/cgen/data.go +++ b/cmd/puffs-c/internal/cgen/data.go @@ -29,8 +29,8 @@ const baseImpl = "" + "\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 puff" + "s_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 ((puffs_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_slice calls memmove(dst.ptr, src.ptr, n) where\n// n is 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 val" + - "id and results in a no-op.\nstatic inline uint64_t puffs_base_slice_u8_copy_from_slice(\n 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\nstatic inline uint32_t puffs_base_writer1_copy_from_reader32(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 if (length > (wend - wptr)) {\n length = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (length > (rend - rptr)) {\n length = rend - rptr;\n }\n if (length > 0) {\n memmove(wptr, rptr, length);\n *ptr_wptr += length;\n *ptr_rptr += length;\n }\n return length;\n}\n\nstatic inline uint32_t puffs_base_writer1_copy_from_hi" + - "story32(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 size_t d = ptr - start;\n if ((d == 0) || (d < (size_t)(distance))) {\n return 0;\n }\n start = ptr - distance;\n size_t l = end - ptr;\n if ((size_t)(length) > l) {\n length = l;\n } else {\n l = length;\n }\n // TODO: is manual unrolling actually helpful?\n for (; l >= 8; l -= 8) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; l; l--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\n#endif // PUFFS_BASE_IMPL_H\n" + + "id and results in a no-op.\nstatic inline uint64_t puffs_base_slice_u8_copy_from_slice(\n 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\nstatic inline uint32_t puffs_base_writer1_copy_from_history32(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 size_t d = ptr - start;\n if ((d == 0) || (d < (size_t)(distance))) {\n return 0;\n }\n start = ptr - distance;\n size_t l = end - ptr;\n if ((size_t)(length) > l) {\n length = l;\n } else {\n l = length;\n }\n // TODO: is manual unrolling actually helpful?\n for (; l >= 8; l -= 8) {\n *ptr++ = *start++;\n *ptr++ = *sta" + + "rt++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; l; l--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t puffs_base_writer1_copy_from_reader32(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 if (length > (wend - wptr)) {\n length = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (length > (rend - rptr)) {\n length = rend - rptr;\n }\n if (length > 0) {\n memmove(wptr, rptr, length);\n *ptr_wptr += length;\n *ptr_rptr += length;\n }\n return length;\n}\n\n#endif // PUFFS_BASE_IMPL_H\n" + "" type template_args_short_read struct { diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index 489a5e77..7defca91 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -449,27 +449,6 @@ static inline uint64_t puffs_base_slice_u8_copy_from_slice( return n; } -static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, - uint32_t length) { - uint8_t* wptr = *ptr_wptr; - if (length > (wend - wptr)) { - length = wend - wptr; - } - uint8_t* rptr = *ptr_rptr; - if (length > (rend - rptr)) { - length = rend - rptr; - } - if (length > 0) { - memmove(wptr, rptr, length); - *ptr_wptr += length; - *ptr_rptr += length; - } - return length; -} - static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, uint8_t* start, uint8_t* end, @@ -505,6 +484,27 @@ static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, return length; } +static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, + uint8_t* wend, + uint8_t** ptr_rptr, + uint8_t* rend, + uint32_t length) { + uint8_t* wptr = *ptr_wptr; + if (length > (wend - wptr)) { + length = wend - wptr; + } + uint8_t* rptr = *ptr_rptr; + if (length > (rend - rptr)) { + length = rend - rptr; + } + if (length > 0) { + memmove(wptr, rptr, length); + *ptr_wptr += length; + *ptr_rptr += length; + } + return length; +} + #endif // PUFFS_BASE_IMPL_H // ---------------- Status Codes Implementations diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index b04bf408..dade8d9e 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -416,27 +416,6 @@ static inline uint64_t puffs_base_slice_u8_copy_from_slice( return n; } -static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, - uint8_t* wend, - uint8_t** ptr_rptr, - uint8_t* rend, - uint32_t length) { - uint8_t* wptr = *ptr_wptr; - if (length > (wend - wptr)) { - length = wend - wptr; - } - uint8_t* rptr = *ptr_rptr; - if (length > (rend - rptr)) { - length = rend - rptr; - } - if (length > 0) { - memmove(wptr, rptr, length); - *ptr_wptr += length; - *ptr_rptr += length; - } - return length; -} - static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, uint8_t* start, uint8_t* end, @@ -472,6 +451,27 @@ static inline uint32_t puffs_base_writer1_copy_from_history32(uint8_t** ptr_ptr, return length; } +static inline uint32_t puffs_base_writer1_copy_from_reader32(uint8_t** ptr_wptr, + uint8_t* wend, + uint8_t** ptr_rptr, + uint8_t* rend, + uint32_t length) { + uint8_t* wptr = *ptr_wptr; + if (length > (wend - wptr)) { + length = wend - wptr; + } + uint8_t* rptr = *ptr_rptr; + if (length > (rend - rptr)) { + length = rend - rptr; + } + if (length > 0) { + memmove(wptr, rptr, length); + *ptr_wptr += length; + *ptr_rptr += length; + } + return length; +} + #endif // PUFFS_BASE_IMPL_H // ---------------- Status Codes Implementations