util/cpuinfo-aarch64: Add OpenBSD support
PATCH 1/1 util/cpuinfo-aarch64: Add OpenBSD support
util/cpuinfo-aarch64: Add OpenBSD support
--- util/cpuinfo-aarch64.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
util/cpuinfo-aarch64.c +32 -0
@@ -20,6 +20,12 @@#ifdef CONFIG_DARWIN # include <sys/sysctl.h> #endif +#ifdef __OpenBSD__ +# include <machine/armreg.h> +# include <machine/cpu.h> +# include <sys/types.h> +# include <sys/sysctl.h> +#endif unsigned cpuinfo;
@@ -72,6 +78,32 @@ unsigned __attribute__((constructor)) cpuinfo_init(void) info |=sysctl_for_bool ("hw.optional.arm.FEAT_PMULL" ) *CPUINFO_PMULL ; info |=sysctl_for_bool ("hw.optional.arm.FEAT_BTI" ) *CPUINFO_BTI ;#endif +#ifdef __OpenBSD__ +int mib[2 ]; +uint64_t isar0; +uint64_t pfr1; +size_t len; + + mib[0 ] =CTL_MACHDEP ; + mib[1 ] =CPU_ID_AA64ISAR0 ; + len =sizeof (isar0); +if (sysctl (mib,2 , &isar0, &len,NULL ,0 ) !=-1 ) { +if (ID_AA64ISAR0_ATOMIC (isar0) >=ID_AA64ISAR0_ATOMIC_IMPL ) + info |=CPUINFO_LSE ; +if (ID_AA64ISAR0_AES (isar0) >=ID_AA64ISAR0_AES_BASE ) + info |=CPUINFO_AES ; +if (ID_AA64ISAR0_AES (isar0) >=ID_AA64ISAR0_AES_PMULL ) + info |=CPUINFO_PMULL ; + } + + mib[0 ] =CTL_MACHDEP ; + mib[1 ] =CPU_ID_AA64PFR1 ; + len =sizeof (pfr1); +if (sysctl (mib,2 , &pfr1, &len,NULL ,0 ) !=-1 ) { +if (ID_AA64PFR1_BT (pfr1) >=ID_AA64PFR1_BT_IMPL ) + info |=CPUINFO_BTI ; + } +#endif cpuinfo = info;return info;
Signature · 1 line
2.45.2
Quoted 6 lines · Brad Smith
util/cpuinfo-aarch64.c +6
-0+if (sysctl (mib,2 , &isar0, &len,NULL ,0 ) !=-1 ) { +if (ID_AA64ISAR0_ATOMIC (isar0) >=ID_AA64ISAR0_ATOMIC_IMPL ) + info |=CPUINFO_LSE ; +if (ID_AA64ISAR0_AES (isar0) >=ID_AA64ISAR0_AES_BASE ) + info |=CPUINFO_AES ; +if (ID_AA64ISAR0_AES (isar0) >=ID_AA64ISAR0_AES_PMULL )
util/cpuinfo-aarch64.c unsigned __attribute__((constructor)) cpuinfo_init(void) · line 105
Quoted 10 lines
util/cpuinfo-aarch64.c +10
-0+ info |=CPUINFO_PMULL ; + } + + mib[0 ] =CTL_MACHDEP ; + mib[1 ] =CPU_ID_AA64PFR1 ; + len =sizeof (pfr1); +if (sysctl (mib,2 , &pfr1, &len,NULL ,0 ) !=-1 ) { +if (ID_AA64PFR1_BT (pfr1) >=ID_AA64PFR1_BT_IMPL ) + info |=CPUINFO_BTI ; + }
Need braces for all of the if's. Otherwise,
r~
Quoted 18 lines · Richard Henderson
Quoted 8 lines · Brad Smith
+ if (
sysctl(mib, 2, &isar0, &len, NULL, 0)!= -1) { + if (ID_AA64ISAR0_ATOMIC(isar0)>=ID_AA64ISAR0_ATOMIC_IMPL) + info |=CPUINFO_LSE;
+ if (ID_AA64ISAR0_AES(isar0)>=ID_AA64ISAR0_AES_BASE) + info |=CPUINFO_AES;
+ if (ID_AA64ISAR0_AES(isar0)>=ID_AA64ISAR0_AES_PMULL) + info |=CPUINFO_PMULL;
+ }Quoted 8 lines
+
+ mib[0] =CTL_MACHDEP;
+ mib[1] =CPU_ID_AA64PFR1;
+ len = sizeof(pfr1);
+ if (sysctl(mib, 2, &pfr1, &len, NULL, 0)!= -1) { + if (ID_AA64PFR1_BT(pfr1)>=ID_AA64PFR1_BT_IMPL) + info |=CPUINFO_BTI;
+ }
Quoted 2 lines
Need braces for all of the if's. Otherwise,
Reviewed-by Richard Henderson <[email protected]>
Fixed braces and queued to tcg-next.
r~
Quoted 19 lines · Richard Henderson
Quoted 18 lines · Richard Henderson
Quoted 16 lines · Brad Smith
+ if (
sysctl(mib, 2, &isar0, &len, NULL, 0)!= -1) { + if (ID_AA64ISAR0_ATOMIC(isar0)>=ID_AA64ISAR0_ATOMIC_IMPL) + info |=CPUINFO_LSE;
+ if (ID_AA64ISAR0_AES(isar0)>=ID_AA64ISAR0_AES_BASE) + info |=CPUINFO_AES;
+ if (ID_AA64ISAR0_AES(isar0)>=ID_AA64ISAR0_AES_PMULL) + info |=CPUINFO_PMULL;
+ }
+
+ mib[0] =CTL_MACHDEP;
+ mib[1] =CPU_ID_AA64PFR1;
+ len = sizeof(pfr1);
+ if (sysctl(mib, 2, &pfr1, &len, NULL, 0)!= -1) { + if (ID_AA64PFR1_BT(pfr1)>=ID_AA64PFR1_BT_IMPL) + info |=CPUINFO_BTI;
+ }
Quoted 4 lines
Quoted 2 lines
Need braces for all of the if's. Otherwise,
Reviewed-by Richard Henderson <[email protected]>Fixed braces and queued to tcg-next.
Thanks.