From 312810f5a3fc253c3f2513d07c45f376278324fa Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Tue, 9 Mar 2021 00:34:40 +1100 Subject: [PATCH] Fix some -Werror=sign-conversion bugs --- internal/cgen/base/magic-submodule.c | 4 ++-- internal/cgen/builtin.go | 14 ++++++++++++++ internal/cgen/data/data.go | 4 ++-- release/c/wuffs-unsupported-snapshot.c | 6 +++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/internal/cgen/base/magic-submodule.c b/internal/cgen/base/magic-submodule.c index 05a59c4e..1b974540 100644 --- a/internal/cgen/base/magic-submodule.c +++ b/internal/cgen/base/magic-submodule.c @@ -48,7 +48,7 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix) { int32_t fourcc = 0; size_t i; for (i = 0; i < table_len; i++) { - uint8_t mag_first_byte = table[i].magic[1]; + uint8_t mag_first_byte = ((uint8_t)(table[i].magic[1])); if (pre_first_byte < mag_first_byte) { break; } else if (pre_first_byte > mag_first_byte) { @@ -56,7 +56,7 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix) { } fourcc = table[i].fourcc; - uint8_t mag_remaining_len = table[i].magic[0]; + uint8_t mag_remaining_len = ((uint8_t)(table[i].magic[0])); if (mag_remaining_len == 0) { goto match; } diff --git a/internal/cgen/builtin.go b/internal/cgen/builtin.go index cb10c1de..54eb913b 100644 --- a/internal/cgen/builtin.go +++ b/internal/cgen/builtin.go @@ -690,6 +690,20 @@ func (g *gen) writeBuiltinCPUArchX86(b *buffer, recv *a.Expr, method t.ID, args } b.writes(")))") return nil + + } else if strings.HasPrefix(methodStr, "_mm_extract_epi") { + size := methodStr[len("_mm_extract_epi"):] + b.printf("((uint%s_t)(_mm_extract_epi%s(", size, size) + if err := g.writeExpr(b, recv, false, depth); err != nil { + return err + } + b.writes(", ") + b.writes("(int32_t)(") + if err := g.writeExpr(b, args[0].AsArg().Value(), false, depth); err != nil { + return err + } + b.writes("))))") + return nil } b.writes(methodStr) diff --git a/internal/cgen/data/data.go b/internal/cgen/data/data.go index 41325313..64c610c2 100644 --- a/internal/cgen/data/data.go +++ b/internal/cgen/data/data.go @@ -542,8 +542,8 @@ const BaseIntConvSubmoduleC = "" + const BaseMagicSubmoduleC = "" + "// ---------------- Magic Numbers\n\nWUFFS_BASE__MAYBE_STATIC int32_t //\nwuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix) {\n // table holds the 'magic numbers' (which are actually variable length\n // strings). The strings may contain NUL bytes, so the \"const char* magic\"\n // value starts with the length-minus-1 of the 'magic number'.\n //\n // Keep it sorted by magic[1], then magic[0] descending and finally by\n // magic[2:]. When multiple entries match, the longest one wins.\n static struct {\n int32_t fourcc;\n const char* magic;\n } table[] = {\n {0x57424D50, \"\\x01\\x00\\x00\"}, // WBMP\n {0x424D5020, \"\\x01\\x42\\x4D\"}, // BMP\n {0x47494620, \"\\x03\\x47\\x49\\x46\\x38\"}, // GIF\n {0x54494646, \"\\x03\\x49\\x49\\x2A\\x00\"}, // TIFF (little-endian)\n {0x54494646, \"\\x03\\x4D\\x4D\\x00\\x2A\"}, // TIFF (big-endian)\n {0x52494646, \"\\x03\\x52\\x49\\x46\\x46\"}, // RIFF (see § below)\n {0x4E494520, \"\\x02\\x6E\\xC3\\xAF\"}, // NIE\n {0x504E4720, \"\\x03\\x89\\x50\\x" + - "4E\\x47\"}, // PNG\n {0x4A504547, \"\\x01\\xFF\\xD8\"}, // JPEG\n };\n static const size_t table_len = sizeof(table) / sizeof(table[0]);\n\n if (prefix.len == 0) {\n return -1;\n }\n uint8_t pre_first_byte = prefix.ptr[0];\n\n int32_t fourcc = 0;\n size_t i;\n for (i = 0; i < table_len; i++) {\n uint8_t mag_first_byte = table[i].magic[1];\n if (pre_first_byte < mag_first_byte) {\n break;\n } else if (pre_first_byte > mag_first_byte) {\n continue;\n }\n fourcc = table[i].fourcc;\n\n uint8_t mag_remaining_len = table[i].magic[0];\n if (mag_remaining_len == 0) {\n goto match;\n }\n\n const char* mag_remaining_ptr = table[i].magic + 2;\n uint8_t* pre_remaining_ptr = prefix.ptr + 1;\n size_t pre_remaining_len = prefix.len - 1;\n if (pre_remaining_len < mag_remaining_len) {\n if (!memcmp(pre_remaining_ptr, mag_remaining_ptr, pre_remaining_len)) {\n return -1;\n }\n } else {\n if (!memcmp(pre_remaining_ptr, mag_remaining_ptr, mag_remaining_len)) {\n " + - "goto match;\n }\n }\n }\n return 0;\n\nmatch:\n // Some FourCC values (see § above) are further specialized.\n if (fourcc == 0x52494646) { // 'RIFF'be\n if (prefix.len < 16) {\n return -1;\n }\n uint32_t x = wuffs_base__peek_u32be__no_bounds_check(prefix.ptr + 8);\n if (x == 0x57454250) { // 'WEBP'be\n uint32_t y = wuffs_base__peek_u32be__no_bounds_check(prefix.ptr + 12);\n if (y == 0x56503820) { // 'VP8 'be\n return 0x57503820; // 'WP8 'be\n } else if (y == 0x5650384C) { // 'VP8L'be\n return 0x5750384C; // 'WP8L'be\n }\n }\n }\n return fourcc;\n}\n" + + "4E\\x47\"}, // PNG\n {0x4A504547, \"\\x01\\xFF\\xD8\"}, // JPEG\n };\n static const size_t table_len = sizeof(table) / sizeof(table[0]);\n\n if (prefix.len == 0) {\n return -1;\n }\n uint8_t pre_first_byte = prefix.ptr[0];\n\n int32_t fourcc = 0;\n size_t i;\n for (i = 0; i < table_len; i++) {\n uint8_t mag_first_byte = ((uint8_t)(table[i].magic[1]));\n if (pre_first_byte < mag_first_byte) {\n break;\n } else if (pre_first_byte > mag_first_byte) {\n continue;\n }\n fourcc = table[i].fourcc;\n\n uint8_t mag_remaining_len = ((uint8_t)(table[i].magic[0]));\n if (mag_remaining_len == 0) {\n goto match;\n }\n\n const char* mag_remaining_ptr = table[i].magic + 2;\n uint8_t* pre_remaining_ptr = prefix.ptr + 1;\n size_t pre_remaining_len = prefix.len - 1;\n if (pre_remaining_len < mag_remaining_len) {\n if (!memcmp(pre_remaining_ptr, mag_remaining_ptr, pre_remaining_len)) {\n return -1;\n }\n } else {\n if (!memcmp(pre_remaining_ptr, mag_remaining_ptr, mag_" + + "remaining_len)) {\n goto match;\n }\n }\n }\n return 0;\n\nmatch:\n // Some FourCC values (see § above) are further specialized.\n if (fourcc == 0x52494646) { // 'RIFF'be\n if (prefix.len < 16) {\n return -1;\n }\n uint32_t x = wuffs_base__peek_u32be__no_bounds_check(prefix.ptr + 8);\n if (x == 0x57454250) { // 'WEBP'be\n uint32_t y = wuffs_base__peek_u32be__no_bounds_check(prefix.ptr + 12);\n if (y == 0x56503820) { // 'VP8 'be\n return 0x57503820; // 'WP8 'be\n } else if (y == 0x5650384C) { // 'VP8L'be\n return 0x5750384C; // 'WP8L'be\n }\n }\n }\n return fourcc;\n}\n" + "" const BasePixConvSubmoduleC = "" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 181a4c9d..4c397d15 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -14561,7 +14561,7 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix) { int32_t fourcc = 0; size_t i; for (i = 0; i < table_len; i++) { - uint8_t mag_first_byte = table[i].magic[1]; + uint8_t mag_first_byte = ((uint8_t)(table[i].magic[1])); if (pre_first_byte < mag_first_byte) { break; } else if (pre_first_byte > mag_first_byte) { @@ -14569,7 +14569,7 @@ wuffs_base__magic_number_guess_fourcc(wuffs_base__slice_u8 prefix) { } fourcc = table[i].fourcc; - uint8_t mag_remaining_len = table[i].magic[0]; + uint8_t mag_remaining_len = ((uint8_t)(table[i].magic[0])); if (mag_remaining_len == 0) { goto match; } @@ -22669,7 +22669,7 @@ wuffs_crc32__ieee_hasher__up_x86_sse42( v_x1 = _mm_and_si128(v_x1, v_x2); v_x1 = _mm_clmulepi64_si128(v_x1, v_k, (int32_t)(0)); v_x0 = _mm_xor_si128(v_x0, v_x1); - v_s = _mm_extract_epi32(v_x0, (int32_t)(1)); + v_s = ((uint32_t)(_mm_extract_epi32(v_x0, (int32_t)(1)))); v_tail_index = (((uint64_t)(a_x.len)) & 18446744073709551552u); if (v_tail_index < ((uint64_t)(a_x.len))) { {