shithub: opus

Info  •  Files  •  Log  •  Branches

Move OPUS_FAST_INT64 definition to celt/arch.h.

Signed-off-by: Timothy B. Terriberry <[email protected]>

--- a/celt/arch.h

+++ b/celt/arch.h

@@ -78,6 +78,15 @@

 #define UADD32(a,b) ((a)+(b))

 #define USUB32(a,b) ((a)-(b))

+/* Set this if opus_int64 is a native type of the CPU. */

+/* Assume that all LP64 architectures have fast 64-bit types; also x86_64

+   (which can be ILP32 for x32) and Win64 (which is LLP64). */

+#if defined(__x86_64__) || defined(__LP64__) || defined(_WIN64)

+#define OPUS_FAST_INT64 1

+#else

+#define OPUS_FAST_INT64 0

+#endif

+

 #define PRINT_MIPS(file)

 #ifdef FIXED_POINT

--- a/silk/macros.h

+++ b/silk/macros.h

@@ -34,6 +34,7 @@

 #include "opus_types.h"

 #include "opus_defines.h"

+#include "arch.h"

 #if OPUS_GNUC_PREREQ(3, 0)

 #define opus_likely(x)       (__builtin_expect(!!(x), 1))

@@ -41,13 +42,6 @@

 #else

 #define opus_likely(x)       (!!(x))

 #define opus_unlikely(x)     (!!(x))

-#endif

-

-/* Set this if opus_int64 is a native type of the CPU. */

-#if defined(__x86_64__) || defined(__LP64__) || defined(_WIN64)

-#define OPUS_FAST_INT64 1

-#else

-#define OPUS_FAST_INT64 0

 #endif

 /* This is an OPUS_INLINE header file for general platform. */