@@ -387,6 +387,7 @@ __INTRIN_INLINE unsigned char _InterlockedCompareExchange128(
387387 [xl ] "r" ((unsigned __int64 )ExchangeLow ),
388388 [xh ] "r" ((unsigned __int64 )ExchangeHigh )
389389 : "cc" , "memory" );
390+ __asm__ __volatile__("dmb ish" ::: "memory" );
390391 if (status == 0 )
391392 return 1 ;
392393 ComparandResult [0 ] = (__int64 )old_lo ;
@@ -395,13 +396,6 @@ __INTRIN_INLINE unsigned char _InterlockedCompareExchange128(
395396}
396397#endif
397398
398- #if !HAS_BUILTIN (_mm_pause )
399- __INTRIN_INLINE void _mm_pause (void )
400- {
401- __asm__ __volatile__("yield" : : : "memory" );
402- }
403- #endif
404-
405399#if !HAS_BUILTIN (__nop )
406400__INTRIN_INLINE void __nop (void )
407401{
@@ -632,72 +626,34 @@ __INTRIN_INLINE unsigned long __cdecl _lrotr(unsigned long value, int shift)
632626}
633627#endif
634628
635- /*** 64-bit shifts ***/
636- #if !HAS_BUILTIN (__ll_lshift )
637- __INTRIN_INLINE unsigned long long __ll_lshift (unsigned long long Mask , int Bit )
638- {
639- return Mask << (Bit & 0x3F );
640- }
641- #endif
642-
643- #if !HAS_BUILTIN (__ll_rshift )
644- __INTRIN_INLINE long long __ll_rshift (long long Mask , int Bit )
645- {
646- return Mask >> (Bit & 0x3F );
647- }
648- #endif
649-
650- #if !HAS_BUILTIN (__ull_rshift )
651- __INTRIN_INLINE unsigned long long __ull_rshift (unsigned long long Mask , int Bit )
652- {
653- return Mask >> (Bit & 0x3F );
654- }
655- #endif
656-
657- /*** Leading zero count and population count ***/
658- #if !HAS_BUILTIN (__lzcnt )
659- __INTRIN_INLINE unsigned int __lzcnt (unsigned int value )
629+ /*** Bit count ***/
630+ #if !HAS_BUILTIN (_CountLeadingZeros )
631+ __INTRIN_INLINE unsigned int _CountLeadingZeros (unsigned long value )
660632{
661633 if (!value )
662- return 32 ;
663- return __builtin_clz (value );
634+ return sizeof ( value ) * 8 ;
635+ return __builtin_clzl (value );
664636}
665637#endif
666638
667- #if !HAS_BUILTIN (__lzcnt16 )
668- __INTRIN_INLINE unsigned short __lzcnt16 (unsigned short value )
669- {
670- if (!value )
671- return 16 ;
672- return (unsigned short )(__builtin_clz ((unsigned int )value ) - 16 );
673- }
674- #endif
675-
676- #if !HAS_BUILTIN (__lzcnt64 )
677- __INTRIN_INLINE unsigned long long __lzcnt64 (unsigned long long value )
639+ #if !HAS_BUILTIN (_CountLeadingZeros64 )
640+ __INTRIN_INLINE unsigned int _CountLeadingZeros64 (unsigned __int64 value )
678641{
679642 if (!value )
680643 return 64 ;
681644 return __builtin_clzll (value );
682645}
683646#endif
684647
685- #if !HAS_BUILTIN (__popcnt )
686- __INTRIN_INLINE unsigned int __popcnt (unsigned int value )
687- {
688- return __builtin_popcount (value );
689- }
690- #endif
691-
692- #if !HAS_BUILTIN (__popcnt16 )
693- __INTRIN_INLINE unsigned short __popcnt16 (unsigned short value )
648+ #if !HAS_BUILTIN (_CountOneBits )
649+ __INTRIN_INLINE unsigned int _CountOneBits (unsigned long value )
694650{
695- return __builtin_popcount (value );
651+ return __builtin_popcountl (value );
696652}
697653#endif
698654
699- #if !HAS_BUILTIN (__popcnt64 )
700- __INTRIN_INLINE unsigned long long __popcnt64 (unsigned long long value )
655+ #if !HAS_BUILTIN (_CountOneBits64 )
656+ __INTRIN_INLINE unsigned int _CountOneBits64 (unsigned __int64 value )
701657{
702658 return __builtin_popcountll (value );
703659}
@@ -794,18 +750,14 @@ __INTRIN_INLINE void __isb(unsigned int type)
794750 should use named MSR/MRS asm wrappers instead. */
795751
796752#if !HAS_BUILTIN (__getReg )
797- __INTRIN_INLINE unsigned __int64 __getReg (int reg )
798- {
799- unsigned __int64 value ;
800-
801- if (reg == 18 )
802- {
803- __asm__ __volatile__("mov %0, x18" : "=r" (value ));
804- return value ;
805- }
806-
807- __builtin_trap ();
808- }
753+ #define __getReg (reg ) \
754+ __extension__({ \
755+ _Static_assert((unsigned long long)(reg) <= 31ULL, \
756+ "__getReg: register index out of range"); \
757+ unsigned __int64 _value; \
758+ __asm__ __volatile__("mov %0, x%c1" : "=r"(_value) : "i"(reg)); \
759+ _value; \
760+ })
809761#endif
810762
811763/*** _InterlockedAdd (returns the new, post-add value) ***/
0 commit comments