x86: lpc: fix a segfault in av_evaluate_lls_sse2()

[ffmpeg] / libavutil / intmath.h

diff --git a/libavutil/intmath.h b/libavutil/intmath.h
index 3325975556fa9dee83686dc1ffb2e58b317a901c..a5ee6525ee31436586970b924191795a7630ae18 100644 (file)
--- a/libavutil/intmath.h
+++ b/libavutil/intmath.h
@@ -22,58 +22,125 @@
 #define AVUTIL_INTMATH_H
 
 #include <stdint.h>
+
 #include "config.h"
 #include "attributes.h"
 
-extern const uint32_t ff_inverse[257];
-
-#if   ARCH_ARM
+#if ARCH_ARM
 #   include "arm/intmath.h"
-#elif ARCH_X86
-#   include "x86/intmath.h"
 #endif
 
+/**
+ * @addtogroup lavu_internal
+ * @{
+ */
+
 #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
+#ifndef ff_log2
+#   define ff_log2(x) (31 - __builtin_clz((x)|1))
+#   ifndef ff_log2_16bit
+#      define ff_log2_16bit av_log2
 #   endif
-#endif /* av_log2 */
+#endif /* ff_log2 */
 
 #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 */
+extern const uint8_t ff_log2_tab[256];
 
-#include "common.h"
+#ifndef ff_log2
+#define ff_log2 ff_log2_c
+static av_always_inline av_const int ff_log2_c(unsigned int v)
+{
+    int n = 0;
+    if (v & 0xffff0000) {
+        v >>= 16;
+        n += 16;
+    }
+    if (v & 0xff00) {
+        v >>= 8;
+        n += 8;
+    }
+    n += ff_log2_tab[v];
 
-extern const uint8_t ff_sqrt_tab[256];
+    return n;
+}
+#endif
 
-static inline av_const unsigned int ff_sqrt(unsigned int a)
+#ifndef ff_log2_16bit
+#define ff_log2_16bit ff_log2_16bit_c
+static av_always_inline av_const int ff_log2_16bit_c(unsigned int v)
 {
-    unsigned int b;
+    int n = 0;
+    if (v & 0xff00) {
+        v >>= 8;
+        n += 8;
+    }
+    n += ff_log2_tab[v];
 
-    if (a < 255) return (ff_sqrt_tab[a + 1] - 1) >> 4;
-    else if (a < (1 << 12)) b = ff_sqrt_tab[a >> 4] >> 2;
-#if !CONFIG_SMALL
-    else if (a < (1 << 14)) b = ff_sqrt_tab[a >> 6] >> 1;
-    else if (a < (1 << 16)) b = ff_sqrt_tab[a >> 8]   ;
+    return n;
+}
 #endif
-    else {
-        int s = av_log2_16bit(a >> 16) >> 1;
-        unsigned int c = a >> (s + 2);
-        b = ff_sqrt_tab[c >> (s + 8)];
-        b = FASTDIV(c,b) + (b << s);
+
+#define av_log2       ff_log2
+#define av_log2_16bit ff_log2_16bit
+
+/**
+ * @}
+ */
+
+/**
+ * @addtogroup lavu_math
+ * @{
+ */
+
+#if HAVE_FAST_CLZ && AV_GCC_VERSION_AT_LEAST(3,4)
+#ifndef ff_ctz
+#define ff_ctz(v) __builtin_ctz(v)
+#endif
+#endif
+
+#ifndef ff_ctz
+#define ff_ctz ff_ctz_c
+static av_always_inline av_const int ff_ctz_c(int v)
+{
+    int c;
+
+    if (v & 0x1)
+        return 0;
+
+    c = 1;
+    if (!(v & 0xffff)) {
+        v >>= 16;
+        c += 16;
     }
+    if (!(v & 0xff)) {
+        v >>= 8;
+        c += 8;
+    }
+    if (!(v & 0xf)) {
+        v >>= 4;
+        c += 4;
+    }
+    if (!(v & 0x3)) {
+        v >>= 2;
+        c += 2;
+    }
+    c -= v & 0x1;
 
-    return b - (a < b * b);
+    return c;
 }
+#endif
 
+/**
+ * Trailing zero bit count.
+ *
+ * @param v  input value. If v is 0, the result is undefined.
+ * @return   the number of trailing 0-bits
+ */
+int av_ctz(int v);
+
+/**
+ * @}
+ */
 #endif /* AVUTIL_INTMATH_H */