summaryrefslogtreecommitdiffstats
path: root/libFDK/include/mips
diff options
context:
space:
mode:
Diffstat (limited to 'libFDK/include/mips')
-rw-r--r--libFDK/include/mips/cplx_mul.h21
-rw-r--r--libFDK/include/mips/fixmul_mips.h9
2 files changed, 17 insertions, 13 deletions
diff --git a/libFDK/include/mips/cplx_mul.h b/libFDK/include/mips/cplx_mul.h
index e0781dd..fb777ce 100644
--- a/libFDK/include/mips/cplx_mul.h
+++ b/libFDK/include/mips/cplx_mul.h
@@ -107,19 +107,21 @@ inline void cplxMultDiv2( FIXP_DBL *c_Re,
FIXP_DBL b_Re,
FIXP_DBL b_Im)
{
- INT result;
+ INT result;
__asm__ ("mult %[a_Re], %[b_Re];\n"
"msub %[a_Im], %[b_Im];\n"
- : "=hi"(result)
- : [a_Re]"r"(a_Re), [b_Re]"r"(b_Re), [a_Im]"r"(a_Im), [b_Im]"r"(b_Im)
+ "mfhi %[result];\n"
+ : [result]"=r"(result)
+ : [a_Re]"d"(a_Re), [b_Re]"d"(b_Re), [a_Im]"d"(a_Im), [b_Im]"d"(b_Im)
: "lo");
*c_Re = result;
__asm__ ("mult %[a_Re], %[b_Im];\n"
"madd %[a_Im], %[b_Re];\n"
- : "=hi"(result)
+ "mfhi %[result];\n"
+ : [result]"=r"(result)
: [a_Re]"r"(a_Re), [b_Im]"r"(b_Im), [a_Im]"r"(a_Im), [b_Re]"r"(b_Re)
: "lo");
*c_Im = result;
@@ -134,17 +136,22 @@ inline void cplxMult( FIXP_DBL *c_Re,
FIXP_DBL b_Re,
FIXP_DBL b_Im)
{
- INT result;
+ INT result;
+
__asm__ ("mult %[a_Re], %[b_Re];\n"
"msub %[a_Im], %[b_Im];\n"
- : "=hi"(result)
+ "mfhi %[result];\n"
+ //"extr_w %[result], 31;\n"
+ : [result]"=r"(result)
: [a_Re]"r"(a_Re), [b_Re]"r"(b_Re), [a_Im]"r"(a_Im), [b_Im]"r"(b_Im)
: "lo");
*c_Re = result<<1;
__asm__ ("mult %[a_Re], %[b_Im];\n"
"madd %[a_Im], %[b_Re];\n"
- : "=hi"(result)
+ "mfhi %[result];\n"
+ //"extr_w %[result], 31;\n"
+ : [result]"=r"(result)
: [a_Re]"r"(a_Re), [b_Im]"r"(b_Im), [a_Im]"r"(a_Im), [b_Re]"r"(b_Re)
: "lo");
*c_Im = result<<1;
diff --git a/libFDK/include/mips/fixmul_mips.h b/libFDK/include/mips/fixmul_mips.h
index 4fb72f7..62d059e 100644
--- a/libFDK/include/mips/fixmul_mips.h
+++ b/libFDK/include/mips/fixmul_mips.h
@@ -101,12 +101,7 @@ 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");
-
+ result = ((long long)a * b)>>32;
return result ;
}
@@ -114,3 +109,5 @@ inline INT fixmuldiv2_DD (const INT a, const INT b)
#endif /* __mips__ */
+#define FUNCTION_fixmulBitExact_DD
+#define fixmulBitExact_DD fixmul_DD