Compare commits

...
Author SHA1 Message Date
Nigel Tao 6bfaf0f008 wuffs gen -version=0.3.0-beta.4 2021-06-28 10:11:25 +10:00
Nigel Tao b9a10d051a Fix -Werror=conversion in fundamental-public.h 2021-06-28 10:10:13 +10:00
Nigel Tao 7f93a94e7a Tweak WUFFS_BASE__FALLTHROUGH comment 2021-06-28 10:07:01 +10:00
Nigel Tao a0698fc1a2 Add Peter Kasting to CONTRIBUTORS
"Google Inc." is already in AUTHORS.
2021-06-28 10:00:13 +10:00
Nigel Tao d8796aa6d9 Add wuffs_base__uxx__rotate_etc functions 2021-06-28 09:59:32 +10:00
Nigel Tao a12771373e Merge pull request #48 from pkasting/main
Fix -Wimplicit-fallthrough for Clang.
2021-06-28 09:58:23 +10:00
Peter Kasting c90cc7b657 Fix -Wimplicit-fallthrough for Clang.
WUFFS_BASE__FALLTHROUGH was not defined because the generated output is
C (so __cplusplus is never defined) and Clang was explicitly excluded
from the __attribute__ case (though it would have worked).

Instead test for the availability of the fallthrough attribute directly,
which should be more portable.

Bug: chromium:995993
2021-06-26 17:12:56 -07:00
11 changed files with 222 additions and 55 deletions

No files matched your search

