Skip to content

Commit f53f80d

Browse files
jorgsowajorgsowa
committed
Fixed undefined flags in base64
1 parent 205c8b6 commit f53f80d

File tree

2 files changed

+53
-53
lines changed

2 files changed

+53
-53
lines changed

‎ext/standard/base64.c

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,12 @@ static zend_always_inline int php_base64_decode_impl(const unsigned char *in, si
325325

326326
/* {{{ php_base64_encode */
327327

328-
#if ZEND_INTRIN_AVX2_NATIVE
328+
#ifdef ZEND_INTRIN_AVX2_NATIVE
329329
# undef ZEND_INTRIN_SSSE3_NATIVE
330330
# undef ZEND_INTRIN_SSSE3_RESOLVER
331331
# undef ZEND_INTRIN_SSSE3_FUNC_PROTO
332332
# undef ZEND_INTRIN_SSSE3_FUNC_PTR
333-
#elif ZEND_INTRIN_AVX2_FUNC_PROTO && ZEND_INTRIN_SSSE3_NATIVE
333+
#elif defined(ZEND_INTRIN_AVX2_FUNC_PROTO) && defined(ZEND_INTRIN_SSSE3_NATIVE)
334334
# undef ZEND_INTRIN_SSSE3_NATIVE
335335
# undef ZEND_INTRIN_SSSE3_RESOLVER
336336
# define ZEND_INTRIN_SSSE3_RESOLVER 1
@@ -341,7 +341,7 @@ static zend_always_inline int php_base64_decode_impl(const unsigned char *in, si
341341
# else
342342
# define ZEND_INTRIN_SSSE3_FUNC_DECL(func) ZEND_API func
343343
# endif
344-
#elif ZEND_INTRIN_AVX2_FUNC_PTR && ZEND_INTRIN_SSSE3_NATIVE
344+
#elif defined(ZEND_INTRIN_AVX2_FUNC_PTR) && defined(ZEND_INTRIN_SSSE3_NATIVE)
345345
# undef ZEND_INTRIN_SSSE3_NATIVE
346346
# undef ZEND_INTRIN_SSSE3_RESOLVER
347347
# define ZEND_INTRIN_SSSE3_RESOLVER 1
@@ -355,54 +355,54 @@ static zend_always_inline int php_base64_decode_impl(const unsigned char *in, si
355355
#endif
356356

357357
/* Only enable avx512 resolver if avx2 use resolver also */
358-
#if ZEND_INTRIN_AVX2_FUNC_PROTO && ZEND_INTRIN_AVX512_FUNC_PROTO
358+
#if defined(ZEND_INTRIN_AVX2_FUNC_PROTO) && defined(ZEND_INTRIN_AVX512_FUNC_PROTO)
359359
#define BASE64_INTRIN_AVX512_FUNC_PROTO 1
360360
#endif
361-
#if ZEND_INTRIN_AVX2_FUNC_PTR && ZEND_INTRIN_AVX512_FUNC_PTR
361+
#if defined(ZEND_INTRIN_AVX2_FUNC_PTR) && defined(ZEND_INTRIN_AVX512_FUNC_PTR)
362362
#define BASE64_INTRIN_AVX512_FUNC_PTR 1
363363
#endif
364-
#if ZEND_INTRIN_AVX2_FUNC_PROTO && ZEND_INTRIN_AVX512_VBMI_FUNC_PROTO
364+
#if defined(ZEND_INTRIN_AVX2_FUNC_PROTO) && defined(ZEND_INTRIN_AVX512_VBMI_FUNC_PROTO)
365365
#define BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO 1
366366
#endif
367-
#if ZEND_INTRIN_AVX2_FUNC_PTR && ZEND_INTRIN_AVX512_VBMI_FUNC_PTR
367+
#if defined(ZEND_INTRIN_AVX2_FUNC_PTR) && defined(ZEND_INTRIN_AVX512_VBMI_FUNC_PTR)
368368
#define BASE64_INTRIN_AVX512_VBMI_FUNC_PTR 1
369369
#endif
370370

371-
#if ZEND_INTRIN_AVX2_NATIVE
371+
#ifdef ZEND_INTRIN_AVX2_NATIVE
372372
# include <immintrin.h>
373-
#elif ZEND_INTRIN_SSSE3_NATIVE
373+
#elif defined(ZEND_INTRIN_SSSE3_NATIVE)
374374
# include <tmmintrin.h>
375-
#elif (ZEND_INTRIN_SSSE3_RESOLVER || ZEND_INTRIN_AVX2_RESOLVER)
376-
# if ZEND_INTRIN_AVX2_RESOLVER
375+
#elif defined(ZEND_INTRIN_SSSE3_RESOLVER) || defined(ZEND_INTRIN_AVX2_RESOLVER)
376+
# ifdef ZEND_INTRIN_AVX2_RESOLVER
377377
# include <immintrin.h>
378378
# else
379379
# include <tmmintrin.h>
380380
# endif /* (ZEND_INTRIN_SSSE3_RESOLVER || ZEND_INTRIN_AVX2_RESOLVER) */
381381
# include "Zend/zend_cpuinfo.h"
382382

383-
# if BASE64_INTRIN_AVX512_FUNC_PROTO || BASE64_INTRIN_AVX512_FUNC_PTR
383+
# if defined(BASE64_INTRIN_AVX512_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_FUNC_PTR)
384384
ZEND_INTRIN_AVX512_FUNC_DECL(zend_string *php_base64_encode_avx512(const unsigned char *str, size_t length));
385385
ZEND_INTRIN_AVX512_FUNC_DECL(zend_string *php_base64_decode_ex_avx512(const unsigned char *str, size_t length, bool strict));
386386
# endif
387-
# if BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO || BASE64_INTRIN_AVX512_VBMI_FUNC_PTR
387+
# if defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PTR)
388388
ZEND_INTRIN_AVX512_VBMI_FUNC_DECL(zend_string *php_base64_encode_avx512_vbmi(const unsigned char *str, size_t length));
389389
ZEND_INTRIN_AVX512_VBMI_FUNC_DECL(zend_string *php_base64_decode_ex_avx512_vbmi(const unsigned char *str, size_t length, bool strict));
390390
# endif
391391

392-
# if ZEND_INTRIN_AVX2_RESOLVER
392+
# ifdef ZEND_INTRIN_AVX2_RESOLVER
393393
ZEND_INTRIN_AVX2_FUNC_DECL(zend_string *php_base64_encode_avx2(const unsigned char *str, size_t length));
394394
ZEND_INTRIN_AVX2_FUNC_DECL(zend_string *php_base64_decode_ex_avx2(const unsigned char *str, size_t length, bool strict));
395395
# endif
396396

397-
# if ZEND_INTRIN_SSSE3_RESOLVER
397+
# ifdef ZEND_INTRIN_SSSE3_RESOLVER
398398
ZEND_INTRIN_SSSE3_FUNC_DECL(zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length));
399399
ZEND_INTRIN_SSSE3_FUNC_DECL(zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length, bool strict));
400400
# endif
401401

402402
zend_string *php_base64_encode_default(const unsigned char *str, size_t length);
403403
zend_string *php_base64_decode_ex_default(const unsigned char *str, size_t length, bool strict);
404404

405-
# if (ZEND_INTRIN_AVX2_FUNC_PROTO || ZEND_INTRIN_SSSE3_FUNC_PROTO || BASE64_INTRIN_AVX512_FUNC_PROTO || BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO)
405+
# if (defined(ZEND_INTRIN_AVX2_FUNC_PROTO) || defined(ZEND_INTRIN_SSSE3_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO))
406406
PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length) __attribute__((ifunc("resolve_base64_encode")));
407407
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, bool strict) __attribute__((ifunc("resolve_base64_decode")));
408408

