1 files changed, 41 insertions, 41 deletions

diff --git a/apps/codecs/libtremor/asm_arm.h b/apps/codecs/libtremor/asm_arm.h
index 577dc91566..8da7ed75cc 100644
--- a/apps/codecs/libtremor/asm_arm.h
+++ b/apps/codecs/libtremor/asm_arm.h
@@ -34,55 +34,55 @@ static inline ogg_int32_t MULT31(ogg_int32_t x, ogg_int32_t y) {
 
 static inline ogg_int32_t MULT31_SHIFT15(ogg_int32_t x, ogg_int32_t y) {
   int lo,hi;
-  asm volatile("smull   %0, %1, %2, %3\n\t"
-               "movs    %0, %0, lsr #15\n\t"
-               "adc     %1, %0, %1, lsl #17\n\t"
+  asm volatile("smull   %0, %1, %2, %3\n\t"
+           "movs    %0, %0, lsr #15\n\t"
+           "adc %1, %0, %1, lsl #17\n\t"
                : "=&r"(lo),"=&r"(hi)
                : "%r"(x),"r"(y)
-               : "cc");
+           : "cc");
   return(hi);
 }
 
 #define XPROD32(a, b, t, v, x, y) \
 { \
   long l; \
-  asm(  "smull  %0, %1, %4, %6\n\t" \
-        "rsb    %3, %4, #0\n\t" \
-        "smlal  %0, %1, %5, %7\n\t" \
-        "smull  %0, %2, %5, %6\n\t" \
-        "smlal  %0, %2, %3, %7" \
-        : "=&r" (l), "=&r" (x), "=&r" (y), "=r" ((a)) \
-        : "3" ((a)), "r" ((b)), "r" ((t)), "r" ((v)) ); \
+  asm(  "smull  %0, %1, %4, %6\n\t" \
+    "rsb    %3, %4, #0\n\t" \
+    "smlal  %0, %1, %5, %7\n\t" \
+    "smull  %0, %2, %5, %6\n\t" \
+    "smlal  %0, %2, %3, %7" \
+    : "=&r" (l), "=&r" (x), "=&r" (y), "=r" ((a)) \
+    : "3" ((a)), "r" ((b)), "r" ((t)), "r" ((v)) ); \
 }
 
 static inline void XPROD31(ogg_int32_t  a, ogg_int32_t  b,
-                           ogg_int32_t  t, ogg_int32_t  v,
-                           ogg_int32_t *x, ogg_int32_t *y)
+               ogg_int32_t  t, ogg_int32_t  v,
+               ogg_int32_t *x, ogg_int32_t *y)
 {
   int x1, y1, l;
-  asm(  "smull  %0, %1, %4, %6\n\t"
-        "rsb    %3, %4, #0\n\t"
-        "smlal  %0, %1, %5, %7\n\t"
-        "smull  %0, %2, %5, %6\n\t"
-        "smlal  %0, %2, %3, %7"
-        : "=&r" (l), "=&r" (x1), "=&r" (y1), "=r" (a)
-        : "3" (a), "r" (b), "r" (t), "r" (v) );
+  asm(  "smull  %0, %1, %4, %6\n\t"
+    "rsb    %3, %4, #0\n\t"
+    "smlal  %0, %1, %5, %7\n\t"
+    "smull  %0, %2, %5, %6\n\t"
+    "smlal  %0, %2, %3, %7"
+    : "=&r" (l), "=&r" (x1), "=&r" (y1), "=r" (a)
+    : "3" (a), "r" (b), "r" (t), "r" (v) );
   *x = x1 << 1;
   *y = y1 << 1;
 }
 
 static inline void XNPROD31(ogg_int32_t  a, ogg_int32_t  b,
-                            ogg_int32_t  t, ogg_int32_t  v,
-                            ogg_int32_t *x, ogg_int32_t *y)
+                ogg_int32_t  t, ogg_int32_t  v,
+                ogg_int32_t *x, ogg_int32_t *y)
 {
   int x1, y1, l;
-  asm(  "smull  %0, %1, %3, %5\n\t"
-        "rsb    %2, %4, #0\n\t"
-        "smlal  %0, %1, %2, %6\n\t"
-        "smull  %0, %2, %4, %5\n\t"
-        "smlal  %0, %2, %3, %6"
-        : "=&r" (l), "=&r" (x1), "=&r" (y1)
-        : "r" (a), "r" (b), "r" (t), "r" (v) );
+  asm(  "smull  %0, %1, %3, %5\n\t"
+    "rsb    %2, %4, #0\n\t"
+    "smlal  %0, %1, %2, %6\n\t"
+    "smull  %0, %2, %4, %5\n\t"
+    "smlal  %0, %2, %3, %6"
+    : "=&r" (l), "=&r" (x1), "=&r" (y1)
+    : "r" (a), "r" (b), "r" (t), "r" (v) );
   *x = x1 << 1;
   *y = y1 << 1;
 }
@@ -216,14 +216,14 @@ static inline void vect_copy(ogg_int32_t *x, const ogg_int32_t *y, int n)
 
 static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) {
   int tmp;
-  asm volatile("subs    %1, %0, #32768\n\t"
-               "movpl   %0, #0x7f00\n\t"
-               "orrpl   %0, %0, #0xff\n"
-               "adds    %1, %0, #32768\n\t"
-               "movmi   %0, #0x8000"
-               : "+r"(x),"=r"(tmp)
-               :
-               : "cc");
+  asm volatile("subs    %1, %0, #32768\n\t"
+           "movpl   %0, #0x7f00\n\t"
+           "orrpl   %0, %0, #0xff\n"
+           "adds    %1, %0, #32768\n\t"
+           "movmi   %0, #0x8000"
+           : "+r"(x),"=r"(tmp)
+           :
+           : "cc");
   return(x);
 }
 
@@ -233,9 +233,9 @@ static inline ogg_int32_t CLIP_TO_15(ogg_int32_t x) {
 #define _V_LSP_MATH_ASM
 
 static inline void lsp_loop_asm(ogg_uint32_t *qip,ogg_uint32_t *pip,
-                                ogg_int32_t *qexpp,
-                                ogg_int32_t *ilsp,ogg_int32_t wi,
-                                ogg_int32_t m){
+                ogg_int32_t *qexpp,
+                ogg_int32_t *ilsp,ogg_int32_t wi,
+                ogg_int32_t m){
   
   ogg_uint32_t qi=*qip,pi=*pip;
   ogg_int32_t qexp=*qexpp;
@@ -291,7 +291,7 @@ static inline void lsp_loop_asm(ogg_uint32_t *qip,ogg_uint32_t *pip,
       //qexp+=shift;
       
       //}
-         
+     
       /* normalize to max 16 sig figs */
       "2:"
       "mov     r2,#0;"