Alexandre Julliard : ntdll: Add some more CPU feature flags.
Alexandre Julliard
julliard at winehq.org
Thu May 21 15:41:20 CDT 2020
Module: wine
Branch: master
Commit: ab350866e414e8c603dee7007e43f2813bd66e4b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab350866e414e8c603dee7007e43f2813bd66e4b
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu May 21 15:14:46 2020 +0200
ntdll: Add some more CPU feature flags.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/nt.c | 34 +++++++++++++++++++++++++++++++---
include/winnt.h | 4 ++++
include/winternl.h | 15 +++++++++++++++
3 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 2076806573..51f8cdb190 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -1091,6 +1091,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
if(regs2[3] & (1 << 3 )) info->FeatureSet |= CPU_FEATURE_PSE;
if(regs2[3] & (1 << 4 )) info->FeatureSet |= CPU_FEATURE_TSC;
+ if(regs2[3] & (1 << 6 )) info->FeatureSet |= CPU_FEATURE_PAE;
if(regs2[3] & (1 << 8 )) info->FeatureSet |= CPU_FEATURE_CX8;
if(regs2[3] & (1 << 11)) info->FeatureSet |= CPU_FEATURE_SEP;
if(regs2[3] & (1 << 12)) info->FeatureSet |= CPU_FEATURE_MTRR;
@@ -1100,6 +1101,9 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
if(regs2[3] & (1 << 24)) info->FeatureSet |= CPU_FEATURE_FXSR;
if(regs2[3] & (1 << 25)) info->FeatureSet |= CPU_FEATURE_SSE;
if(regs2[3] & (1 << 26)) info->FeatureSet |= CPU_FEATURE_SSE2;
+ if(regs2[2] & (1 << 0 )) info->FeatureSet |= CPU_FEATURE_SSE3;
+ if(regs2[2] & (1 << 13)) info->FeatureSet |= CPU_FEATURE_CX128;
+ if(regs2[2] & (1 << 27)) info->FeatureSet |= CPU_FEATURE_XSAVE;
user_shared_data->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = !(regs2[3] & 1);
user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] >> 4) & 1;
@@ -1112,8 +1116,11 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
user_shared_data->ProcessorFeatures[PF_XSAVE_ENABLED] = (regs2[2] >> 27) & 1;
user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = (regs2[2] >> 13) & 1;
- if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24))) /* has SSE2 and FXSAVE/FXRSTOR */
- user_shared_data->ProcessorFeatures[PF_SSE_DAZ_MODE_AVAILABLE] = have_sse_daz_mode();
+ if((regs2[3] & (1 << 26)) && (regs2[3] & (1 << 24)) && have_sse_daz_mode()) /* has SSE2 and FXSAVE/FXRSTOR */
+ {
+ info->FeatureSet |= CPU_FEATURE_DAZ;
+ user_shared_data->ProcessorFeatures[PF_SSE_DAZ_MODE_AVAILABLE] = TRUE;
+ }
if (regs[1] == AUTH && regs[3] == ENTI && regs[2] == CAMD)
{
@@ -1134,7 +1141,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1;
user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = (regs2[3] >> 31) & 1;
user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] >> 27) & 1;
- if (regs2[3] >> 31) info->FeatureSet |= CPU_FEATURE_3DNOW;
+ if (regs2[2] & (1 << 2)) info->FeatureSet |= CPU_FEATURE_VIRT;
+ if (regs2[3] & (1 << 20)) info->FeatureSet |= CPU_FEATURE_NX;
+ if (regs2[3] & (1 << 27)) info->FeatureSet |= CPU_FEATURE_TSC;
+ if (regs2[3] & (1u << 31)) info->FeatureSet |= CPU_FEATURE_3DNOW;
}
}
else if (regs[1] == GENU && regs[3] == INEI && regs[2] == NTEL)
@@ -1147,6 +1157,7 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
info->Revision |= ((regs2[0] >> 4 ) & 0xf) << 8; /* model */
info->Revision |= regs2[0] & 0xf; /* stepping */
+ if(regs2[2] & (1 << 5)) info->FeatureSet |= CPU_FEATURE_VIRT;
if(regs2[3] & (1 << 21)) info->FeatureSet |= CPU_FEATURE_DS;
user_shared_data->ProcessorFeatures[PF_VIRT_FIRMWARE_ENABLED] = (regs2[2] >> 5) & 1;
@@ -1156,6 +1167,8 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
do_cpuid(0x80000001, regs2); /* get vendor features */
user_shared_data->ProcessorFeatures[PF_NX_ENABLED] = (regs2[3] >> 20) & 1;
user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = (regs2[3] >> 27) & 1;
+ if (regs2[3] & (1 << 20)) info->FeatureSet |= CPU_FEATURE_NX;
+ if (regs2[3] & (1 << 27)) info->FeatureSet |= CPU_FEATURE_TSC;
}
}
else
@@ -1248,9 +1261,15 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
if (!_stricmp(line, "features"))
{
if (strstr(value, "vfpv3"))
+ {
+ info->FeatureSet |= CPU_FEATURE_ARM_VFP_32;
user_shared_data->ProcessorFeatures[PF_ARM_VFP_32_REGISTERS_AVAILABLE] = TRUE;
+ }
if (strstr(value, "neon"))
+ {
+ info->FeatureSet |= CPU_FEATURE_ARM_NEON;
user_shared_data->ProcessorFeatures[PF_ARM_NEON_INSTRUCTIONS_AVAILABLE] = TRUE;
+ }
continue;
}
}
@@ -1268,7 +1287,10 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
valsize = sizeof(value);
if (!sysctlbyname("hw.floatingpoint", &value, &valsize, NULL, 0))
+ {
+ info->FeatureSet |= CPU_FEATURE_ARM_VFP_32;
user_shared_data->ProcessorFeatures[PF_ARM_VFP_32_REGISTERS_AVAILABLE] = value;
+ }
#else
FIXME("CPU Feature detection not implemented.\n");
#endif
@@ -1316,9 +1338,15 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info)
if (!_stricmp(line, "Features"))
{
if (strstr(value, "crc32"))
+ {
+ info->FeatureSet |= CPU_FEATURE_ARM_V8_CRC32;
user_shared_data->ProcessorFeatures[PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE] = TRUE;
+ }
if (strstr(value, "aes"))
+ {
+ info->FeatureSet |= CPU_FEATURE_ARM_V8_CRYPTO;
user_shared_data->ProcessorFeatures[PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE] = TRUE;
+ }
continue;
}
}
diff --git a/include/winnt.h b/include/winnt.h
index 99c3793346..1f0a7e344e 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -924,6 +924,10 @@ typedef enum _HEAP_INFORMATION_CLASS {
#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29
#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30
#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31
+#define PF_RDTSCP_INSTRUCTION_AVAILABLE 32
+#define PF_RDPID_INSTRUCTION_AVAILABLE 33
+#define PF_ARM_V81_ATOMIC_INSTRUCTIONS_AVAILABLE 34
+#define PF_MONITORX_INSTRUCTION_AVAILABLE 35
/* Execution state flags */
diff --git a/include/winternl.h b/include/winternl.h
index ed8b28ea1f..14455946ba 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -1368,6 +1368,21 @@ typedef struct _SYSTEM_CPU_INFORMATION {
#define CPU_FEATURE_SSE2 0x00010000 /* SSE2 extensions (XMMI64) */
#define CPU_FEATURE_DS 0x00020000 /* Debug Store */
#define CPU_FEATURE_HTT 0x00040000 /* Hyper Threading Technology */
+#define CPU_FEATURE_SSE3 0x00080000 /* SSE3 extensions */
+#define CPU_FEATURE_CX128 0x00100000 /* cmpxchg16b instruction */
+#define CPU_FEATURE_XSAVE 0x00800000 /* XSAVE instructions */
+#define CPU_FEATURE_2NDLEV 0x04000000 /* Second-level address translation */
+#define CPU_FEATURE_VIRT 0x08000000 /* Virtualization support */
+#define CPU_FEATURE_RDFS 0x10000000 /* RDFSBASE etc. instructions */
+#define CPU_FEATURE_NX 0x20000000 /* Data execution prevention */
+
+/* FIXME: following values are made up, actual flags are unknown */
+#define CPU_FEATURE_PAE 0x00200000
+#define CPU_FEATURE_DAZ 0x00400000
+#define CPU_FEATURE_ARM_VFP_32 0x00000001
+#define CPU_FEATURE_ARM_NEON 0x00000002
+#define CPU_FEATURE_ARM_V8_CRC32 0x00000004
+#define CPU_FEATURE_ARM_V8_CRYPTO 0x00000008
/* System Information Class 0x02 */
More information about the wine-cvs
mailing list