devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

SPC Codec: Restore correct FIR buffer alignment when an address mask is used. It must be FIR_BUF_ALIGN. Fix Coldfire assembly constraint where an input parameter was also being written.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30063 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-06-24 10:52:43 +00:00
parent 4b0e09c1ac
commit fcae888e81
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/codecs/libspc/spc_dsp.c
View file

@ -28,7 +28,8 @@
#include "spc_profiler.h" #include "spc_profiler.h"
#if defined(CPU_COLDFIRE) || defined (CPU_ARM) #if defined(CPU_COLDFIRE) || defined (CPU_ARM)
int32_t fir_buf[FIR_BUF_CNT] IBSS_ATTR_SPC MEM_ALIGN_ATTR; int32_t fir_buf[FIR_BUF_CNT] IBSS_ATTR_SPC
__attribute__((aligned(FIR_BUF_ALIGN*1)));
#endif #endif
#if SPC_BRRCACHE #if SPC_BRRCACHE
/* a little extra for samples that go past end */ /* a little extra for samples that go past end */
@ -1276,6 +1277,8 @@ void DSP_run_( struct Spc_Dsp* this, long count, int32_t* out_buf )
/* Feedback into echo buffer */ /* Feedback into echo buffer */
if ( !(this->r.g.flags & 0x20) ) if ( !(this->r.g.flags & 0x20) )
{ {
int sh = 1 << 9;
asm volatile ( asm volatile (
/* scale echo voices; saturate if overflow */ /* scale echo voices; saturate if overflow */
"mac.l %[sh], %[e1] , %%acc1 \r\n" "mac.l %[sh], %[e1] , %%acc1 \r\n"
@ -1298,11 +1301,10 @@ void DSP_run_( struct Spc_Dsp* this, long count, int32_t* out_buf )
"or.l %[sh], %[e0] \r\n" "or.l %[sh], %[e0] \r\n"
/* save final feedback into echo buffer */ /* save final feedback into echo buffer */
"move.l %[e0], (%[echo_ptr]) \r\n" "move.l %[e0], (%[echo_ptr]) \r\n"
: [e0]"+d"(echo_0), [e1]"+d"(echo_1) : [e0]"+d"(echo_0), [e1]"+d"(echo_1), [sh]"+d"(sh)
: [out_0]"r"(out_0), [out_1]"r"(out_1), : [out_0]"r"(out_0), [out_1]"r"(out_1),
[ef]"r"((int)this->r.g.echo_feedback), [ef]"r"((int)this->r.g.echo_feedback),
[echo_ptr]"a"((int32_t *)echo_ptr), [echo_ptr]"a"((int32_t *)echo_ptr)
[sh]"d"(1 << 9)
); );
} }