mirror of
https://github.com/xmrig/xmrig.git
synced 2025-02-02 11:16:37 +00:00
Add static_assert
This commit is contained in:
parent
8737af0f6f
commit
6379d1f90e
1 changed files with 15 additions and 2 deletions
|
@ -52,8 +52,16 @@
|
||||||
namespace xmrig {
|
namespace xmrig {
|
||||||
|
|
||||||
|
|
||||||
static const std::array<const char *, ICpuInfo::FLAG_MAX> flagNames = { "aes", "avx2", "avx512f", "bmi2", "osxsave", "pdpe1gb", "sse2", "ssse3", "sse4.1", "xop", "popcnt", "cat_l3" };
|
constexpr size_t kCpuFlagsSize = 12;
|
||||||
static const std::array<const char *, ICpuInfo::MSR_MOD_MAX> msrNames = { MSR_NAMES_LIST };
|
static const std::array<const char *, kCpuFlagsSize> flagNames = { "aes", "avx2", "avx512f", "bmi2", "osxsave", "pdpe1gb", "sse2", "ssse3", "sse4.1", "xop", "popcnt", "cat_l3" };
|
||||||
|
static_assert(kCpuFlagsSize == ICpuInfo::FLAG_MAX, "kCpuFlagsSize and FLAG_MAX mismatch");
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef XMRIG_FEATURE_MSR
|
||||||
|
constexpr size_t kMsrArraySize = 5;
|
||||||
|
static const std::array<const char *, kMsrArraySize> msrNames = { MSR_NAMES_LIST };
|
||||||
|
static_assert(kMsrArraySize == ICpuInfo::MSR_MOD_MAX, "kMsrArraySize and MSR_MOD_MAX mismatch");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
static inline void cpuid(uint32_t level, int32_t output[4])
|
static inline void cpuid(uint32_t level, int32_t output[4])
|
||||||
|
@ -344,7 +352,12 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const
|
||||||
out.AddMember("packages", static_cast<uint64_t>(packages()), allocator);
|
out.AddMember("packages", static_cast<uint64_t>(packages()), allocator);
|
||||||
out.AddMember("nodes", static_cast<uint64_t>(nodes()), allocator);
|
out.AddMember("nodes", static_cast<uint64_t>(nodes()), allocator);
|
||||||
out.AddMember("backend", StringRef(backend()), allocator);
|
out.AddMember("backend", StringRef(backend()), allocator);
|
||||||
|
|
||||||
|
# ifdef XMRIG_FEATURE_MSR
|
||||||
out.AddMember("msr", StringRef(msrNames[msrMod()]), allocator);
|
out.AddMember("msr", StringRef(msrNames[msrMod()]), allocator);
|
||||||
|
# else
|
||||||
|
out.AddMember("msr", "none", allocator);
|
||||||
|
# endif
|
||||||
|
|
||||||
# ifdef XMRIG_FEATURE_ASM
|
# ifdef XMRIG_FEATURE_ASM
|
||||||
out.AddMember("assembly", StringRef(Assembly(assembly()).toString()), allocator);
|
out.AddMember("assembly", StringRef(Assembly(assembly()).toString()), allocator);
|
||||||
|
|
Loading…
Reference in a new issue