mirror/libcpuid
1
0
Fork 0
mirror of https://github.com/anrieff/libcpuid synced 2025-06-07 00:51:40 +00:00
Code Issues Releases Wiki Activity

Add a workaround to build on Windows

Browse source
This commit is contained in:
The Tumultuous Unicorn Of Darkness 2025-04-25 21:28:43 +02:00
parent 2e01aa0303
commit c611e880b3
No known key found for this signature in database
GPG key ID: 1E55EE2EFF18BC1A
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libcpuid/libcpuid_internal.h
View file

@ -122,7 +122,7 @@ struct internal_type_info_array_t {
struct internal_type_info_t* data;
};
#define LBIT(x) (((uint64_t) 1) << x)
#define LBIT(x) ((1ULL) << x)
// common detection bits for CPUs:
#define _M_ LBIT( 0 )
@ -204,7 +204,7 @@ struct internal_type_info_array_t {
#define _KH_ LBIT( (LAST_COMMON_BIT + 3) )
#define _KX_ LBIT( (LAST_COMMON_BIT + 4) )
#define _ZX_ LBIT( (LAST_COMMON_BIT + 5) )
#define _C LBIT( (LAST_COMMON_BIT + 6) )
#define __C LBIT( (LAST_COMMON_BIT + 6) )
#define _D LBIT( (LAST_COMMON_BIT + 7) )

6
libcpuid/recog_centaur.c
View file

@ -90,8 +90,8 @@ const struct match_entry_t cpudb_centaur[] = {
// F M S EF EM #cores L2$ L3$ BC ModelBits ModelCode Name
{ 7, -1, -1, -1, -1, -1, -1, -1, ZHAOXIN, 0 , 0, "Unknown Zhaoxin CPU" },
/* Zhangjiang (2015, 28 nm) */
{ 7, -1, -1, -1, 15, -1, -1, -1, ZHAOXIN, KAISHENG_|_KH_|_C, 0, "Zhaoxin KaisHeng (ZhangJiang)" }, // C+ (4000)
{ 7, -1, -1, -1, 15, -1, -1, -1, ZHAOXIN, KAIXIAN_|_ZX_|_C , 0, "Zhaoxin KaiXian (ZhangJiang)" }, // C/C+ (4000)
{ 7, -1, -1, -1, 15, -1, -1, -1, ZHAOXIN, KAISHENG_|_KH_|__C, 0, "Zhaoxin KaisHeng (ZhangJiang)" }, // C+ (4000)
{ 7, -1, -1, -1, 15, -1, -1, -1, ZHAOXIN, KAIXIAN_|_ZX_|__C , 0, "Zhaoxin KaiXian (ZhangJiang)" }, // C/C+ (4000)
/* WuDaoKou (2017, 28 nm) */
{ 7, -1, -1, -1, 27, -1, -1, -1, ZHAOXIN, KAISHENG_|_KH_ , _20000, "Zhaoxin KaisHeng (WuDaoKou)" }, // KH (20000)
{ 7, -1, -1, -1, 27, -1, -1, -1, ZHAOXIN, KAIXIAN_|_KX_ , _5000, "Zhaoxin KaiXian (WuDaoKou)" }, // KX (5000)
@ -133,7 +133,7 @@ static centaur_code_and_bits_t get_brand_code_and_bits(struct cpu_id_t* data)
{ _KH_, "KH" },
{ _KX_, "KX" },
{ _ZX_, "ZX" },
{ _C, "-C" },
{ __C, "-C" },
{ _D, "-D" },
{ _E, "-E" },
};

3
libcpuid/recog_intel.c
View file

@ -783,8 +783,7 @@ static intel_code_and_bits_t get_brand_code_and_bits(struct cpu_id_t* data)
const size_t n = strlen(bs);
const struct { intel_code_t c; const char *search; } matchtable[] = {
{ PENTIUM_M, "Pentium(R) M" },
{ CORE_SOLO, "Pentium(R) Dual CPU" },
{ CORE_SOLO, "Pentium(R) Dual-Core" },
{ CORE_SOLO, "Pentium(R) Dual" },
{ PENTIUM_D, "Pentium(R) D" },
{ CORE_SOLO, "Genuine Intel(R) CPU" },
{ CORE_SOLO, "Intel(R) Core(TM)" },