summaryrefslogtreecommitdiffstats
path: root/libFDK/include/mips/fixmul_mips.h
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-15 13:47:13 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-15 13:47:14 -0700
commitee36153b8ca239749174996f44bd07737aeace53 (patch)
tree172a38dc17105a0ffaa1372637d61d3eab013e17 /libFDK/include/mips/fixmul_mips.h
parenta00bd4cf64ff9f95739ef89d0be806e8efdecb52 (diff)
parent50d9a4cb1ec671f8ca1da5ad4262fb6e77a924fd (diff)
downloadfdk-aac-ee36153b8ca239749174996f44bd07737aeace53.tar.gz
fdk-aac-ee36153b8ca239749174996f44bd07737aeace53.tar.bz2
fdk-aac-ee36153b8ca239749174996f44bd07737aeace53.zip
Merge "GCC 4.4 and later cannot handle h constructs. Fix to replace the assembly constructs."
Diffstat (limited to 'libFDK/include/mips/fixmul_mips.h')
-rw-r--r--libFDK/include/mips/fixmul_mips.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/libFDK/include/mips/fixmul_mips.h b/libFDK/include/mips/fixmul_mips.h
index 4fb72f7..0e7af0d 100644
--- a/libFDK/include/mips/fixmul_mips.h
+++ b/libFDK/include/mips/fixmul_mips.h
@@ -100,14 +100,8 @@ amm-info@iis.fraunhofer.de
inline INT fixmuldiv2_DD (const INT a, const INT b)
{
- INT result ;
- asm ("mult %1,%2;\n"
- : "=hi" (result)
- : "d" (a), "r" (b)
- : "lo");
-
- return result ;
+ return ((long long) a * b) >> 32;
}
#endif /* (__GNUC__) && defined(__mips__) */