Index: apps/codecs/libmad/synth.c =================================================================== --- apps/codecs/libmad/synth.c (revision 25771) +++ apps/codecs/libmad/synth.c (working copy) @@ -833,25 +833,25 @@ mad_fixed_t *__p = (f); \ asm("ldmia %2!, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #4]\n\t" \ + "ldr r5, [%3, #60]\n\t" \ "smull %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #60]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #52]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #44]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #44]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ "ldmia %2, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #36]\n\t" \ + "ldr r5, [%3, #28]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #28]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #20]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #12]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #12]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ : "=&r" (lo), "=&r" (hi), "+r" (__p) \ : "r" (ptr) \ - : "r0", "r1", "r2", "r3", "r4"); \ + : "r0", "r1", "r2", "r3", "r4", "r5"); \ } while (0) #define PROD_ODD_A(hi, lo, f, ptr) \ @@ -859,25 +859,25 @@ mad_fixed_t *__p = (f); \ asm("ldmia %2!, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #4]\n\t" \ + "ldr r5, [%3, #60]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #60]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #52]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #44]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #44]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ "ldmia %2, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #36]\n\t" \ + "ldr r5, [%3, #28]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #28]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #20]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #12]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #12]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ : "+r" (lo), "+r" (hi), "+r" (__p) \ : "r" (ptr) \ - : "r0", "r1", "r2", "r3", "r4"); \ + : "r0", "r1", "r2", "r3", "r4", "r5"); \ } while (0) #define PROD_EVEN_0(hi, lo, f, ptr) \ @@ -885,25 +885,25 @@ mad_fixed_t *__p = (f); \ asm("ldmia %2!, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #0]\n\t" \ + "ldr r5, [%3, #56]\n\t" \ "smull %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #56]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #48]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #40]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #40]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ "ldmia %2, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #32]\n\t" \ + "ldr r5, [%3, #24]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #24]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #16]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #8]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #8]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ : "=&r" (lo), "=&r" (hi), "+r" (__p) \ : "r" (ptr) \ - : "r0", "r1", "r2", "r3", "r4"); \ + : "r0", "r1", "r2", "r3", "r4", "r5"); \ } while (0) #define PROD_EVEN_A(hi, lo, f, ptr) \ @@ -911,25 +911,25 @@ mad_fixed_t *__p = (f); \ asm("ldmia %2!, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #0]\n\t" \ + "ldr r5, [%3, #56]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #56]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #48]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #40]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #40]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ "ldmia %2, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #32]\n\t" \ + "ldr r5, [%3, #24]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #24]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #16]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #8]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #8]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ : "+r" (lo), "+r" (hi), "+r" (__p) \ : "r" (ptr) \ - : "r0", "r1", "r2", "r3", "r4"); \ + : "r0", "r1", "r2", "r3", "r4", "r5"); \ } while (0) #define PROD_EVENBACK_0(hi, lo, f, ptr) \ @@ -937,25 +937,25 @@ mad_fixed_t *__p = (f); \ asm("ldmia %2!, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #60]\n\t" \ + "ldr r5, [%3, #68]\n\t" \ "smull %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #68]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #76]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #84]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #84]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ "ldmia %2, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #92]\n\t" \ + "ldr r5, [%3, #100]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #100]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #108]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #116]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #116]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ : "=&r" (lo), "=&r" (hi), "+r" (__p) \ : "r" (ptr) \ - : "r0", "r1", "r2", "r3", "r4"); \ + : "r0", "r1", "r2", "r3", "r4", "r5"); \ } while (0) #define PROD_EVENBACK_A(hi, lo, f, ptr) \ @@ -963,25 +963,25 @@ mad_fixed_t *__p = (f); \ asm("ldmia %2!, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #60]\n\t" \ + "ldr r5, [%3, #68]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #68]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #76]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #84]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #84]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ "ldmia %2, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #92]\n\t" \ + "ldr r5, [%3, #100]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #100]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #108]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #116]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #116]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ : "+r" (lo), "+r" (hi), "+r" (__p) \ : "r" (ptr) \ - : "r0", "r1", "r2", "r3", "r4"); \ + : "r0", "r1", "r2", "r3", "r4", "r5"); \ } while (0) #define PROD_ODDBACK_0(hi, lo, f, ptr) \ @@ -989,25 +989,25 @@ mad_fixed_t *__p = (f); \ asm("ldmia %2!, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #120]\n\t" \ + "ldr r5, [%3, #64]\n\t" \ "smull %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #64]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #72]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #80]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #80]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ "ldmia %2, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #88]\n\t" \ + "ldr r5, [%3, #96]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #96]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #104]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #112]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #112]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ : "=&r" (lo), "=&r" (hi), "+r" (__p) \ : "r" (ptr) \ - : "r0", "r1", "r2", "r3", "r4"); \ + : "r0", "r1", "r2", "r3", "r4", "r5"); \ } while (0) #define PROD_ODDBACK_A(hi, lo, f, ptr) \ @@ -1015,25 +1015,25 @@ mad_fixed_t *__p = (f); \ asm("ldmia %2!, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #120]\n\t" \ + "ldr r5, [%3, #64]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #64]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #72]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #80]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #80]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ "ldmia %2, {r0, r1, r2, r3}\n\t" \ "ldr r4, [%3, #88]\n\t" \ + "ldr r5, [%3, #96]\n\t" \ "smlal %0, %1, r0, r4\n\t" \ - "ldr r4, [%3, #96]\n\t" \ - "smlal %0, %1, r1, r4\n\t" \ "ldr r4, [%3, #104]\n\t" \ + "smlal %0, %1, r1, r5\n\t" \ + "ldr r5, [%3, #112]\n\t" \ "smlal %0, %1, r2, r4\n\t" \ - "ldr r4, [%3, #112]\n\t" \ - "smlal %0, %1, r3, r4\n\t" \ + "smlal %0, %1, r3, r5\n\t" \ : "+r" (lo), "+r" (hi), "+r" (__p) \ : "r" (ptr) \ - : "r0", "r1", "r2", "r3", "r4"); \ + : "r0", "r1", "r2", "r3", "r4", "r5"); \ } while (0) void synth_full1(mad_fixed_t *pcm, mad_fixed_t (*fo)[8], mad_fixed_t (*fe)[8],