@@ -412,22 +412,22 @@ typedef zend_string *(*base64_decode_func_t)(const unsigned char *, size_t, bool
412412
ZEND_NO_SANITIZE_ADDRESS
413413
ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
414414
static base64_encode_func_t resolve_base64_encode(void) {
415-
# if BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO
415+
# ifdef BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO
416416
if (zend_cpu_supports_avx512_vbmi()) {
417417
return php_base64_encode_avx512_vbmi;
418418
} else
419419
# endif
420-
# if BASE64_INTRIN_AVX512_FUNC_PROTO
420+
# ifdef BASE64_INTRIN_AVX512_FUNC_PROTO
421421
if (zend_cpu_supports_avx512()) {
422422
return php_base64_encode_avx512;
423423
} else
424424
# endif
425-
# if ZEND_INTRIN_AVX2_FUNC_PROTO
425+
# ifdef ZEND_INTRIN_AVX2_FUNC_PROTO
426426
if (zend_cpu_supports_avx2()) {
427427
return php_base64_encode_avx2;
428428
} else
429429
# endif
430-
#if ZEND_INTRIN_SSSE3_FUNC_PROTO
430+
#ifdef ZEND_INTRIN_SSSE3_FUNC_PROTO
431431
if (zend_cpu_supports_ssse3()) {
432432
return php_base64_encode_ssse3;
433433
}
@@ -438,22 +438,22 @@ static base64_encode_func_t resolve_base64_encode(void) {
438438
ZEND_NO_SANITIZE_ADDRESS
439439
ZEND_ATTRIBUTE_UNUSED /* clang mistakenly warns about this */
440440
static base64_decode_func_t resolve_base64_decode(void) {
441-
# if BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO
441+
# ifdef BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO
442442
if (zend_cpu_supports_avx512_vbmi()) {
443443
return php_base64_decode_ex_avx512_vbmi;
444444
} else
445445
# endif
446-
# if BASE64_INTRIN_AVX512_FUNC_PROTO
446+
# ifdef BASE64_INTRIN_AVX512_FUNC_PROTO
447447
if (zend_cpu_supports_avx512()) {
448448
return php_base64_decode_ex_avx512;
449449
} else
450450
# endif
451-
# if ZEND_INTRIN_AVX2_FUNC_PROTO
451+
# ifdef ZEND_INTRIN_AVX2_FUNC_PROTO
452452
if (zend_cpu_supports_avx2()) {
453453
return php_base64_decode_ex_avx2;
454454
} else
455455
# endif
456-
#if ZEND_INTRIN_SSSE3_FUNC_PROTO
456+
#ifdef ZEND_INTRIN_SSSE3_FUNC_PROTO
457457
if (zend_cpu_supports_ssse3()) {
458458
return php_base64_decode_ex_ssse3;
459459
}
@@ -474,25 +474,25 @@ PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length
474474

475475
PHP_MINIT_FUNCTION(base64_intrin)
476476
{
477-
# if BASE64_INTRIN_AVX512_VBMI_FUNC_PTR
477+
# ifdef BASE64_INTRIN_AVX512_VBMI_FUNC_PTR
478478
if (zend_cpu_supports_avx512_vbmi()) {
479479
php_base64_encode_ptr = php_base64_encode_avx512_vbmi;
480480
php_base64_decode_ex_ptr = php_base64_decode_ex_avx512_vbmi;
481481
} else
482482
# endif
483-
# if BASE64_INTRIN_AVX512_FUNC_PTR
483+
# ifdef BASE64_INTRIN_AVX512_FUNC_PTR
484484
if (zend_cpu_supports_avx512()) {
485485
php_base64_encode_ptr = php_base64_encode_avx512;
486486
php_base64_decode_ex_ptr = php_base64_decode_ex_avx512;
487487
} else
488488
# endif
489-
# if ZEND_INTRIN_AVX2_FUNC_PTR
489+
# ifdef ZEND_INTRIN_AVX2_FUNC_PTR
490490
if (zend_cpu_supports_avx2()) {
491491
php_base64_encode_ptr = php_base64_encode_avx2;
492492
php_base64_decode_ex_ptr = php_base64_decode_ex_avx2;
493493
} else
494494
# endif
495-
#if ZEND_INTRIN_SSSE3_FUNC_PTR
495+
#ifdef ZEND_INTRIN_SSSE3_FUNC_PTR
496496
if (zend_cpu_supports_ssse3()) {
497497
php_base64_encode_ptr = php_base64_encode_ssse3;
498498
php_base64_decode_ex_ptr = php_base64_decode_ex_ssse3;
@@ -507,7 +507,7 @@ PHP_MINIT_FUNCTION(base64_intrin)
507507
# endif /* (ZEND_INTRIN_AVX2_FUNC_PROTO || ZEND_INTRIN_SSSE3_FUNC_PROTO) */
508508
#endif /* ZEND_INTRIN_AVX2_NATIVE */
509509

510-
#if BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO || BASE64_INTRIN_AVX512_VBMI_FUNC_PTR
510+
#if defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_VBMI_FUNC_PTR)
511511
zend_string *php_base64_encode_avx512_vbmi(const unsigned char *str, size_t length)
512512
{
513513
const unsigned char *c = str;
@@ -617,7 +617,7 @@ zend_string *php_base64_decode_ex_avx512_vbmi(const unsigned char *str, size_t l
617617
}
618618
#endif
619619

620-
#if BASE64_INTRIN_AVX512_FUNC_PROTO || BASE64_INTRIN_AVX512_FUNC_PTR
620+
#if defined(BASE64_INTRIN_AVX512_FUNC_PROTO) || defined(BASE64_INTRIN_AVX512_FUNC_PTR)
621621
zend_string *php_base64_encode_avx512(const unsigned char *str, size_t length)
622622
{
623623
const unsigned char *c = str;
@@ -750,8 +750,8 @@ zend_string *php_base64_decode_ex_avx512(const unsigned char *str, size_t length
750750
}
751751
#endif
752752

753-
#if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER
754-
# if ZEND_INTRIN_AVX2_RESOLVER && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
753+
#if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
754+
# if defined(ZEND_INTRIN_AVX2_RESOLVER) && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
755755
static __m256i php_base64_encode_avx2_reshuffle(__m256i in) __attribute__((target("avx2")));
756756
static __m256i php_base64_encode_avx2_translate(__m256i in) __attribute__((target("avx2")));
757757
# endif
@@ -815,9 +815,9 @@ static __m256i php_base64_encode_avx2_translate(__m256i in)
815815
}
816816
#endif /* ZEND_INTRIN_AVX2_NATIVE || (ZEND_INTRIN_AVX2_RESOLVER && !ZEND_INTRIN_SSSE3_NATIVE) */
817817

818-
#if ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER
818+
#if defined(ZEND_INTRIN_SSSE3_NATIVE) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
819819

820-
# if ZEND_INTRIN_SSSE3_RESOLVER && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
820+
# if defined(ZEND_INTRIN_SSSE3_RESOLVER) && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
821821
static __m128i php_base64_encode_ssse3_reshuffle(__m128i in) __attribute__((target("ssse3")));
822822
static __m128i php_base64_encode_ssse3_translate(__m128i in) __attribute__((target("ssse3")));
823823
# endif
@@ -898,10 +898,10 @@ static __m128i php_base64_encode_ssse3_translate(__m128i in)
898898

899899
#endif /* ZEND_INTRIN_SSSE3_NATIVE || (ZEND_INTRIN_SSSE3_RESOLVER && !ZEND_INTRIN_AVX2_NATIVE) */
900900

901-
#if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER
902-
# if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_SSSE3_NATIVE
901+
#if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER) || defined(ZEND_INTRIN_SSSE3_NATIVE) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
902+
# if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_SSSE3_NATIVE)
903903
PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length)
904-
# elif ZEND_INTRIN_AVX2_RESOLVER
904+
# elif defined(ZEND_INTRIN_AVX2_RESOLVER)
905905
zend_string *php_base64_encode_avx2(const unsigned char *str, size_t length)
906906
# else /* ZEND_INTRIN_SSSE3_RESOLVER */
907907
zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length)
@@ -913,7 +913,7 @@ zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length)
913913

914914
result = zend_string_safe_alloc(((length + 2) / 3), 4 * sizeof(char), 0, 0);
915915
o = (unsigned char *)ZSTR_VAL(result);
916-
# if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER
916+
# if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
917917
if (length > 31) {
918918
__m256i s = _mm256_loadu_si256((__m256i *)c);
919919

@@ -945,7 +945,7 @@ zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length)
945945
return result;
946946
}
947947

948-
# if ZEND_INTRIN_SSSE3_RESOLVER && ZEND_INTRIN_AVX2_RESOLVER
948+
# if defined(ZEND_INTRIN_SSSE3_RESOLVER) && defined(ZEND_INTRIN_AVX2_RESOLVER)
949949
zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length)
950950
{
951951
const unsigned char *c = str;
@@ -968,8 +968,8 @@ zend_string *php_base64_encode_ssse3(const unsigned char *str, size_t length)
968968

969969
/* }}} */
970970

971-
#if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER
972-
# if ZEND_INTRIN_AVX2_RESOLVER && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
971+
#if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
972+
# if defined(ZEND_INTRIN_AVX2_RESOLVER) && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
973973
static __m256i php_base64_decode_avx2_reshuffle(__m256i in) __attribute__((target("avx2")));
974974
# endif
975975

@@ -989,8 +989,8 @@ static __m256i php_base64_decode_avx2_reshuffle(__m256i in)
989989
}
990990
#endif
991991

992-
#if ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER
993-
# if ZEND_INTRIN_SSSE3_RESOLVER && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
992+
#if defined(ZEND_INTRIN_SSSE3_NATIVE) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
993+
# if defined(ZEND_INTRIN_SSSE3_RESOLVER) && defined(HAVE_FUNC_ATTRIBUTE_TARGET)
994994
static __m128i php_base64_decode_ssse3_reshuffle(__m128i in) __attribute__((target("ssse3")));
995995
# endif
996996

@@ -1071,10 +1071,10 @@ static __m128i php_base64_decode_ssse3_reshuffle(__m128i in)
10711071

10721072
#endif
10731073

1074-
#if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER
1075-
# if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_SSSE3_NATIVE
1074+
#if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER) || defined(ZEND_INTRIN_SSSE3_NATIVE) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
1075+
# if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_SSSE3_NATIVE)
10761076
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, bool strict)
1077-
# elif ZEND_INTRIN_AVX2_RESOLVER
1077+
# elif defined(ZEND_INTRIN_AVX2_RESOLVER)
10781078
zend_string *php_base64_decode_ex_avx2(const unsigned char *str, size_t length, bool strict)
10791079
# else
10801080
zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length, bool strict)
@@ -1090,7 +1090,7 @@ zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length,
10901090

