From 15168950e52d0beedda120da926e97ef44f4afb1 Mon Sep 17 00:00:00 2001 From: WHR Date: Tue, 15 Dec 2020 14:56:06 +0800 Subject: [PATCH] Don't use team 'x64' for '64-bit' --- src/Summary.cpp | 4 ++-- src/backend/cpu/interfaces/ICpuInfo.h | 4 ++-- src/backend/cpu/platform/BasicCpuInfo.cpp | 2 +- src/backend/cpu/platform/BasicCpuInfo_arm.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Summary.cpp b/src/Summary.cpp index a026c938..d27118c5 100644 --- a/src/Summary.cpp +++ b/src/Summary.cpp @@ -88,11 +88,11 @@ static void print_cpu(Config *) { const auto info = Cpu::info(); - Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%zu)") " %sx64 %sAES", + Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%zu)") " %s64-bit %sAES", "CPU", info->brand(), info->packages(), - info->isX64() ? GREEN_BOLD_S : RED_BOLD_S "-", + info->is64bit() ? GREEN_BOLD_S : RED_BOLD_S "-", info->hasAES() ? GREEN_BOLD_S : RED_BOLD_S "-" ); # if defined(XMRIG_FEATURE_LIBCPUID) || defined (XMRIG_FEATURE_HWLOC) diff --git a/src/backend/cpu/interfaces/ICpuInfo.h b/src/backend/cpu/interfaces/ICpuInfo.h index 9270ca09..5a9cfcac 100644 --- a/src/backend/cpu/interfaces/ICpuInfo.h +++ b/src/backend/cpu/interfaces/ICpuInfo.h @@ -77,9 +77,9 @@ public: virtual ~ICpuInfo() = default; # if defined(__x86_64__) || defined(_M_AMD64) || defined (__arm64__) || defined (__aarch64__) - inline constexpr static bool isX64() { return true; } + inline constexpr static bool is64bit() { return true; } # else - inline constexpr static bool isX64() { return false; } + inline constexpr static bool is64bit() { return false; } # endif virtual Assembly::Id assembly() const = 0; diff --git a/src/backend/cpu/platform/BasicCpuInfo.cpp b/src/backend/cpu/platform/BasicCpuInfo.cpp index 7cf09f8c..b11cb2e3 100644 --- a/src/backend/cpu/platform/BasicCpuInfo.cpp +++ b/src/backend/cpu/platform/BasicCpuInfo.cpp @@ -344,7 +344,7 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const out.AddMember("proc_info", m_procInfo, allocator); out.AddMember("aes", hasAES(), allocator); out.AddMember("avx2", hasAVX2(), allocator); - out.AddMember("x64", isX64(), allocator); + out.AddMember("x64", is64bit(), allocator); out.AddMember("l2", static_cast(L2()), allocator); out.AddMember("l3", static_cast(L3()), allocator); out.AddMember("cores", static_cast(cores()), allocator); diff --git a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp index a2b336a5..4423162d 100644 --- a/src/backend/cpu/platform/BasicCpuInfo_arm.cpp +++ b/src/backend/cpu/platform/BasicCpuInfo_arm.cpp @@ -95,7 +95,7 @@ rapidjson::Value xmrig::BasicCpuInfo::toJSON(rapidjson::Document &doc) const out.AddMember("brand", StringRef(brand()), allocator); out.AddMember("aes", hasAES(), allocator); out.AddMember("avx2", false, allocator); - out.AddMember("x64", isX64(), allocator); + out.AddMember("x64", is64bit(), allocator); out.AddMember("l2", static_cast(L2()), allocator); out.AddMember("l3", static_cast(L3()), allocator); out.AddMember("cores", static_cast(cores()), allocator);