[SCM] libav/experimental: PPC: 32-bit asm for MAC64 and MLS64

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 014b7ecb6643332af35251c751aebd04bac4bb1e
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon May 11 02:41:50 2009 +0000

    PPC: 32-bit asm for MAC64 and MLS64
    
    GCC makes a mess of these operations, so give it a hand.
    
    55% faster MP3 decoding on G4.
    
    Originally committed as revision 18794 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h
index 2b5a5c4..a74fcfa 100644
--- a/libavcodec/ppc/mathops.h
+++ b/libavcodec/ppc/mathops.h
@@ -44,4 +44,34 @@ static inline av_const int MULH(int a, int b){
     return r;
 }
 
+#if !HAVE_PPC64
+static inline av_const int64_t MAC64(int64_t d, int a, int b)
+{
+    union { uint64_t x; unsigned hl[2]; } x = { d };
+    int h, l;
+    __asm__ ("mullw %3, %4, %5   \n\t"
+             "mulhw %2, %4, %5   \n\t"
+             "addc  %1, %1, %3   \n\t"
+             "adde  %0, %0, %2   \n\t"
+             : "+r"(x.hl[0]), "+r"(x.hl[1]), "=&r"(h), "=&r"(l)
+             : "r"(a), "r"(b));
+    return x.x;
+}
+#define MAC64(d, a, b) ((d) = MAC64(d, a, b))
+
+static inline av_const int64_t MLS64(int64_t d, int a, int b)
+{
+    union { uint64_t x; unsigned hl[2]; } x = { d };
+    int h, l;
+    __asm__ ("mullw %3, %4, %5   \n\t"
+             "mulhw %2, %4, %5   \n\t"
+             "subfc %1, %3, %1   \n\t"
+             "subfe %0, %2, %0   \n\t"
+             : "+r"(x.hl[0]), "+r"(x.hl[1]), "=&r"(h), "=&r"(l)
+             : "r"(a), "r"(b));
+    return x.x;
+}
+#define MLS64(d, a, b) ((d) = MLS64(d, a, b))
+#endif
+
 #endif /* AVCODEC_PPC_MATHOPS_H */

-- 
Libav/FFmpeg packaging