10911091
/* See: "Faster Base64 Encoding and Decoding using AVX2 Instructions"
10921092
* https://arxiv.org/pdf/1704.00605.pdf */
1093-
# if ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER
1093+
# if defined(ZEND_INTRIN_AVX2_NATIVE) || defined(ZEND_INTRIN_AVX2_RESOLVER)
10941094
while (length > 31 + 11 + 2) {
10951095
__m256i lut_lo, lut_hi, lut_roll;
10961096
__m256i hi_nibbles, lo_nibbles, hi, lo;
@@ -1153,7 +1153,7 @@ zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length,
11531153
return result;
11541154
}
11551155

1156-
# if ZEND_INTRIN_SSSE3_RESOLVER && ZEND_INTRIN_AVX2_RESOLVER
1156+
# if defined(ZEND_INTRIN_SSSE3_RESOLVER) && defined(ZEND_INTRIN_AVX2_RESOLVER)
11571157
zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length, bool strict)
11581158
{
11591159
const unsigned char *c = str;
@@ -1178,8 +1178,8 @@ zend_string *php_base64_decode_ex_ssse3(const unsigned char *str, size_t length,
11781178
# endif
11791179
#endif /* ZEND_INTRIN_AVX2_NATIVE || ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_NATIVE || ZEND_INTRIN_SSSE3_RESOLVER */
11801180

1181-
#if !ZEND_INTRIN_AVX2_NATIVE && !ZEND_INTRIN_SSSE3_NATIVE
1182-
#if ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_RESOLVER
1181+
#if !defined(ZEND_INTRIN_AVX2_NATIVE) && !defined(ZEND_INTRIN_SSSE3_NATIVE)
1182+
#if defined(ZEND_INTRIN_AVX2_RESOLVER) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
11831183
zend_string *php_base64_encode_default(const unsigned char *str, size_t length)
11841184
#else
11851185
PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length)
@@ -1199,8 +1199,8 @@ PHPAPI zend_string *php_base64_encode(const unsigned char *str, size_t length)
11991199
}
12001200
#endif
12011201

