len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-16 00:22:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

codeclib/libtremor: Clean up duplication of inline funcs, constify the ones in codeclib and copy over the slightly faster MULT31_SHIFT15 from tremor for cf.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30578 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2011-09-21 15:38:54 +00:00
parent ccaf55a8ae
commit 151424a6fd
9 changed files with 85 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/codecs/lib/asm_arm.h
View file

@ -166,7 +166,7 @@ static inline void XNPROD31(int32_t a, int32_t b,
/* asm versions of vector operations for block.c, window.c */
static inline
void vect_add(int32_t *x, int32_t *y, int n)
void vect_add(int32_t *x, const int32_t *y, int n)
{
while (n>=4) {
asm volatile ("ldmia %[x], {r0, r1, r2, r3};"
@ -190,7 +190,7 @@ void vect_add(int32_t *x, int32_t *y, int n)
}
static inline
void vect_copy(int32_t *x, int32_t *y, int n)
void vect_copy(int32_t *x, const int32_t *y, int n)
{
while (n>=4) {
asm volatile ("ldmia %[y]!, {r0, r1, r2, r3};"
@ -208,7 +208,7 @@ void vect_copy(int32_t *x, int32_t *y, int n)
}
static inline
void vect_mult_fw(int32_t *data, int32_t *window, int n)
void vect_mult_fw(int32_t *data, const int32_t *window, int n)
{
while (n>=4) {
asm volatile ("ldmia %[d], {r0, r1, r2, r3};"
@ -237,7 +237,7 @@ void vect_mult_fw(int32_t *data, int32_t *window, int n)
}
static inline
void vect_mult_bw(int32_t *data, int32_t *window, int n)
void vect_mult_bw(int32_t *data, const int32_t *window, int n)
{
while (n>=4) {
asm volatile ("ldmia %[d], {r0, r1, r2, r3};"

12
apps/codecs/lib/asm_mcf5249.h
View file

@ -44,17 +44,17 @@ static inline int32_t MULT31(int32_t x, int32_t y) {
}
#define INCL_OPTIMIZED_MULT31_SHIFT15
/* NOTE: this requires that the emac is *NOT* rounding */
static inline int32_t MULT31_SHIFT15(int32_t x, int32_t y) {
int32_t r;
asm volatile ("mac.l %[x], %[y], %%acc0;" /* multiply */
"mulu.l %[y], %[x];" /* get lower half, avoid emac stall */
"movclr.l %%acc0, %[r];" /* get higher half */
"asl.l #8, %[r];" /* hi<<16, plus one free */
"asl.l #8, %[r];"
"swap %[r];" /* hi<<16, plus one free */
"lsr.l #8, %[x];" /* (unsigned)lo >> 15 */
"lsr.l #7, %[x];"
"or.l %[x], %[r];" /* logical-or results */
"move.w %[x], %[r];" /* logical-or results */
: [r] "=&d" (r), [x] "+d" (x)
: [y] "d" (y)
: "cc");
@ -202,7 +202,7 @@ void vect_add(int32_t *x, const int32_t *y, int n)
}
static inline
void vect_copy(int32_t *x, int32_t *y, int n)
void vect_copy(int32_t *x, const int32_t *y, int n)
{
/* align to 16 bytes */
while(n>0 && (int)x&15) {
@ -228,7 +228,7 @@ void vect_copy(int32_t *x, int32_t *y, int n)
}
static inline
void vect_mult_fw(int32_t *data, int32_t *window, int n)
void vect_mult_fw(int32_t *data, const int32_t *window, int n)
{
/* ensure data is aligned to 16-bytes */
while(n>0 && (int)data&15) {
@ -282,7 +282,7 @@ void vect_mult_fw(int32_t *data, int32_t *window, int n)
}
static inline
void vect_mult_bw(int32_t *data, int32_t *window, int n)
void vect_mult_bw(int32_t *data, const int32_t *window, int n)
{
/* ensure at least data is aligned to 16-bytes */
while(n>0 && (int)data&15) {

8
apps/codecs/lib/codeclib_misc.h
View file

@ -187,7 +187,7 @@ static inline void XNPROD31(int32_t a, int32_t b,
#define _V_VECT_OPS
static inline
void vect_add(int32_t *x, int32_t *y, int n)
void vect_add(int32_t *x, const int32_t *y, int n)
{
while (n>0) {
*x++ += *y++;
@ -196,7 +196,7 @@ void vect_add(int32_t *x, int32_t *y, int n)
}
static inline
void vect_copy(int32_t *x, int32_t *y, int n)
void vect_copy(int32_t *x, const int32_t *y, int n)
{
while (n>0) {
*x++ = *y++;
@ -205,7 +205,7 @@ void vect_copy(int32_t *x, int32_t *y, int n)
}
static inline
void vect_mult_fw(int32_t *data, int32_t *window, int n)
void vect_mult_fw(int32_t *data, const int32_t *window, int n)
{
while(n>0) {
*data = MULT31(*data, *window);
@ -216,7 +216,7 @@ void vect_mult_fw(int32_t *data, int32_t *window, int n)
}
static inline
void vect_mult_bw(int32_t *data, int32_t *window, int n)
void vect_mult_bw(int32_t *data, const int32_t *window, int n)
{
while(n>0) {
*data = MULT31(*data, *window);