mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-05 15:00:33 +00:00
Code Issues Releases Wiki Activity

cpufeatures: Change implementation of FillX86BrandString, fix missing header

Browse Source
This commit is contained in:
Carles Fernandez 2021-10-25 16:45:38 +02:00
parent 3db583ff24
commit 54347faff8
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cpu_features/src/cpuinfo_x86.c
View File

@ -88,7 +88,6 @@
defined(CPU_FEATURES_OS_FREEBSD) defined(CPU_FEATURES_OS_FREEBSD)
#include "internal/filesystem.h" // Needed to parse /proc/cpuinfo #include "internal/filesystem.h" // Needed to parse /proc/cpuinfo
#include "internal/stack_line_reader.h" // Needed to parse /proc/cpuinfo #include "internal/stack_line_reader.h" // Needed to parse /proc/cpuinfo
#include "internal/string_view.h" // Needed to parse /proc/cpuinfo
#elif defined(CPU_FEATURES_OS_DARWIN) #elif defined(CPU_FEATURES_OS_DARWIN)
#if !defined(HAVE_SYSCTLBYNAME) #if !defined(HAVE_SYSCTLBYNAME)
#error "Darwin needs support for sysctlbyname" #error "Darwin needs support for sysctlbyname"
@ -98,6 +97,8 @@
#error "Unsupported OS" #error "Unsupported OS"
#endif // CPU_FEATURES_OS #endif // CPU_FEATURES_OS
#include "internal/string_view.h"
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Definitions for CpuId and GetXCR0Eax. // Definitions for CpuId and GetXCR0Eax.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1746,23 +1747,18 @@ X86Microarchitecture GetX86Microarchitecture(const X86Info* info)
return X86_UNKNOWN; return X86_UNKNOWN;
} }
static void SetString(const uint32_t max_cpuid_ext_leaf, const uint32_t leaf_id,
char* buffer)
{
const Leaf leaf = SafeCpuId(max_cpuid_ext_leaf, leaf_id);
// We allow calling memcpy from SetString which is only called when requesting
// X86BrandString.
memcpy(buffer, &leaf, sizeof(Leaf));
}
void FillX86BrandString(char brand_string[49]) void FillX86BrandString(char brand_string[49])
{ {
const Leaf leaf_ext_0 = CpuId(0x80000000); const Leaf leaves[3] = {
const uint32_t max_cpuid_leaf_ext = leaf_ext_0.eax; SafeCpuId(max_cpuid_leaf_ext, 0x80000002),
SetString(max_cpuid_leaf_ext, 0x80000002, brand_string); SafeCpuId(max_cpuid_leaf_ext, 0x80000003),
SetString(max_cpuid_leaf_ext, 0x80000003, brand_string + 16); SafeCpuId(max_cpuid_leaf_ext, 0x80000004),
SetString(max_cpuid_leaf_ext, 0x80000004, brand_string + 32); };
brand_string[48] = '\0'; #if __STDC_VERSION__ >= 201112L
_Static_assert(sizeof(leaves) == 48, "Leaves must be packed");
#endif
CpuFeatures_StringView_CopyString(view((const char*)leaves, sizeof(leaves)),
brand_string, 49);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////