1202-
#if !ZEND_INTRIN_AVX2_NATIVE && !ZEND_INTRIN_SSSE3_NATIVE
1203-
#if ZEND_INTRIN_AVX2_RESOLVER || ZEND_INTRIN_SSSE3_RESOLVER
1202+
#if !defined(ZEND_INTRIN_AVX2_NATIVE) && !defined(ZEND_INTRIN_SSSE3_NATIVE)
1203+
#if defined(ZEND_INTRIN_AVX2_RESOLVER) || defined(ZEND_INTRIN_SSSE3_RESOLVER)
12041204
zend_string *php_base64_decode_ex_default(const unsigned char *str, size_t length, bool strict)
12051205
#else
12061206
PHPAPI zend_string *php_base64_decode_ex(const unsigned char *str, size_t length, bool strict)

‎ext/standard/base64.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
5858
*/
5959

60-
#if (ZEND_INTRIN_AVX2_FUNC_PTR || ZEND_INTRIN_SSSE3_FUNC_PTR || ZEND_INTRIN_AVX512_FUNC_PTR || ZEND_INTRIN_AVX512_VBMI_FUNC_PTR) && !ZEND_INTRIN_AVX2_NATIVE
60+
#if (defined(ZEND_INTRIN_AVX2_FUNC_PTR) || defined(ZEND_INTRIN_SSSE3_FUNC_PTR) || defined(ZEND_INTRIN_AVX512_FUNC_PTR) || defined(ZEND_INTRIN_AVX512_VBMI_FUNC_PTR)) && !defined(ZEND_INTRIN_AVX2_NATIVE)
6161
PHP_MINIT_FUNCTION(base64_intrin);
6262
#endif
6363

0 commit comments

Comments
 (0)