1
0
Fork 0
forked from len0rd/rockbox

Slight whitespace cleanup, add a const qualifier. No functional changes

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22087 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2009-07-30 13:52:11 +00:00
parent f95dc688cf
commit 65140a2cd5

View file

@ -19,8 +19,6 @@
****************************************************************************/ ****************************************************************************/
/* asm routines for wide math on the MCF5249 */ /* asm routines for wide math on the MCF5249 */
//#include "os_types.h"
#if defined(CPU_COLDFIRE) #if defined(CPU_COLDFIRE)
/* attribute for 16-byte alignment */ /* attribute for 16-byte alignment */
@ -43,7 +41,6 @@ static inline int32_t MULT32(int32_t x, int32_t y) {
} }
static inline int32_t MULT31(int32_t x, int32_t y) { static inline int32_t MULT31(int32_t x, int32_t y) {
asm volatile ("mac.l %[x], %[y], %%acc0;" /* multiply */ asm volatile ("mac.l %[x], %[y], %%acc0;" /* multiply */
"movclr.l %%acc0, %[x];" /* move and clear */ "movclr.l %%acc0, %[x];" /* move and clear */
: [x] "+&r" (x) : [x] "+&r" (x)
@ -52,7 +49,6 @@ static inline int32_t MULT31(int32_t x, int32_t y) {
return x; return x;
} }
static inline int32_t MULT31_SHIFT15(int32_t x, int32_t y) { static inline int32_t MULT31_SHIFT15(int32_t x, int32_t y) {
int32_t r; int32_t r;
@ -70,7 +66,6 @@ static inline int32_t MULT31_SHIFT15(int32_t x, int32_t y) {
return r; return r;
} }
static inline static inline
void XPROD31(int32_t a, int32_t b, void XPROD31(int32_t a, int32_t b,
int32_t t, int32_t v, int32_t t, int32_t v,
@ -90,7 +85,6 @@ void XPROD31(int32_t a, int32_t b,
: "cc", "memory"); : "cc", "memory");
} }
static inline static inline
void XNPROD31(int32_t a, int32_t b, void XNPROD31(int32_t a, int32_t b,
int32_t t, int32_t v, int32_t t, int32_t v,
@ -110,7 +104,6 @@ void XNPROD31(int32_t a, int32_t b,
: "cc", "memory"); : "cc", "memory");
} }
#if 0 /* canonical Tremor definition */ #if 0 /* canonical Tremor definition */
#define XPROD32(_a, _b, _t, _v, _x, _y) \ #define XPROD32(_a, _b, _t, _v, _x, _y) \
{ (_x)=MULT32(_a,_t)+MULT32(_b,_v); \ { (_x)=MULT32(_a,_t)+MULT32(_b,_v); \
@ -140,7 +133,7 @@ void XNPROD31(int32_t a, int32_t b,
/* asm versions of vector operations for block.c, window.c */ /* asm versions of vector operations for block.c, window.c */
/* assumes MAC is initialized & accumulators cleared */ /* assumes MAC is initialized & accumulators cleared */
static inline 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)
{ {
/* align to 16 bytes */ /* align to 16 bytes */
while(n>0 && (int)x&15) { while(n>0 && (int)x&15) {
@ -199,7 +192,6 @@ void vect_copy(int32_t *x, int32_t *y, int n)
} }
} }
static inline static inline
void vect_mult_fw(int32_t *data, int32_t *window, int n) void vect_mult_fw(int32_t *data, int32_t *window, int n)
{ {
@ -325,3 +317,4 @@ static inline int32_t CLIP_TO_15(register int32_t x) {
#else #else
#define LINE_ATTR #define LINE_ATTR
#endif #endif