summaryrefslogtreecommitdiff
path: root/apps/codecs/libmad/synth.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/codecs/libmad/synth.c')
-rw-r--r--apps/codecs/libmad/synth.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/codecs/libmad/synth.c b/apps/codecs/libmad/synth.c
index c3a868a0dc..00e00ad5ff 100644
--- a/apps/codecs/libmad/synth.c
+++ b/apps/codecs/libmad/synth.c
@@ -584,7 +584,7 @@ void synth_full(struct mad_synth *, struct mad_frame const *,
584 */ 584 */
585 585
586/* optimised version of synth_full */ 586/* optimised version of synth_full */
587# ifdef FPM_COLDFIRE_EMAC 587# ifdef FPM_COLDFIRE_EMAC
588static 588static
589void synth_full(struct mad_synth *synth, struct mad_frame const *frame, 589void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
590 unsigned int nch, unsigned int ns) 590 unsigned int nch, unsigned int ns)
@@ -630,7 +630,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
630 "msac.l %%d5, %%a5, 20(%2), %%a5, %%acc0\n\t" 630 "msac.l %%d5, %%a5, 20(%2), %%a5, %%acc0\n\t"
631 "msac.l %%d6, %%a5, 12(%2), %%a5, %%acc0\n\t" 631 "msac.l %%d6, %%a5, 12(%2), %%a5, %%acc0\n\t"
632 "msac.l %%d7, %%a5, (%2), %%a5, %%acc0\n\t" 632 "msac.l %%d7, %%a5, (%2), %%a5, %%acc0\n\t"
633 633
634 "movem.l (%3), %%d0-%%d7\n\t" 634 "movem.l (%3), %%d0-%%d7\n\t"
635 "mac.l %%d0, %%a5, 56(%2), %%a5, %%acc0\n\t" 635 "mac.l %%d0, %%a5, 56(%2), %%a5, %%acc0\n\t"
636 "mac.l %%d1, %%a5, 48(%2), %%a5, %%acc0\n\t" 636 "mac.l %%d1, %%a5, 48(%2), %%a5, %%acc0\n\t"
@@ -713,7 +713,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
713 "mac.l %%d6, %%a5, 12(%2), %%a5, %%acc0\n\t" 713 "mac.l %%d6, %%a5, 12(%2), %%a5, %%acc0\n\t"
714 "mac.l %%d7, %%a5, %%acc0\n\t" 714 "mac.l %%d7, %%a5, %%acc0\n\t"
715 "movclr.l %%acc0, %0\n\t" 715 "movclr.l %%acc0, %0\n\t"
716 : "=r" (hi0) : "a" (*fo), "a" (*D0ptr) 716 : "=r" (hi0) : "a" (*fo), "a" (*D0ptr)
717 : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "a5"); 717 : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "a5");
718 718
719 pcm[0] = -(hi0 << 3); 719 pcm[0] = -(hi0 << 3);
@@ -731,7 +731,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
731 "msac.l %%d5, %%a5, 16(%2), %%a5, %%acc0\n\t" 731 "msac.l %%d5, %%a5, 16(%2), %%a5, %%acc0\n\t"
732 "msac.l %%d6, %%a5, 8(%2), %%a5, %%acc0\n\t" 732 "msac.l %%d6, %%a5, 8(%2), %%a5, %%acc0\n\t"
733 "msac.l %%d7, %%a5, 4(%2), %%a5, %%acc0\n\t" 733 "msac.l %%d7, %%a5, 4(%2), %%a5, %%acc0\n\t"
734 734
735 "movem.l (%3), %%d0-%%d7\n\t" 735 "movem.l (%3), %%d0-%%d7\n\t"
736 "mac.l %%d0, %%a5, 60(%2), %%a5, %%acc0\n\t" 736 "mac.l %%d0, %%a5, 60(%2), %%a5, %%acc0\n\t"
737 "mac.l %%d1, %%a5, 52(%2), %%a5, %%acc0\n\t" 737 "mac.l %%d1, %%a5, 52(%2), %%a5, %%acc0\n\t"
@@ -814,7 +814,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
814 "mac.l %%d6, %%a5, 8(%2), %%a5, %%acc0\n\t" 814 "mac.l %%d6, %%a5, 8(%2), %%a5, %%acc0\n\t"
815 "mac.l %%d7, %%a5, %%acc0\n\t" 815 "mac.l %%d7, %%a5, %%acc0\n\t"
816 "movclr.l %%acc0, %0\n\t" 816 "movclr.l %%acc0, %0\n\t"
817 : "=r" (hi0) : "a" (*fo), "a" (*D0ptr) 817 : "=r" (hi0) : "a" (*fo), "a" (*D0ptr)
818 : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "a5"); 818 : "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "a5");
819 819
820 pcm[0] = -(hi0 << 3); 820 pcm[0] = -(hi0 << 3);
@@ -1044,7 +1044,7 @@ void synth_full2(mad_fixed_t *pcm, mad_fixed_t (*fo)[8], mad_fixed_t (*fe)[8],
1044 1044
1045/* This performs slower in IRAM on PP502x and there is no space in 1045/* This performs slower in IRAM on PP502x and there is no space in
1046 mpegplayer on the PP5002 */ 1046 mpegplayer on the PP5002 */
1047#if !defined(CPU_PP502x) && !(CONFIG_CPU == PP5002 && defined(MPEGPLAYER)) 1047#if !defined(CPU_PP502x) && !(CONFIG_CPU == PP5002 && defined(MPEGPLAYER)) && !defined(TOSHIBA_GIGABEAT_F)
1048static 1048static
1049void synth_full(struct mad_synth *synth, struct mad_frame const *frame, 1049void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
1050 unsigned int nch, unsigned int ns) ICODE_ATTR; 1050 unsigned int nch, unsigned int ns) ICODE_ATTR;
@@ -1117,7 +1117,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
1117 D1ptr += 15; 1117 D1ptr += 15;
1118 fo += 15; 1118 fo += 15;
1119 fe += 15; 1119 fe += 15;
1120 1120
1121 ptr = *(D0ptr + 1); 1121 ptr = *(D0ptr + 1);
1122 PROD_ODD_0(hi, lo, *fo, ptr); 1122 PROD_ODD_0(hi, lo, *fo, ptr);
1123/* 1123/*
@@ -1166,7 +1166,7 @@ void synth_full(struct mad_synth *synth, struct mad_frame const *frame,
1166 D1ptr += 15; 1166 D1ptr += 15;
1167 fo += 15; 1167 fo += 15;
1168 fe += 15; 1168 fe += 15;
1169 1169
1170 ptr = *(D0ptr + 1); 1170 ptr = *(D0ptr + 1);
1171/* 1171/*
1172 ML0(hi, lo, (*fo)[0], ptr[ 0]); 1172 ML0(hi, lo, (*fo)[0], ptr[ 0]);