Move FASTDIV macro to intmath.h

Originally committed as revision 21335 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/intmath.h b/libavutil/arm/intmath.h
similarity index 51%
copy from libavutil/intmath.h
copy to libavutil/arm/intmath.h
index 39e14c2..21aef2a 100644 (file)
--- a/libavutil/intmath.h
+++ b/libavutil/arm/intmath.h
@@ -18,24 +18,37 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_INTMATH_H
-#define AVUTIL_INTMATH_H
+#ifndef AVUTIL_ARM_INTMATH_H
+#define AVUTIL_ARM_INTMATH_H
 
 #include "config.h"
-#include "common.h"
-
-#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
-
-#ifndef av_log2
-
-#define av_log2(x) (31 - __builtin_clz((x)|1))
-
-#ifndef av_log2_16bit
-#define av_log2_16bit av_log2
+#include "libavutil/common.h"
+
+#if HAVE_INLINE_ASM
+
+#if HAVE_ARMV6
+static inline av_const int FASTDIV(int a, int b)
+{
+    int r, t;
+    __asm__ volatile("cmp     %3, #2               \n\t"
+                     "ldr     %1, [%4, %3, lsl #2] \n\t"
+                     "lsrle   %0, %2, #1           \n\t"
+                     "smmulgt %0, %1, %2           \n\t"
+                     : "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse));
+    return r;
+}
+#else
+static inline av_const int FASTDIV(int a, int b)
+{
+    int r, t;
+    __asm__ volatile("umull %1, %0, %2, %3"
+                     : "=&r"(r), "=&r"(t) : "r"(a), "r"(ff_inverse[b]));
+    return r;
+}
 #endif
 
-#endif /* av_log2 */
+#define FASTDIV FASTDIV
 
-#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
+#endif /* HAVE_INLINE_ASM */
 
-#endif /* AVUTIL_INTMATH_H */
+#endif /* AVUTIL_ARM_INTMATH_H */

diff --git a/libavutil/internal.h b/libavutil/internal.h
index 1d21ae4..ac7f152 100644 (file)
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -120,44 +120,6 @@
 
 /* math */
 
-extern const uint32_t ff_inverse[257];
-
-#if ARCH_X86
-#    define FASTDIV(a,b) \
-    ({\
-        int ret, dmy;\
-        __asm__ volatile(\
-            "mull %3"\
-            :"=d"(ret), "=a"(dmy)\
-            :"1"(a), "g"(ff_inverse[b])\
-            );\
-        ret;\
-    })
-#elif HAVE_ARMV6 && HAVE_INLINE_ASM
-static inline av_const int FASTDIV(int a, int b)
-{
-    int r, t;
-    __asm__ volatile("cmp     %3, #2               \n\t"
-                     "ldr     %1, [%4, %3, lsl #2] \n\t"
-                     "lsrle   %0, %2, #1           \n\t"
-                     "smmulgt %0, %1, %2           \n\t"
-                     : "=&r"(r), "=&r"(t) : "r"(a), "r"(b), "r"(ff_inverse));
-    return r;
-}
-#elif ARCH_ARM && HAVE_INLINE_ASM
-static inline av_const int FASTDIV(int a, int b)
-{
-    int r, t;
-    __asm__ volatile("umull %1, %0, %2, %3"
-                     : "=&r"(r), "=&r"(t) : "r"(a), "r"(ff_inverse[b]));
-    return r;
-}
-#elif CONFIG_FASTDIV
-#    define FASTDIV(a,b)   ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
-#else
-#    define FASTDIV(a,b)   ((a) / (b))
-#endif
-
 extern const uint8_t ff_sqrt_tab[256];
 
 static inline av_const unsigned int ff_sqrt(unsigned int a)

diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index 39e14c2..7aff78c 100644 (file)
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -24,6 +24,14 @@
 #include "config.h"
 #include "common.h"
 
+extern const uint32_t ff_inverse[257];
+
+#if   ARCH_ARM
+#   include "arm/intmath.h"
+#elif ARCH_X86
+#   include "x86/intmath.h"
+#endif
+
 #if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
 
 #ifndef av_log2
@@ -38,4 +46,14 @@
 
 #endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
 
+#ifndef FASTDIV
+
+#if CONFIG_FASTDIV
+#    define FASTDIV(a,b)   ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
+#else
+#    define FASTDIV(a,b)   ((a) / (b))
+#endif
+
+#endif /* FASTDIV */
+
 #endif /* AVUTIL_INTMATH_H */

diff --git a/libavutil/intmath.h b/libavutil/x86/intmath.h
similarity index 69%
copy from libavutil/intmath.h
copy to libavutil/x86/intmath.h
index 39e14c2..7528c55 100644 (file)
--- a/libavutil/intmath.h
+++ b/libavutil/x86/intmath.h
@@ -18,24 +18,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_INTMATH_H
-#define AVUTIL_INTMATH_H
-
-#include "config.h"
-#include "common.h"
-
-#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
-
-#ifndef av_log2
-
-#define av_log2(x) (31 - __builtin_clz((x)|1))
-
-#ifndef av_log2_16bit
-#define av_log2_16bit av_log2
-#endif
-
-#endif /* av_log2 */
-
-#endif /* AV_GCC_VERSION_AT_LEAST(3,4) */
-
-#endif /* AVUTIL_INTMATH_H */
+#ifndef AVUTIL_X86_INTMATH_H
+#define AVUTIL_X86_INTMATH_H
+
+#include "libavutil/common.h"
+
+#define FASTDIV(a,b) \
+    ({\
+        int ret, dmy;\
+        __asm__ volatile(\
+            "mull %3"\
+            :"=d"(ret), "=a"(dmy)\
+            :"1"(a), "g"(ff_inverse[b])\
+            );\
+        ret;\
+    })
+
+#endif /* AVUTIL_X86_INTMATH_H */