+1
View File
@@ -39,3 +39,4 @@ Leo Neat <lneat@google.com>
Mike Kaufman <mkaufman@microsoft.com>
Muhammad Aldo Firmansyah <TheCrott@users.noreply.github.com>
Nigel Tao <nigeltao@golang.org>
Peter Kasting <pkasting@chromium.org>
+1 -1
View File
@@ -66,7 +66,7 @@ fuzz(wuffs_base__io_buffer* src, uint64_t hash) {
wuffs_base__status status = wuffs_bmp__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
(hash & 1) ? WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED : 0);
hash >>= 1;
hash = wuffs_base__u64__rotate_right(hash, 1);
if (!wuffs_base__status__is_ok(&status)) {
return wuffs_base__status__message(&status);
}
+12 -11
View File
@@ -221,12 +221,13 @@ fuzz_one_token(wuffs_base__token t,
}
uint64_t //
buffer_limit(uint64_t hash_6_bits, uint64_t min, uint64_t max) {
buffer_limit(uint64_t hash, uint64_t min, uint64_t max) {
hash &= 0x3F;
uint64_t n;
if (hash_6_bits < 0x20) {
n = min + hash_6_bits;
if (hash < 0x20) {
n = min + hash;
} else {
n = max - (0x3F - hash_6_bits);
n = max - (0x3F - hash);
}
if (n < min) {
return min;
@@ -237,15 +238,15 @@ buffer_limit(uint64_t hash_6_bits, uint64_t min, uint64_t max) {
}
const char* //
fuzz_complex(wuffs_base__io_buffer* full_src, uint64_t hash_56_bits) {
fuzz_complex(wuffs_base__io_buffer* full_src, uint64_t hash) {
uint64_t tok_limit = buffer_limit(
hash_56_bits & 0x3F, WUFFS_CBOR__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL,
hash & 0x3F, WUFFS_CBOR__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL,
TOK_BUFFER_ARRAY_SIZE);
uint64_t hash_50_bits = hash_56_bits >> 6;
hash = wuffs_base__u64__rotate_right(hash, 6);
uint64_t src_limit =
buffer_limit(hash_50_bits & 0x3F,
WUFFS_CBOR__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL, 4096);
uint64_t src_limit = buffer_limit(
hash & 0x3F, WUFFS_CBOR__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL, 4096);
hash = wuffs_base__u64__rotate_right(hash, 6);
// ----
@@ -407,7 +408,7 @@ fuzz(wuffs_base__io_buffer* full_src, uint64_t hash) {
// The fuzz_complex implementation adds many more Wuffs API specific checks
// (e.g. that the sum of the tokens' lengths do not exceed the input length).
if ((hash & 0xFF) != 0xA5) {
return fuzz_complex(full_src, hash >> 8);
return fuzz_complex(full_src, wuffs_base__u64__rotate_right(hash, 8));
}
return fuzz_simple(full_src);
}
+6 -6
View File
@@ -61,7 +61,7 @@ It should print "PASS", amongst other information, and exit(0).
#include "../fuzzlib/fuzzlib.c"
#include "../fuzzlib/fuzzlib_image_decoder.c"
void set_quirks(wuffs_gif__decoder* dec, uint64_t hash_55_bits) {
void set_quirks(wuffs_gif__decoder* dec, uint64_t hash) {
uint32_t quirks[] = {
WUFFS_GIF__QUIRK_DELAY_NUM_DECODED_FRAMES,
WUFFS_GIF__QUIRK_FIRST_FRAME_LOCAL_PALETTE_MEANS_BLACK_BACKGROUND,
@@ -75,8 +75,8 @@ void set_quirks(wuffs_gif__decoder* dec, uint64_t hash_55_bits) {
uint32_t i;
for (i = 0; quirks[i]; i++) {
uint64_t bit = 1 << (i % 55);
if (hash_55_bits & bit) {
uint64_t bit = 1 << (i & 63);
if (hash & bit) {
wuffs_gif__decoder__set_quirk_enabled(dec, quirks[i], true);
}
}
@@ -88,13 +88,13 @@ fuzz(wuffs_base__io_buffer* src, uint64_t hash) {
wuffs_base__status status = wuffs_gif__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
(hash & 1) ? WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED : 0);
hash >>= 1;
hash = wuffs_base__u64__rotate_right(hash, 1);
uint64_t hash_8_bits = hash & 0xFF;
uint64_t hash_55_bits = hash >> 8;
hash = wuffs_base__u64__rotate_right(hash, 8);
if (!wuffs_base__status__is_ok(&status)) {
return wuffs_base__status__message(&status);
}
set_quirks(&dec, hash_55_bits);
set_quirks(&dec, hash);
return fuzz_image_decoder(
src, hash_8_bits,
wuffs_gif__decoder__upcast_as__wuffs_base__image_decoder(&dec));
+16 -16
View File
@@ -209,12 +209,13 @@ fuzz_one_token(wuffs_base__token t,
}
uint64_t //
buffer_limit(uint64_t hash_6_bits, uint64_t min, uint64_t max) {
buffer_limit(uint64_t hash, uint64_t min, uint64_t max) {
hash &= 0x3F;
uint64_t n;
if (hash_6_bits < 0x20) {
n = min + hash_6_bits;
if (hash < 0x20) {
n = min + hash;
} else {
n = max - (0x3F - hash_6_bits);
n = max - (0x3F - hash);
}
if (n < min) {
return min;
@@ -224,7 +225,7 @@ buffer_limit(uint64_t hash_6_bits, uint64_t min, uint64_t max) {
return n;
}
void set_quirks(wuffs_json__decoder* dec, uint64_t hash_44_bits) {
void set_quirks(wuffs_json__decoder* dec, uint64_t hash) {
uint32_t quirks[] = {
WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_A,
WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_CAPITAL_U,
@@ -247,24 +248,23 @@ void set_quirks(wuffs_json__decoder* dec, uint64_t hash_44_bits) {
uint32_t i;
for (i = 0; quirks[i]; i++) {
uint64_t bit = 1 << (i % 44);
if (hash_44_bits & bit) {
uint64_t bit = 1 << (i & 63);
if (hash & bit) {
wuffs_json__decoder__set_quirk_enabled(dec, quirks[i], true);
}
}
}
const char* //
fuzz_complex(wuffs_base__io_buffer* full_src, uint64_t hash_56_bits) {
fuzz_complex(wuffs_base__io_buffer* full_src, uint64_t hash) {
uint64_t tok_limit = buffer_limit(
hash_56_bits & 0x3F, WUFFS_JSON__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL,
hash & 0x3F, WUFFS_JSON__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL,
TOK_BUFFER_ARRAY_SIZE);
uint64_t hash_50_bits = hash_56_bits >> 6;
hash = wuffs_base__u64__rotate_right(hash, 6);
uint64_t src_limit =
buffer_limit(hash_50_bits & 0x3F,
WUFFS_JSON__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL, 4096);
uint64_t hash_44_bits = hash_50_bits >> 6;
uint64_t src_limit = buffer_limit(
hash & 0x3F, WUFFS_JSON__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL, 4096);
hash = wuffs_base__u64__rotate_right(hash, 6);
// ----
@@ -275,7 +275,7 @@ fuzz_complex(wuffs_base__io_buffer* full_src, uint64_t hash_56_bits) {
if (!wuffs_base__status__is_ok(&status)) {
return wuffs_base__status__message(&status);
}
set_quirks(&dec, hash_44_bits);
set_quirks(&dec, hash);
wuffs_base__token tok_array[TOK_BUFFER_ARRAY_SIZE];
wuffs_base__token_buffer tok = ((wuffs_base__token_buffer){
@@ -427,7 +427,7 @@ fuzz(wuffs_base__io_buffer* full_src, uint64_t hash) {
// The fuzz_complex implementation adds many more Wuffs API specific checks
// (e.g. that the sum of the tokens' lengths do not exceed the input length).
if ((hash & 0xFF) != 0xA5) {
return fuzz_complex(full_src, hash >> 8);
return fuzz_complex(full_src, wuffs_base__u64__rotate_right(hash, 8));
}
return fuzz_simple(full_src);
}
+1 -1
View File
@@ -70,7 +70,7 @@ fuzz(wuffs_base__io_buffer* src, uint64_t hash) {
wuffs_base__status status = wuffs_png__decoder__initialize(
&dec, sizeof dec, WUFFS_VERSION,
(hash & 1) ? WUFFS_INITIALIZE__LEAVE_INTERNAL_BUFFERS_UNINITIALIZED : 0);
hash >>= 1;
hash = wuffs_base__u64__rotate_right(hash, 1);
if (!wuffs_base__status__is_ok(&status)) {
return wuffs_base__status__message(&status);
}
+8 -4
View File
@@ -31,14 +31,18 @@
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
#if defined(__clang__) && defined(__cplusplus) && (__cplusplus >= 201103L)
#define WUFFS_BASE__FALLTHROUGH [[clang::fallthrough]]
#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 7)
// The two #if lines are deliberately separate. Combining the two conditions
// into a single "#if foo && bar" line would not be portable. See
// https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fattribute.html
#if defined(__has_attribute)
#if __has_attribute(fallthrough)
#define WUFFS_BASE__FALLTHROUGH __attribute__((fallthrough))
#else
#define WUFFS_BASE__FALLTHROUGH
#endif
#else
#define WUFFS_BASE__FALLTHROUGH
#endif
// Use switch cases for coroutine suspension points, similar to the technique
// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
+50
View File
@@ -581,6 +581,56 @@ wuffs_base__u64__max(uint64_t x, uint64_t y) {
// --------
static inline uint8_t //
wuffs_base__u8__rotate_left(uint8_t x, uint32_t n) {
n &= 7;
return ((uint8_t)(x << n)) | ((uint8_t)(x >> (8 - n)));
}
static inline uint8_t //
wuffs_base__u8__rotate_right(uint8_t x, uint32_t n) {
n &= 7;
return ((uint8_t)(x >> n)) | ((uint8_t)(x << (8 - n)));
}
static inline uint16_t //
wuffs_base__u16__rotate_left(uint16_t x, uint32_t n) {
n &= 15;
return ((uint16_t)(x << n)) | ((uint16_t)(x >> (16 - n)));
}
static inline uint16_t //
wuffs_base__u16__rotate_right(uint16_t x, uint32_t n) {
n &= 15;
return ((uint16_t)(x >> n)) | ((uint16_t)(x << (16 - n)));
}
static inline uint32_t //
wuffs_base__u32__rotate_left(uint32_t x, uint32_t n) {
n &= 31;
return ((uint32_t)(x << n)) | ((uint32_t)(x >> (32 - n)));
}
static inline uint32_t //
wuffs_base__u32__rotate_right(uint32_t x, uint32_t n) {
n &= 31;
return ((uint32_t)(x >> n)) | ((uint32_t)(x << (32 - n)));
}
static inline uint64_t //
wuffs_base__u64__rotate_left(uint64_t x, uint32_t n) {
n &= 63;
return ((uint64_t)(x << n)) | ((uint64_t)(x >> (64 - n)));
}
static inline uint64_t //
wuffs_base__u64__rotate_right(uint64_t x, uint32_t n) {
n &= 63;
return ((uint64_t)(x >> n)) | ((uint64_t)(x << (64 - n)));
}
// --------
// Saturating arithmetic (sat_add, sat_sub) branchless bit-twiddling algorithms
// are per https://locklessinc.com/articles/sat_arithmetic/
//
+6 -3
View File
@@ -29,9 +29,9 @@ const BaseAllImplC = "" +
""
const BaseFundamentalPrivateH = "" +
"// ---------------- Fundamentals\n\n// WUFFS_BASE__MAGIC is a magic number to check that initializers are called.\n// It's not foolproof, given C doesn't automatically zero memory before use,\n// but it should catch 99.99% of cases.\n//\n// Its (non-zero) value is arbitrary, based on md5sum(\"wuffs\").\n#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)\n\n// WUFFS_BASE__DISABLED is a magic number to indicate that a non-recoverable\n// error was previously encountered.\n//\n// Its (non-zero) value is arbitrary, based on md5sum(\"disabled\").\n#define WUFFS_BASE__DISABLED ((uint32_t)0x075AE3D2)\n\n// Denote intentional fallthroughs for -Wimplicit-fallthrough.\n//\n// The order matters here. Clang also defines \"__GNUC__\".\n#if defined(__clang__) && defined(__cplusplus) && (__cplusplus >= 201103L)\n#define WUFFS_BASE__FALLTHROUGH [[clang::fallthrough]]\n#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 7)\n#define WUFFS_BASE__FALLTHROUGH __attribute__((fallthrough))\n#else\n#define WUFFS_BASE__FALLTHROUGH\n#endif\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 trivial macros instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0 case 0:;\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n WUFFS_BASE__FALLTHROUGH; \\\n case n:;\n\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(n) \\\n if (!status.repr) { \\\n goto ok; \\\n } else if (*status.repr != '$') { \\\n goto exit; \\\n } \\\n coro_susp_point = n; \\\n goto suspend; " +
" \\\n case n:;\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define WUFFS_BASE__LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define WUFFS_BASE__UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n#else\n#define WUFFS_BASE__LIKELY(expr) (expr)\n#define WUFFS_BASE__UNLIKELY(expr) (expr)\n#endif\n\n" +
"// ---------------- Fundamentals\n\n// WUFFS_BASE__MAGIC is a magic number to check that initializers are called.\n// It's not foolproof, given C doesn't automatically zero memory before use,\n// but it should catch 99.99% of cases.\n//\n// Its (non-zero) value is arbitrary, based on md5sum(\"wuffs\").\n#define WUFFS_BASE__MAGIC ((uint32_t)0x3CCB6C71)\n\n// WUFFS_BASE__DISABLED is a magic number to indicate that a non-recoverable\n// error was previously encountered.\n//\n// Its (non-zero) value is arbitrary, based on md5sum(\"disabled\").\n#define WUFFS_BASE__DISABLED ((uint32_t)0x075AE3D2)\n\n// Denote intentional fallthroughs for -Wimplicit-fallthrough.\n//\n// The two #if lines are deliberately separate. Combining the two conditions\n// into a single \"#if foo && bar\" line would not be portable. See\n// https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fattribute.html\n#if defined(__has_attribute)\n#if __has_attribute(fallthrough)\n#define WUFFS_BASE__FALLTHROUGH __attribute__((fallthrough))\n#else\n#define WUFFS_BASE__FALLTHROUGH\n" +
"#endif\n#else\n#define WUFFS_BASE__FALLTHROUGH\n#endif\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 trivial macros instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0 case 0:;\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n WUFFS_BASE__FALLTHROUGH; \\\n case n:;\n\n#define WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(n) \\\n if (!status.repr) { \\\n goto ok; \\\n } else if (*status.repr != '$') { \\\n goto exit; \\\n } \\\n coro_susp_point = n; " +
" \\\n goto suspend; \\\n case n:;\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define WUFFS_BASE__LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define WUFFS_BASE__UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n#else\n#define WUFFS_BASE__LIKELY(expr) (expr)\n#define WUFFS_BASE__UNLIKELY(expr) (expr)\n#endif\n\n" +
"" +
"// --------\n\nstatic inline wuffs_base__empty_struct //\nwuffs_base__ignore_status(wuffs_base__status z) {\n return wuffs_base__make_empty_struct();\n}\n\nstatic inline wuffs_base__status //\nwuffs_base__status__ensure_not_a_suspension(wuffs_base__status z) {\n if (z.repr && (*z.repr == '$')) {\n z.repr = wuffs_base__error__cannot_return_a_suspension;\n }\n return z;\n}\n\n" +
"" +
@@ -91,6 +91,9 @@ const BaseFundamentalPublicH = "" +
"int32_t //\nwuffs_base__i32__max(int32_t x, int32_t y) {\n return x > y ? x : y;\n}\n\nstatic inline int64_t //\nwuffs_base__i64__min(int64_t x, int64_t y) {\n return x < y ? x : y;\n}\n\nstatic inline int64_t //\nwuffs_base__i64__max(int64_t x, int64_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint8_t //\nwuffs_base__u8__min(uint8_t x, uint8_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint8_t //\nwuffs_base__u8__max(uint8_t x, uint8_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint16_t //\nwuffs_base__u16__min(uint16_t x, uint16_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint16_t //\nwuffs_base__u16__max(uint16_t x, uint16_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint32_t //\nwuffs_base__u32__min(uint32_t x, uint32_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint32_t //\nwuffs_base__u32__max(uint32_t x, uint32_t y) {\n return x > y ? x : y;\n}\n\nstatic inline uint64_t //\nwuffs_base__u64__min(uint64_t x, uint64_t y) {\n return x < y ? x : y;\n}\n\nstatic inline uint64_t //\nwuffs_base__u64__m" +
"ax(uint64_t x, uint64_t y) {\n return x > y ? x : y;\n}\n\n" +
"" +
"// --------\n\nstatic inline uint8_t //\nwuffs_base__u8__rotate_left(uint8_t x, uint32_t n) {\n n &= 7;\n return ((uint8_t)(x << n)) | ((uint8_t)(x >> (8 - n)));\n}\n\nstatic inline uint8_t //\nwuffs_base__u8__rotate_right(uint8_t x, uint32_t n) {\n n &= 7;\n return ((uint8_t)(x >> n)) | ((uint8_t)(x << (8 - n)));\n}\n\nstatic inline uint16_t //\nwuffs_base__u16__rotate_left(uint16_t x, uint32_t n) {\n n &= 15;\n return ((uint16_t)(x << n)) | ((uint16_t)(x >> (16 - n)));\n}\n\nstatic inline uint16_t //\nwuffs_base__u16__rotate_right(uint16_t x, uint32_t n) {\n n &= 15;\n return ((uint16_t)(x >> n)) | ((uint16_t)(x << (16 - n)));\n}\n\nstatic inline uint32_t //\nwuffs_base__u32__rotate_left(uint32_t x, uint32_t n) {\n n &= 31;\n return ((uint32_t)(x << n)) | ((uint32_t)(x >> (32 - n)));\n}\n\nstatic inline uint32_t //\nwuffs_base__u32__rotate_right(uint32_t x, uint32_t n) {\n n &= 31;\n return ((uint32_t)(x >> n)) | ((uint32_t)(x << (32 - n)));\n}\n\nstatic inline uint64_t //\nwuffs_base__u64__rotate_left(uint64_t x, uint32_t n) " +
"{\n n &= 63;\n return ((uint64_t)(x << n)) | ((uint64_t)(x >> (64 - n)));\n}\n\nstatic inline uint64_t //\nwuffs_base__u64__rotate_right(uint64_t x, uint32_t n) {\n n &= 63;\n return ((uint64_t)(x >> n)) | ((uint64_t)(x << (64 - n)));\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 //\nwuffs_base__u8__sat_add(uint8_t x, uint8_t y) {\n uint8_t res = (uint8_t)(x + y);\n res |= (uint8_t)(-(res < x));\n return res;\n}\n\nstatic inline uint8_t //\nwuffs_base__u8__sat_sub(uint8_t x, uint8_t y) {\n uint8_t res = (uint8_t)(x - y);\n res &= (uint8_t)(-(res <= x));\n return res;\n}\n\nstatic inline uint16_t //\nwuffs_base__u16__sat_add(uint16_t x, uint16_t y) {\n uint16_t res = (uint16_t)(x + y);\n res |= (uint16_t)(-(res < x));\n return res;\n}\n\nstatic inline uint16_t //\nwuffs_base__u16__sat_sub(uint16_t x, uint16_t y) {\n uint16_t res = (uint16_t)(x - y);\n res &= (uint16_t)(-(res <= x));\n return res;\n}\n\nstatic inline uint32_t //\nwuffs_base__u32__sat_add(uint32_t x, uint32_t y) {\n uint32" +
"_t res = (uint32_t)(x + y);\n res |= (uint32_t)(-(res < x));\n return res;\n}\n\nstatic inline uint32_t //\nwuffs_base__u32__sat_sub(uint32_t x, uint32_t y) {\n uint32_t res = (uint32_t)(x - y);\n res &= (uint32_t)(-(res <= x));\n return res;\n}\n\nstatic inline uint64_t //\nwuffs_base__u64__sat_add(uint64_t x, uint64_t y) {\n uint64_t res = (uint64_t)(x + y);\n res |= (uint64_t)(-(res < x));\n return res;\n}\n\nstatic inline uint64_t //\nwuffs_base__u64__sat_sub(uint64_t x, uint64_t y) {\n uint64_t res = (uint64_t)(x - y);\n res &= (uint64_t)(-(res <= x));\n return res;\n}\n\n" +
"" +
+58 -4
View File
@@ -804,6 +804,56 @@ wuffs_base__u64__max(uint64_t x, uint64_t y) {
// --------
static inline uint8_t //
wuffs_base__u8__rotate_left(uint8_t x, uint32_t n) {
n &= 7;
return ((uint8_t)(x << n)) | ((uint8_t)(x >> (8 - n)));
}
static inline uint8_t //
wuffs_base__u8__rotate_right(uint8_t x, uint32_t n) {
n &= 7;
return ((uint8_t)(x >> n)) | ((uint8_t)(x << (8 - n)));
}
static inline uint16_t //
wuffs_base__u16__rotate_left(uint16_t x, uint32_t n) {
n &= 15;
return ((uint16_t)(x << n)) | ((uint16_t)(x >> (16 - n)));
}
static inline uint16_t //
wuffs_base__u16__rotate_right(uint16_t x, uint32_t n) {
n &= 15;
return ((uint16_t)(x >> n)) | ((uint16_t)(x << (16 - n)));
}
static inline uint32_t //
wuffs_base__u32__rotate_left(uint32_t x, uint32_t n) {
n &= 31;
return ((uint32_t)(x << n)) | ((uint32_t)(x >> (32 - n)));
}
static inline uint32_t //
wuffs_base__u32__rotate_right(uint32_t x, uint32_t n) {
n &= 31;
return ((uint32_t)(x >> n)) | ((uint32_t)(x << (32 - n)));
}
static inline uint64_t //
wuffs_base__u64__rotate_left(uint64_t x, uint32_t n) {
n &= 63;
return ((uint64_t)(x << n)) | ((uint64_t)(x >> (64 - n)));
}
static inline uint64_t //
wuffs_base__u64__rotate_right(uint64_t x, uint32_t n) {
n &= 63;
return ((uint64_t)(x >> n)) | ((uint64_t)(x << (64 - n)));
}
// --------
// Saturating arithmetic (sat_add, sat_sub) branchless bit-twiddling algorithms
// are per https://locklessinc.com/articles/sat_arithmetic/
//
@@ -10061,14 +10111,18 @@ extern "C" {
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
#if defined(__clang__) && defined(__cplusplus) && (__cplusplus >= 201103L)
#define WUFFS_BASE__FALLTHROUGH [[clang::fallthrough]]
#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 7)
// The two #if lines are deliberately separate. Combining the two conditions
// into a single "#if foo && bar" line would not be portable. See
// https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fattribute.html
#if defined(__has_attribute)
#if __has_attribute(fallthrough)
#define WUFFS_BASE__FALLTHROUGH __attribute__((fallthrough))
#else
#define WUFFS_BASE__FALLTHROUGH
#endif
#else
#define WUFFS_BASE__FALLTHROUGH
#endif
// Use switch cases for coroutine suspension points, similar to the technique
// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
+63 -9
View File
@@ -82,15 +82,15 @@ extern "C" {
// each major.minor branch, the commit count should increase monotonically.
//
// WUFFS_VERSION was overridden by "wuffs gen -version" based on revision
// f6945c061289cfbc6f6e415b0fd77b70f6cd46f2 committed on 2021-06-25.
// b9a10d051a05c5749d54e2db8d0bd1848dd57181 committed on 2021-06-28.
#define WUFFS_VERSION 0x000030000
#define WUFFS_VERSION_MAJOR 0
#define WUFFS_VERSION_MINOR 3
#define WUFFS_VERSION_PATCH 0
#define WUFFS_VERSION_PRE_RELEASE_LABEL "beta.3"
#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 3051
#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 20210625
#define WUFFS_VERSION_STRING "0.3.0-beta.3+3051.20210625"
#define WUFFS_VERSION_PRE_RELEASE_LABEL "beta.4"
#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 3058
#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 20210628
#define WUFFS_VERSION_STRING "0.3.0-beta.4+3058.20210628"
// ---------------- Configuration
@@ -805,6 +805,56 @@ wuffs_base__u64__max(uint64_t x, uint64_t y) {
// --------
static inline uint8_t //
wuffs_base__u8__rotate_left(uint8_t x, uint32_t n) {
n &= 7;
return ((uint8_t)(x << n)) | ((uint8_t)(x >> (8 - n)));
}
static inline uint8_t //
wuffs_base__u8__rotate_right(uint8_t x, uint32_t n) {
n &= 7;
return ((uint8_t)(x >> n)) | ((uint8_t)(x << (8 - n)));
}
static inline uint16_t //
wuffs_base__u16__rotate_left(uint16_t x, uint32_t n) {
n &= 15;
return ((uint16_t)(x << n)) | ((uint16_t)(x >> (16 - n)));
}
static inline uint16_t //
wuffs_base__u16__rotate_right(uint16_t x, uint32_t n) {
n &= 15;
return ((uint16_t)(x >> n)) | ((uint16_t)(x << (16 - n)));
}
static inline uint32_t //
wuffs_base__u32__rotate_left(uint32_t x, uint32_t n) {
n &= 31;
return ((uint32_t)(x << n)) | ((uint32_t)(x >> (32 - n)));
}
static inline uint32_t //
wuffs_base__u32__rotate_right(uint32_t x, uint32_t n) {
n &= 31;
return ((uint32_t)(x >> n)) | ((uint32_t)(x << (32 - n)));
}
static inline uint64_t //
wuffs_base__u64__rotate_left(uint64_t x, uint32_t n) {
n &= 63;
return ((uint64_t)(x << n)) | ((uint64_t)(x >> (64 - n)));
}
static inline uint64_t //
wuffs_base__u64__rotate_right(uint64_t x, uint32_t n) {
n &= 63;
return ((uint64_t)(x >> n)) | ((uint64_t)(x << (64 - n)));
}
// --------
// Saturating arithmetic (sat_add, sat_sub) branchless bit-twiddling algorithms
// are per https://locklessinc.com/articles/sat_arithmetic/
//
@@ -10062,14 +10112,18 @@ extern "C" {
// Denote intentional fallthroughs for -Wimplicit-fallthrough.
//
// The order matters here. Clang also defines "__GNUC__".
#if defined(__clang__) && defined(__cplusplus) && (__cplusplus >= 201103L)
#define WUFFS_BASE__FALLTHROUGH [[clang::fallthrough]]
#elif !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 7)
// The two #if lines are deliberately separate. Combining the two conditions
// into a single "#if foo && bar" line would not be portable. See
// https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fattribute.html
#if defined(__has_attribute)
#if __has_attribute(fallthrough)
#define WUFFS_BASE__FALLTHROUGH __attribute__((fallthrough))
#else
#define WUFFS_BASE__FALLTHROUGH
#endif
#else
#define WUFFS_BASE__FALLTHROUGH
#endif
// Use switch cases for coroutine suspension points, similar to the technique
// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html