diff --git a/internal/cgen/base/fundamental-public.h b/internal/cgen/base/fundamental-public.h index e4dcfd66..191c6214 100644 --- a/internal/cgen/base/fundamental-public.h +++ b/internal/cgen/base/fundamental-public.h @@ -161,13 +161,16 @@ wuffs_base__cpu_arch__have_x86_avx2() { unsigned int ebx7 = 0; unsigned int ecx7 = 0; unsigned int edx7 = 0; - if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7)) { - return (ebx7 & avx2_ebx7) == avx2_ebx7; + if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) && + ((ebx7 & avx2_ebx7) == avx2_ebx7)) { + return true; } #elif defined(_MSC_VER) // defined(__GNUC__) - int x[4]; - __cpuidex(x, 7, 0); - return (((unsigned int)(x[1])) & avx2_ebx7) == avx2_ebx7; + int x7[4]; + __cpuidex(x7, 7, 0); + if ((((unsigned int)(x7[1])) & avx2_ebx7) == avx2_ebx7) { + return true; + } #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) @@ -188,13 +191,16 @@ wuffs_base__cpu_arch__have_x86_bmi2() { unsigned int ebx7 = 0; unsigned int ecx7 = 0; unsigned int edx7 = 0; - if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7)) { - return (ebx7 & bmi2_ebx7) == bmi2_ebx7; + if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) && + ((ebx7 & bmi2_ebx7) == bmi2_ebx7)) { + return true; } #elif defined(_MSC_VER) // defined(__GNUC__) - int x[4]; - __cpuidex(x, 7, 0); - return (((unsigned int)(x[1])) & bmi2_ebx7) == bmi2_ebx7; + int x7[4]; + __cpuidex(x7, 7, 0); + if ((((unsigned int)(x7[1])) & bmi2_ebx7) == bmi2_ebx7) { + return true; + } #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) @@ -217,13 +223,16 @@ wuffs_base__cpu_arch__have_x86_sse42() { unsigned int ebx1 = 0; unsigned int ecx1 = 0; unsigned int edx1 = 0; - if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1)) { - return (ecx1 & sse42_ecx1) == sse42_ecx1; + if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1) && + ((ecx1 & sse42_ecx1) == sse42_ecx1)) { + return true; } #elif defined(_MSC_VER) // defined(__GNUC__) - int x[4]; - __cpuid(x, 1); - return (((unsigned int)(x[2])) & sse42_ecx1) == sse42_ecx1; + int x1[4]; + __cpuid(x1, 1); + if ((((unsigned int)(x1[2])) & sse42_ecx1) == sse42_ecx1) { + return true; + } #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) diff --git a/internal/cgen/data/data.go b/internal/cgen/data/data.go index 62e02d12..aac57f87 100644 --- a/internal/cgen/data/data.go +++ b/internal/cgen/data/data.go @@ -60,10 +60,10 @@ const BaseFundamentalPublicH = "" + "" + "// --------\n\n// Define WUFFS_CONFIG__STATIC_FUNCTIONS to make all of Wuffs' functions have\n// static storage. The motivation is discussed in the \"ALLOW STATIC\n// IMPLEMENTATION\" section of\n// https://raw.githubusercontent.com/nothings/stb/master/docs/stb_howto.txt\n#if defined(WUFFS_CONFIG__STATIC_FUNCTIONS)\n#define WUFFS_BASE__MAYBE_STATIC static\n#else\n#define WUFFS_BASE__MAYBE_STATIC\n#endif // defined(WUFFS_CONFIG__STATIC_FUNCTIONS)\n\n" + "" + - "// ---------------- CPU Architecture\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_arm_crc32() {\n#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)\n return true;\n#else\n return false;\n#endif // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)\n}\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_arm_neon() {\n#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)\n return true;\n#else\n return false;\n#endif // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)\n}\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_x86_avx2() {\n#if defined(WUFFS_BASE__CPU_ARCH__X86_64)\n // GCC defines these macros but MSVC does not.\n // - bit_AVX2 = (1 << 5)\n const unsigned int avx2_ebx7 = 0x00000020;\n\n // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).\n#if defined(__GNUC__)\n unsigned int eax7 = 0;\n unsigned int ebx7 = 0;\n unsigned int ecx7 = 0;\n unsigned int edx7 = 0;\n if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7)) {\n return (ebx7 & avx2_ebx7) == avx2_ebx7;\n }\n#elif defined(_MSC_VER) // defined(__GNUC__)\n i" + - "nt x[4];\n __cpuidex(x, 7, 0);\n return (((unsigned int)(x[1])) & avx2_ebx7) == avx2_ebx7;\n#else\n#error \"WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler\"\n#endif // defined(__GNUC__); defined(_MSC_VER)\n#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64)\n return false;\n}\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_x86_bmi2() {\n#if defined(WUFFS_BASE__CPU_ARCH__X86_64)\n // GCC defines these macros but MSVC does not.\n // - bit_BMI2 = (1 << 8)\n const unsigned int bmi2_ebx7 = 0x00000100;\n\n // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).\n#if defined(__GNUC__)\n unsigned int eax7 = 0;\n unsigned int ebx7 = 0;\n unsigned int ecx7 = 0;\n unsigned int edx7 = 0;\n if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7)) {\n return (ebx7 & bmi2_ebx7) == bmi2_ebx7;\n }\n#elif defined(_MSC_VER) // defined(__GNUC__)\n int x[4];\n __cpuidex(x, 7, 0);\n return (((unsigned int)(x[1])) & bmi2_ebx7) == bmi2_ebx7;\n#else\n#error \"WUFFS_BASE__CPU_ARCH__ETC combined with an uns" + - "upported compiler\"\n#endif // defined(__GNUC__); defined(_MSC_VER)\n#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64)\n return false;\n}\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_x86_sse42() {\n#if defined(WUFFS_BASE__CPU_ARCH__X86_64)\n // GCC defines these macros but MSVC does not.\n // - bit_PCLMUL = (1 << 1)\n // - bit_POPCNT = (1 << 23)\n // - bit_SSE4_2 = (1 << 20)\n const unsigned int sse42_ecx1 = 0x00900002;\n\n // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).\n#if defined(__GNUC__)\n unsigned int eax1 = 0;\n unsigned int ebx1 = 0;\n unsigned int ecx1 = 0;\n unsigned int edx1 = 0;\n if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1)) {\n return (ecx1 & sse42_ecx1) == sse42_ecx1;\n }\n#elif defined(_MSC_VER) // defined(__GNUC__)\n int x[4];\n __cpuid(x, 1);\n return (((unsigned int)(x[2])) & sse42_ecx1) == sse42_ecx1;\n#else\n#error \"WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler\"\n#endif // defined(__GNUC__); defined(_MSC_VER)\n#endif // defined(WUFFS_BAS" + - "E__CPU_ARCH__X86_64)\n return false;\n}\n\n" + + "// ---------------- CPU Architecture\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_arm_crc32() {\n#if defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)\n return true;\n#else\n return false;\n#endif // defined(WUFFS_BASE__CPU_ARCH__ARM_CRC32)\n}\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_arm_neon() {\n#if defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)\n return true;\n#else\n return false;\n#endif // defined(WUFFS_BASE__CPU_ARCH__ARM_NEON)\n}\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_x86_avx2() {\n#if defined(WUFFS_BASE__CPU_ARCH__X86_64)\n // GCC defines these macros but MSVC does not.\n // - bit_AVX2 = (1 << 5)\n const unsigned int avx2_ebx7 = 0x00000020;\n\n // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).\n#if defined(__GNUC__)\n unsigned int eax7 = 0;\n unsigned int ebx7 = 0;\n unsigned int ecx7 = 0;\n unsigned int edx7 = 0;\n if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) &&\n ((ebx7 & avx2_ebx7) == avx2_ebx7)) {\n return true;\n }\n#elif defined(_MSC_VER) // defin" + + "ed(__GNUC__)\n int x7[4];\n __cpuidex(x7, 7, 0);\n if ((((unsigned int)(x7[1])) & avx2_ebx7) == avx2_ebx7) {\n return true;\n }\n#else\n#error \"WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler\"\n#endif // defined(__GNUC__); defined(_MSC_VER)\n#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64)\n return false;\n}\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_x86_bmi2() {\n#if defined(WUFFS_BASE__CPU_ARCH__X86_64)\n // GCC defines these macros but MSVC does not.\n // - bit_BMI2 = (1 << 8)\n const unsigned int bmi2_ebx7 = 0x00000100;\n\n // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).\n#if defined(__GNUC__)\n unsigned int eax7 = 0;\n unsigned int ebx7 = 0;\n unsigned int ecx7 = 0;\n unsigned int edx7 = 0;\n if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) &&\n ((ebx7 & bmi2_ebx7) == bmi2_ebx7)) {\n return true;\n }\n#elif defined(_MSC_VER) // defined(__GNUC__)\n int x7[4];\n __cpuidex(x7, 7, 0);\n if ((((unsigned int)(x7[1])) & bmi2_ebx7) == bmi2_ebx7) {\n " + + " return true;\n }\n#else\n#error \"WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler\"\n#endif // defined(__GNUC__); defined(_MSC_VER)\n#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64)\n return false;\n}\n\nstatic inline bool //\nwuffs_base__cpu_arch__have_x86_sse42() {\n#if defined(WUFFS_BASE__CPU_ARCH__X86_64)\n // GCC defines these macros but MSVC does not.\n // - bit_PCLMUL = (1 << 1)\n // - bit_POPCNT = (1 << 23)\n // - bit_SSE4_2 = (1 << 20)\n const unsigned int sse42_ecx1 = 0x00900002;\n\n // clang defines __GNUC__ and clang-cl defines _MSC_VER (but not __GNUC__).\n#if defined(__GNUC__)\n unsigned int eax1 = 0;\n unsigned int ebx1 = 0;\n unsigned int ecx1 = 0;\n unsigned int edx1 = 0;\n if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1) &&\n ((ecx1 & sse42_ecx1) == sse42_ecx1)) {\n return true;\n }\n#elif defined(_MSC_VER) // defined(__GNUC__)\n int x1[4];\n __cpuid(x1, 1);\n if ((((unsigned int)(x1[2])) & sse42_ecx1) == sse42_ecx1) {\n return true;\n }\n#else\n#error \"WUFFS_BASE__CPU_ARCH__ET" + + "C combined with an unsupported compiler\"\n#endif // defined(__GNUC__); defined(_MSC_VER)\n#endif // defined(WUFFS_BASE__CPU_ARCH__X86_64)\n return false;\n}\n\n" + "" + "// ---------------- Fundamentals\n\n// Wuffs assumes that:\n// - converting a uint32_t to a size_t will never overflow.\n// - converting a size_t to a uint64_t will never overflow.\n#if defined(__WORDSIZE)\n#if (__WORDSIZE != 32) && (__WORDSIZE != 64)\n#error \"Wuffs requires a word size of either 32 or 64 bits\"\n#endif\n#endif\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define WUFFS_BASE__POTENTIALLY_UNUSED __attribute__((unused))\n#define WUFFS_BASE__WARN_UNUSED_RESULT __attribute__((warn_unused_result))\n#else\n#define WUFFS_BASE__POTENTIALLY_UNUSED\n#define WUFFS_BASE__WARN_UNUSED_RESULT\n#endif\n\n" + "" + diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 3449b11d..2ef8ddaf 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -200,13 +200,16 @@ wuffs_base__cpu_arch__have_x86_avx2() { unsigned int ebx7 = 0; unsigned int ecx7 = 0; unsigned int edx7 = 0; - if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7)) { - return (ebx7 & avx2_ebx7) == avx2_ebx7; + if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) && + ((ebx7 & avx2_ebx7) == avx2_ebx7)) { + return true; } #elif defined(_MSC_VER) // defined(__GNUC__) - int x[4]; - __cpuidex(x, 7, 0); - return (((unsigned int)(x[1])) & avx2_ebx7) == avx2_ebx7; + int x7[4]; + __cpuidex(x7, 7, 0); + if ((((unsigned int)(x7[1])) & avx2_ebx7) == avx2_ebx7) { + return true; + } #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) @@ -227,13 +230,16 @@ wuffs_base__cpu_arch__have_x86_bmi2() { unsigned int ebx7 = 0; unsigned int ecx7 = 0; unsigned int edx7 = 0; - if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7)) { - return (ebx7 & bmi2_ebx7) == bmi2_ebx7; + if (__get_cpuid_count(7, 0, &eax7, &ebx7, &ecx7, &edx7) && + ((ebx7 & bmi2_ebx7) == bmi2_ebx7)) { + return true; } #elif defined(_MSC_VER) // defined(__GNUC__) - int x[4]; - __cpuidex(x, 7, 0); - return (((unsigned int)(x[1])) & bmi2_ebx7) == bmi2_ebx7; + int x7[4]; + __cpuidex(x7, 7, 0); + if ((((unsigned int)(x7[1])) & bmi2_ebx7) == bmi2_ebx7) { + return true; + } #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER) @@ -256,13 +262,16 @@ wuffs_base__cpu_arch__have_x86_sse42() { unsigned int ebx1 = 0; unsigned int ecx1 = 0; unsigned int edx1 = 0; - if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1)) { - return (ecx1 & sse42_ecx1) == sse42_ecx1; + if (__get_cpuid(1, &eax1, &ebx1, &ecx1, &edx1) && + ((ecx1 & sse42_ecx1) == sse42_ecx1)) { + return true; } #elif defined(_MSC_VER) // defined(__GNUC__) - int x[4]; - __cpuid(x, 1); - return (((unsigned int)(x[2])) & sse42_ecx1) == sse42_ecx1; + int x1[4]; + __cpuid(x1, 1); + if ((((unsigned int)(x1[2])) & sse42_ecx1) == sse42_ecx1) { + return true; + } #else #error "WUFFS_BASE__CPU_ARCH__ETC combined with an unsupported compiler" #endif // defined(__GNUC__); defined(_MSC_VER)