~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
base/dispatch.c: Reformat an ugly line-break.
[catacomb]
/
base
/
dispatch.c
diff --git
a/base/dispatch.c
b/base/dispatch.c
index
65ea2d2
..
71a9da9
100644
(file)
--- a/
base/dispatch.c
+++ b/
base/dispatch.c
@@
-226,6
+226,7
@@
static unsigned hwcaps = 0;
# define WANTAUX(_) \
WANT_AT_HWCAP(_)
# define CAPMAP(_) \
# define WANTAUX(_) \
WANT_AT_HWCAP(_)
# define CAPMAP(_) \
+ _(ARM_NEON, "arm:neon") \
_(ARM_AES, "arm:aes") \
_(ARM_PMULL, "arm:pmull")
#endif
_(ARM_AES, "arm:aes") \
_(ARM_PMULL, "arm:pmull")
#endif
@@
-346,6
+347,7
@@
static void probe_hwcaps(void)
# endif
#endif
#if CPUFAM_ARM64
# endif
#endif
#if CPUFAM_ARM64
+ if (probed.hwcap & HWCAP_ASIMD) hw |= HF_ARM_NEON;
if (probed.hwcap & HWCAP_AES) hw |= HF_ARM_AES;
if (probed.hwcap & HWCAP_PMULL) hw |= HF_ARM_PMULL;
#endif
if (probed.hwcap & HWCAP_AES) hw |= HF_ARM_AES;
if (probed.hwcap & HWCAP_PMULL) hw |= HF_ARM_PMULL;
#endif
@@
-432,14
+434,14
@@
static int IGNORABLE check_env(const char *ftok)
if (!p) return (-1);
for (;;) {
if (!p) return (-1);
for (;;) {
- while (
isspace((unsigned char)
*p)) p++;
+ while (
ISSPACE(
*p)) p++;
if (!*p) return (-1);
switch (*p) {
case '+': d = +1; p++; break;
case '-': d = 0; p++; break;
default: d = -1; break;
}
if (!*p) return (-1);
switch (*p) {
case '+': d = +1; p++; break;
case '-': d = 0; p++; break;
default: d = -1; break;
}
- for (q = p; *q && !
isspace((unsigned char)
*q); q++);
+ for (q = p; *q && !
ISSPACE(
*q); q++);
if (d >= 0) {
for (pp = ftok; p < q && *pp && *p == *pp; p++, pp++);
if ((p == q && !*pp) || (*p == '*' && p + 1 == q)) return (d);
if (d >= 0) {
for (pp = ftok; p < q && *pp && *p == *pp; p++, pp++);
if ((p == q && !*pp) || (*p == '*' && p + 1 == q)) return (d);
@@
-473,8
+475,7
@@
int cpu_feature_p(int feat)
int IGNORABLE f;
IGNORE(f);
#define CASE_CPUFEAT(feat, ftok, cond) case CPUFEAT_##feat: \
int IGNORABLE f;
IGNORE(f);
#define CASE_CPUFEAT(feat, ftok, cond) case CPUFEAT_##feat: \
- if ((f = feat_debug(ftok, "environment override", \
- check_env(ftok))) >= 0) \
+ if ((f = feat_debug(ftok, "environment override", check_env(ftok))) >= 0) \
return (f); \
else \
return (feat_debug(ftok, "runtime probe", cond));
return (f); \
else \
return (feat_debug(ftok, "runtime probe", cond));