changeset 8115:e61cc20bad68 libavcodec

ARM: change MUL16() macro to inline function
author mru
date Thu, 06 Nov 2008 01:33:28 +0000
parents 1231a7ddd932
children 2d01559f824c
files armv4l/mathops.h
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/armv4l/mathops.h	Thu Nov 06 01:33:26 2008 +0000
+++ b/armv4l/mathops.h	Thu Nov 06 01:33:28 2008 +0000
@@ -82,10 +82,13 @@
     __asm__ ("smlabb %0, %1, %2, %0" : "+r"(rt) : "r"(ra), "r"(rb));
 
 /* signed 16x16 -> 32 multiply */
-#   define MUL16(ra, rb)                                                \
-        ({ int rt;                                                    \
-         __asm__ ("smulbb %0, %1, %2" : "=r" (rt) : "r" (ra), "r" (rb));  \
-         rt; })
+#   define MUL16 MUL16
+static inline av_const MUL16(int ra, int rb)
+{
+    int rt;
+    __asm__ ("smulbb %0, %1, %2" : "=r"(rt) : "r"(ra), "r"(rb));
+    return rt;
+}
 
 #endif