@@ -307,7 +307,7 @@ void BigInteger::negate() noexcept | |||||
negative = (! negative) && ! isZero(); | negative = (! negative) && ! isZero(); | ||||
} | } | ||||
#if JUCE_USE_INTRINSICS && ! defined (__INTEL_COMPILER) | |||||
#if JUCE_USE_MSVC_INTRINSICS && ! defined (__INTEL_COMPILER) | |||||
#pragma intrinsic (_BitScanReverse) | #pragma intrinsic (_BitScanReverse) | ||||
#endif | #endif | ||||
@@ -317,7 +317,7 @@ inline static int highestBitInInt (uint32 n) noexcept | |||||
#if JUCE_GCC | #if JUCE_GCC | ||||
return 31 - __builtin_clz (n); | return 31 - __builtin_clz (n); | ||||
#elif JUCE_USE_INTRINSICS | |||||
#elif JUCE_USE_MSVC_INTRINSICS | |||||
unsigned long highest; | unsigned long highest; | ||||
_BitScanReverse (&highest, n); | _BitScanReverse (&highest, n); | ||||
return (int) highest; | return (int) highest; | ||||
@@ -218,7 +218,7 @@ private: | |||||
#else | #else | ||||
#define JUCE_ATOMICS_WINDOWS 1 // Windows with intrinsics | #define JUCE_ATOMICS_WINDOWS 1 // Windows with intrinsics | ||||
#if JUCE_USE_INTRINSICS | |||||
#if JUCE_USE_MSVC_INTRINSICS | |||||
#ifndef __INTEL_COMPILER | #ifndef __INTEL_COMPILER | ||||
#pragma intrinsic (_InterlockedExchange, _InterlockedIncrement, _InterlockedDecrement, _InterlockedCompareExchange, \ | #pragma intrinsic (_InterlockedExchange, _InterlockedIncrement, _InterlockedDecrement, _InterlockedCompareExchange, \ | ||||
_InterlockedCompareExchange64, _InterlockedExchangeAdd, _ReadWriteBarrier) | _InterlockedCompareExchange64, _InterlockedExchangeAdd, _ReadWriteBarrier) | ||||
@@ -110,13 +110,13 @@ private: | |||||
//============================================================================== | //============================================================================== | ||||
#if JUCE_USE_INTRINSICS && ! defined (__INTEL_COMPILER) | |||||
#if JUCE_USE_MSVC_INTRINSICS && ! defined (__INTEL_COMPILER) | |||||
#pragma intrinsic (_byteswap_ulong) | #pragma intrinsic (_byteswap_ulong) | ||||
#endif | #endif | ||||
inline uint16 ByteOrder::swap (uint16 n) noexcept | inline uint16 ByteOrder::swap (uint16 n) noexcept | ||||
{ | { | ||||
#if JUCE_USE_INTRINSICSxxx // agh - the MS compiler has an internal error when you try to use this intrinsic! | |||||
#if JUCE_USE_MSVC_INTRINSICSxxx // agh - the MS compiler has an internal error when you try to use this intrinsic! | |||||
return static_cast<uint16> (_byteswap_ushort (n)); | return static_cast<uint16> (_byteswap_ushort (n)); | ||||
#else | #else | ||||
return static_cast<uint16> ((n << 8) | (n >> 8)); | return static_cast<uint16> ((n << 8) | (n >> 8)); | ||||
@@ -130,7 +130,7 @@ inline uint32 ByteOrder::swap (uint32 n) noexcept | |||||
#elif JUCE_GCC && JUCE_INTEL && ! JUCE_NO_INLINE_ASM | #elif JUCE_GCC && JUCE_INTEL && ! JUCE_NO_INLINE_ASM | ||||
asm("bswap %%eax" : "=a"(n) : "a"(n)); | asm("bswap %%eax" : "=a"(n) : "a"(n)); | ||||
return n; | return n; | ||||
#elif JUCE_USE_INTRINSICS | |||||
#elif JUCE_USE_MSVC_INTRINSICS | |||||
return _byteswap_ulong (n); | return _byteswap_ulong (n); | ||||
#elif JUCE_MSVC && ! JUCE_NO_INLINE_ASM | #elif JUCE_MSVC && ! JUCE_NO_INLINE_ASM | ||||
__asm { | __asm { | ||||
@@ -150,7 +150,7 @@ inline uint64 ByteOrder::swap (uint64 value) noexcept | |||||
{ | { | ||||
#if JUCE_MAC || JUCE_IOS | #if JUCE_MAC || JUCE_IOS | ||||
return OSSwapInt64 (value); | return OSSwapInt64 (value); | ||||
#elif JUCE_USE_INTRINSICS | |||||
#elif JUCE_USE_MSVC_INTRINSICS | |||||
return _byteswap_uint64 (value); | return _byteswap_uint64 (value); | ||||
#else | #else | ||||
return (((int64) swap ((uint32) value)) << 32) | swap ((uint32) (value >> 32)); | return (((int64) swap ((uint32) value)) << 32) | swap ((uint32) (value >> 32)); | ||||
@@ -38,7 +38,7 @@ void Logger::outputDebugString (const String& text) | |||||
#endif | #endif | ||||
//============================================================================== | //============================================================================== | ||||
#if JUCE_USE_INTRINSICS | |||||
#if JUCE_USE_MSVC_INTRINSICS | |||||
// CPU info functions using intrinsics... | // CPU info functions using intrinsics... | ||||
@@ -313,7 +313,7 @@ double Time::getMillisecondCounterHiRes() noexcept { return hiResCounterHa | |||||
//============================================================================== | //============================================================================== | ||||
static int64 juce_getClockCycleCounter() noexcept | static int64 juce_getClockCycleCounter() noexcept | ||||
{ | { | ||||
#if JUCE_USE_INTRINSICS | |||||
#if JUCE_USE_MSVC_INTRINSICS | |||||
// MS intrinsics version... | // MS intrinsics version... | ||||
return (int64) __rdtsc(); | return (int64) __rdtsc(); | ||||
@@ -36,7 +36,7 @@ void* getUser32Function (const char* functionName) | |||||
} | } | ||||
//============================================================================== | //============================================================================== | ||||
#if ! JUCE_USE_INTRINSICS | |||||
#if ! JUCE_USE_MSVC_INTRINSICS | |||||
// In newer compilers, the inline versions of these are used (in juce_Atomic.h), but in | // In newer compilers, the inline versions of these are used (in juce_Atomic.h), but in | ||||
// older ones we have to actually call the ops as win32 functions.. | // older ones we have to actually call the ops as win32 functions.. | ||||
long juce_InterlockedExchange (volatile long* a, long b) noexcept { return InterlockedExchange (a, b); } | long juce_InterlockedExchange (volatile long* a, long b) noexcept { return InterlockedExchange (a, b); } | ||||
@@ -68,7 +68,7 @@ | |||||
@see jassert() | @see jassert() | ||||
*/ | */ | ||||
#define juce_breakDebugger { ::kill (0, SIGTRAP); } | #define juce_breakDebugger { ::kill (0, SIGTRAP); } | ||||
#elif JUCE_USE_INTRINSICS | |||||
#elif JUCE_USE_MSVC_INTRINSICS | |||||
#ifndef __INTEL_COMPILER | #ifndef __INTEL_COMPILER | ||||
#pragma intrinsic (__debugbreak) | #pragma intrinsic (__debugbreak) | ||||
#endif | #endif | ||||
@@ -73,7 +73,7 @@ | |||||
#include <vector> | #include <vector> | ||||
#include <algorithm> | #include <algorithm> | ||||
#if JUCE_USE_INTRINSICS | |||||
#if JUCE_USE_MSVC_INTRINSICS | |||||
#include <intrin.h> | #include <intrin.h> | ||||
#endif | #endif | ||||
@@ -192,7 +192,7 @@ | |||||
#endif | #endif | ||||
#if JUCE_64BIT || ! JUCE_VC7_OR_EARLIER | #if JUCE_64BIT || ! JUCE_VC7_OR_EARLIER | ||||
#define JUCE_USE_INTRINSICS 1 | |||||
#define JUCE_USE_MSVC_INTRINSICS 1 | |||||
#endif | #endif | ||||
#else | #else | ||||
#error unknown compiler | #error unknown compiler | ||||