generic-library/fdk-aac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'aosp/master'

Browse Source
This commit is contained in:
Martin Storsjo 2012-09-05 11:32:25 +03:00
commit 50b1de17ac
4 changed files with 5 additions and 36 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)
{
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)
: "lo");
result = (((long long)a_Re * b_Re) - ((long long) a_Im * b_Im)) >> 32;
*c_Re = result;
__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");
result = (((long long)a_Re * b_Im) - ((long long) a_Im * b_Re)) >> 32;
*c_Im = result;
}
#endif
@ -135,18 +124,9 @@ inline void cplxMult( FIXP_DBL *c_Re,
FIXP_DBL b_Im)
{
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)
: "lo");
result = (((long long)a_Re * b_Re) - ((long long) a_Im * b_Im)) >> 32;
*c_Re = result<<1;
__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");
result = (((long long)a_Re * b_Im) - ((long long) a_Im * b_Re)) >> 32;
*c_Im = result<<1;
}
#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)
{
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__) */

2
libSYS/include/genericStds.h
View File

@ -96,8 +96,6 @@ amm-info@iis.fraunhofer.de
#include "machine_type.h"
/* Work around for broken android toolchain: sys/types.h:137: error: 'uint64_t' does not name a type */
#define _SYS_TYPES_H_
/* Always increase verbosity of memory allocation in case of a debug built. DEBUG is defined globally in that case. */

3
libSYS/src/cmdl_parser.cpp
View File

@ -92,9 +92,6 @@ amm-info@iis.fraunhofer.de
#define _CRT_SECURE_NO_WARNINGS
/* Work around for broken android toolchain: sys/types.h:137: error: 'uint64_t' does not name a type */
#define _SYS_TYPES_H_
#include <stdarg.h>
#include <stdio.h>
#include <string.h>