[INTRIN.H] Add _mul128 and _umul128 prototypes and remove some obsolete ones from...

svn path=/trunk/; revision=75571

diff --git a/reactos/sdk/include/crt/intrin.h b/reactos/sdk/include/crt/intrin.h
index 6d0b9a7..897cf29 100644 (file)
--- a/reactos/sdk/include/crt/intrin.h
+++ b/reactos/sdk/include/crt/intrin.h
@@ -757,6 +757,8 @@ void __incgsword(unsigned long);
 unsigned __int64 __lzcnt64(unsigned __int64);
 void __movsq(unsigned long long *, unsigned long long const *, size_t);
 __int64 __mulh(__int64, __int64);
+__int64 _mul128(__int64 _Multiplier, __int64 _Multiplicand, __int64 * _HighProduct);
+unsigned __int64 _umul128(unsigned __int64 _Multiplier, unsigned __int64 _Multiplicand, unsigned __int64 * _HighProduct);
 unsigned __int64 __popcnt64(unsigned __int64);
 unsigned __int64 __readcr0(void);
 unsigned __int64 __readcr2(void);
@@ -820,8 +822,6 @@ __int64 _mm_popcnt_u64(unsigned __int64);
 __m128i _mm_set1_epi64x(__int64);
 __m128i _mm_set_epi64x(__int64, __int64);
 void _mm_stream_si64x(__int64 *, __int64);
-__int64 _mul128(__int64 _Multiplier, __int64 _Multiplicand, __int64 * _HighProduct);
-unsigned __int64 _umul128(unsigned __int64 _Multiplier, unsigned __int64 _Multiplicand, unsigned __int64 * _HighProduct);
 #endif
 #endif /* _M_X64 */
 

diff --git a/reactos/sdk/include/crt/msc/intrin.h b/reactos/sdk/include/crt/msc/intrin.h
index 510150b..305280b 100644 (file)
--- a/reactos/sdk/include/crt/msc/intrin.h
+++ b/reactos/sdk/include/crt/msc/intrin.h
@@ -173,7 +173,6 @@ extern "C" {
 #pragma intrinsic(_byteswap_uint64)
 #if defined(_M_IX86) || defined(_M_AMD64)
 #pragma intrinsic(__ll_lshift)
-__int64 __ll_rshift(__int64 Mask, int Bit);
 #pragma intrinsic(__ll_rshift)
 #pragma intrinsic(__ull_rshift)
 #pragma intrinsic(__lzcnt)
@@ -195,17 +194,14 @@ __int64 __ll_rshift(__int64 Mask, int Bit);
 #endif
 
 /*** 64/128-bit math ***/
-__int64 __cdecl _abs64(__int64);
 #pragma intrinsic(_abs64)
 #if defined(_M_IX86) || defined(_M_AMD64)
 #pragma intrinsic(__emul)
 #pragma intrinsic(__emulu)
 #endif
 #ifdef _M_AMD64
-__int64 __mulh(__int64 a, __int64 b);
 #pragma intrinsic(__mulh)
 #pragma intrinsic(__umulh)
-__int64 _mul128(__int64 Multiplier, __int64 Multiplicand, __int64 * HighProduct);
 #pragma intrinsic(_mul128)
 #pragma intrinsic(_umul128)
 #elif defined(_M_ARM)