summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-11-09 22:19:07 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-11-09 22:19:07 +0000
commit92c38a728e93bf36a4dc5313d634d0627a84dc9e (patch)
tree732dc4eb2ebc5cba8b0e52f46de4c33644a7c1b2 /apps
parenta434a0de5cb7dfc9d8a96bd282142c5b65e329f6 (diff)
downloadrockbox-92c38a728e93bf36a4dc5313d634d0627a84dc9e.tar.gz
rockbox-92c38a728e93bf36a4dc5313d634d0627a84dc9e.tar.bz2
rockbox-92c38a728e93bf36a4dc5313d634d0627a84dc9e.zip
Roll back r28488 as it slows down mpc by 2% on S5L8701.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28545 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/libmusepack/synth_filter_arm.S27
1 files changed, 17 insertions, 10 deletions
diff --git a/apps/codecs/libmusepack/synth_filter_arm.S b/apps/codecs/libmusepack/synth_filter_arm.S
index 9bd4e04626..598f218e45 100644
--- a/apps/codecs/libmusepack/synth_filter_arm.S
+++ b/apps/codecs/libmusepack/synth_filter_arm.S
@@ -164,7 +164,7 @@ mpc_decoder_windowing_D:
* r10 = lo, r11 = hi of 31..17
* r12 = V[31..16]
*****************************************/
- mov lr, #15*8
+ mov lr, #15
add r12, r1, #30*4 /* r12 = V[31] */
.loop15:
ldmia r2!, { r3-r6 } /* load D[00..03] */
@@ -238,19 +238,21 @@ mpc_decoder_windowing_D:
/* store Data[01..15] */
mov r8, r8, lsr #16
orr r8, r8, r9, lsl #16 /* (lo>>16) || (hi<<16) */
+ str r8, [r0] /* store Data */
/* store Data[31..17] */
+ add r0, r0, lr, asl #3 /* r0 = r0 + 2*lr [words] */
mov r10, r10, lsr #16
orr r10, r10, r11, lsl #16 /* (lo>>16) || (hi<<16) */
rsb r10, r10, #0 /* r10 = -r10 */
- str r10, [r0, lr] /* store Data */
- str r8, [r0], #4 /* store Data */
+ str r10, [r0], #4 /* store Data */
+ sub r0, r0, lr, asl #3 /* r0 = r0 - 2*lr [words] */
/* correct adresses for next loop */
sub r12, r12, #4 /* r12 = V-- */
add r1, r1, #4 /* r1 = V++ */
/* next loop */
- subs lr, lr, #8
+ subs lr, lr, #1
bgt .loop15
-
+
/******************************************
* V[16] with internal symmetry
*****************************************/
@@ -291,6 +293,7 @@ mpc_decoder_windowing_D:
mov r8, r8, lsr #16
orr r8, r8, r9, lsl #16 /* (lo>>16) || (hi<<16) */
str r8, [r0], #4 /* store Data */
+ add r1, r1, #4 /* V++ */
ldmpc regs=r4-r11
#elif ARM_ARCH < 6 /* arm9 and above */
@@ -362,7 +365,7 @@ mpc_decoder_windowing_D:
* r10 = lo, r11 = hi of 31..17
* r12 = V[31..16]
*****************************************/
- mov lr, #15*8
+ mov lr, #15
add r12, r1, #30*4 /* r12 = V[31] */
.loop15:
ldmia r2!, { r3-r4 } /* load D[00..01] */
@@ -440,17 +443,19 @@ mpc_decoder_windowing_D:
/* store Data[01..15] */
mov r8, r8, lsr #16
orr r8, r8, r9, lsl #16 /* (lo>>16) || (hi<<16) */
+ str r8, [r0] /* store Data */
/* store Data[31..17] */
+ add r0, r0, lr, asl #3 /* r0 = r0 + 2*lr [words] */
mov r10, r10, lsr #16
orr r10, r10, r11, lsl #16 /* (lo>>16) || (hi<<16) */
rsb r10, r10, #0 /* r10 = -r10 */
- str r10, [r0, lr] /* store Data */
- str r8, [r0], #4 /* store Data */
+ str r10, [r0], #4 /* store Data */
+ sub r0, r0, lr, asl #3 /* r0 = r0 - 2*lr [words] */
/* correct adresses for next loop */
sub r12, r12, #4 /* r12 = V-- */
add r1, r1, #4 /* r1 = V++ */
/* next loop */
- subs lr, lr, #8
+ subs lr, lr, #1
bgt .loop15
/******************************************
@@ -493,6 +498,7 @@ mpc_decoder_windowing_D:
mov r8, r8, lsr #16
orr r8, r8, r9, lsl #16 /* (lo>>16) || (hi<<16) */
str r8, [r0], #4 /* store Data */
+ add r1, r1, #4 /* V++ */
ldmpc regs=r4-r11
#else
@@ -639,10 +645,11 @@ mpc_decoder_windowing_D:
rsb r11, r11, #0 /* r11 = -r11 */
/* store Data[01..15] */
mov r9, r9, lsl #2
+ str r9, [r0] /* store Data */
/* store Data[31..17] */
mov r11, r11, lsl #2
str r11, [r0, lr] /* store Data */
- str r9, [r0], #4 /* store Data */
+ add r0, r0, #4 /* r0++ */
/* next loop */
subs lr, lr, #8
bgt .loop15