fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GCC 4.4 and later cannot handle h constructs. Fix to replace the assembly constructs. 

Change-Id: I47509c20ee32f04ce42105563d2d4013910da531
This commit is contained in:
Raghu Gandham 2012-07-10 17:34:45 -07:00
parent d2854e2ac7
commit 50d9a4cb1e
2 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libFDK/include/mips/cplx_mul.h
View File

@ -108,20 +108,9 @@ inline void cplxMultDiv2( FIXP_DBL *c_Re,
FIXP_DBL b_Im) FIXP_DBL b_Im)
{ {
INT result; INT result;
result = (((long long)a_Re * b_Re) - ((long long) a_Im * b_Im)) >> 32;
__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)
: "lo");
*c_Re = result; *c_Re = result;
result = (((long long)a_Re * b_Im) - ((long long) a_Im * b_Re)) >> 32;
__asm__ ("mult %[a_Re], %[b_Im];\n"
"madd %[a_Im], %[b_Re];\n"
: "=hi"(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; *c_Im = result;
} }
#endif #endif
@ -135,18 +124,9 @@ inline void cplxMult( FIXP_DBL *c_Re,
FIXP_DBL b_Im) FIXP_DBL b_Im)
{ {
INT result; INT result;
__asm__ ("mult %[a_Re], %[b_Re];\n" result = (((long long)a_Re * b_Re) - ((long long) a_Im * b_Im)) >> 32;
"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)
: "lo");
*c_Re = result<<1; *c_Re = result<<1;
result = (((long long)a_Re * b_Im) - ((long long) a_Im * b_Re)) >> 32;
__asm__ ("mult %[a_Re], %[b_Im];\n"
"madd %[a_Im], %[b_Re];\n"
: "=hi"(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; *c_Im = result<<1;
} }
#endif #endif

8
libFDK/include/mips/fixmul_mips.h
View File

@ -100,14 +100,8 @@ amm-info@iis.fraunhofer.de
inline INT fixmuldiv2_DD (const INT a, const INT b) inline INT fixmuldiv2_DD (const INT a, const INT b)
{ {
INT result ;
asm ("mult %1,%2;\n" return ((long long) a * b) >> 32;
: "=hi" (result)
: "d" (a), "r" (b)
: "lo");
return result ;
} }
#endif /* (__GNUC__) && defined(__mips__) */ #endif /* (__GNUC__) && defined(__mips__) */