From 9ab57e510e5ff64c5ce3d6bf47d7bf1ff8261e01 Mon Sep 17 00:00:00 2001 From: Andree Buschmann Date: Sat, 29 May 2010 14:56:25 +0000 Subject: Small changes to asm for better readability. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26375 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libatrac/fixp_math.h | 39 +++++++++++++----------- apps/codecs/libmusepack/mpcdec_math.h | 56 +++++++++++++++++------------------ 2 files changed, 49 insertions(+), 46 deletions(-) (limited to 'apps/codecs') diff --git a/apps/codecs/libatrac/fixp_math.h b/apps/codecs/libatrac/fixp_math.h index ac53310cd2..8d2e0783b8 100644 --- a/apps/codecs/libatrac/fixp_math.h +++ b/apps/codecs/libatrac/fixp_math.h @@ -31,30 +31,33 @@ /* Fixed point math routines for use in atrac3.c */ #if defined(CPU_ARM) + /* Calculates: result = (X*Y)>>16 */ #define fixmul16(X,Y) \ ({ \ - int32_t low; \ - int32_t high; \ - asm volatile ( /* calculates: result = (X*Y)>>16 */ \ - "smull %0,%1,%2,%3 \n\t" /* 64 = 32x32 multiply */ \ - "mov %0, %0, lsr #16 \n\t" /* %0 = %0 >> 16 */ \ - "orr %0, %0, %1, lsl #16 \n\t"/* result = %0 OR (%1 << 16) */ \ - : "=&r"(low), "=&r" (high) \ - : "r"(X),"r"(Y)); \ - low; \ + int32_t lo; \ + int32_t hi; \ + asm volatile ( \ + "smull %[lo], %[hi], %[x], %[y] \n\t" /* multiply */ \ + "mov %[lo], %[lo], lsr #16 \n\t" /* lo >>= 16 */ \ + "orr %[lo], %[lo], %[hi], lsl #16" /* lo |= (hi << 16) */ \ + : [lo]"=&r"(lo), [hi]"=&r"(hi) \ + : [x]"r"(X), [y]"r"(Y)); \ + lo; \ }) + /* Calculates: result = (X*Y)>>31 */ + /* Use scratch register r12 */ #define fixmul31(X,Y) \ ({ \ - int32_t low; \ - int32_t high; \ - asm volatile ( /* calculates: result = (X*Y)>>31 */ \ - "smull %0,%1,%2,%3 \n\t" /* 64 = 32x32 multiply */ \ - "mov %0, %0, lsr #31 \n\t" /* %0 = %0 >> 31 */ \ - "orr %0, %0, %1, lsl #1 \n\t" /* result = %0 OR (%1 << 1) */ \ - : "=&r"(low), "=&r" (high) \ - : "r"(X),"r"(Y)); \ - low; \ + int32_t lo; \ + int32_t hi; \ + asm volatile ( \ + "smull %[lo], %[hi], %[x], %[y] \n\t" /* multiply */ \ + "mov %[lo], %[lo], lsr #31 \n\t" /* lo >>= 31 */ \ + "orr %[lo], %[lo], %[hi], lsl #1" /* lo |= (hi << 1) */ \ + : [lo]"=&r"(lo), [hi]"=&r"(hi) \ + : [x]"r"(X), [y]"r"(Y)); \ + lo; \ }) #elif defined(CPU_COLDFIRE) #define fixmul16(X,Y) \ diff --git a/apps/codecs/libmusepack/mpcdec_math.h b/apps/codecs/libmusepack/mpcdec_math.h index 55295dba32..bb79a52e6f 100644 --- a/apps/codecs/libmusepack/mpcdec_math.h +++ b/apps/codecs/libmusepack/mpcdec_math.h @@ -115,32 +115,32 @@ return t1; } #elif defined(CPU_ARM) - // borrowed and adapted from libMAD + /* Calculate: result = (X*Y)>>14 */ #define MPC_MULTIPLY(X,Y) \ ({ \ - MPC_SAMPLE_FORMAT low; \ - MPC_SAMPLE_FORMAT high; \ - asm volatile ( /* will calculate: result = (X*Y)>>14 */ \ - "smull %0,%1,%2,%3 \n\t" /* multiply with result %0 [0..31], %1 [32..63] */ \ - "mov %0, %0, lsr #14 \n\t" /* %0 = %0 >> 14 */ \ - "orr %0, %0, %1, lsl #18 \n\t"/* result = %0 OR (%1 << 18) */ \ - : "=&r"(low), "=&r" (high) \ - : "r"(X),"r"(Y)); \ - low; \ + MPC_SAMPLE_FORMAT lo; \ + MPC_SAMPLE_FORMAT hi; \ + asm volatile ( \ + "smull %[lo], %[hi], %[x], %[y] \n\t" /* multiply */ \ + "mov %[lo], %[lo], lsr #14 \n\t" /* lo >>= 14 */ \ + "orr %[lo], %[lo], %[hi], lsl #18" /* lo |= (hi << 18) */ \ + : [lo]"=&r"(lo), [hi]"=&r"(hi) \ + : [x]"r"(X), [y]"r"(Y)); \ + lo; \ }) - // borrowed and adapted from libMAD + /* Calculate: result = (X*Y)>>Z */ #define MPC_MULTIPLY_EX(X,Y,Z) \ ({ \ - MPC_SAMPLE_FORMAT low; \ - MPC_SAMPLE_FORMAT high; \ - asm volatile ( /* will calculate: result = (X*Y)>>Z */ \ - "smull %0,%1,%2,%3 \n\t" /* multiply with result %0 [0..31], %1 [32..63] */ \ - "mov %0, %0, lsr %4 \n\t" /* %0 = %0 >> Z */ \ - "orr %0, %0, %1, lsl %5 \n\t" /* result = %0 OR (%1 << (32-Z)) */ \ - : "=&r"(low), "=&r" (high) \ - : "r"(X),"r"(Y),"r"(Z),"r"(32-Z)); \ - low; \ + MPC_SAMPLE_FORMAT lo; \ + MPC_SAMPLE_FORMAT hi; \ + asm volatile ( \ + "smull %[lo], %[hi], %[x], %[y] \n\t" /* multiply */ \ + "mov %[lo], %[lo], lsr %[shr] \n\t" /* lo >>= Z */ \ + "orr %[lo], %[lo], %[hi], lsl %[shl]" /* lo |= (hi << (32-Z)) */ \ + : [lo]"=&r"(lo), [hi]"=&r"(hi) \ + : [x]"r"(X), [y]"r"(Y), [shr]"r"(Z), [shl]"r"(32-Z)); \ + lo; \ }) #else /* libmusepack standard */ @@ -188,16 +188,16 @@ t; \ }) #elif defined(CPU_ARM) - // borrowed and adapted from libMAD + /* Calculate: result = (X*Y)>>32, without need for >>32 */ #define MPC_MULTIPLY_FRACT(X,Y) \ ({ \ - MPC_SAMPLE_FORMAT low; \ - MPC_SAMPLE_FORMAT high; \ - asm volatile ( /* will calculate: result = (X*Y)>>32 */ \ - "smull %0,%1,%2,%3 \n\t" /* multiply with result %0 [0..31], %1 [32..63] */ \ - : "=&r"(low), "=&r" (high) /* result = %1 [32..63], saves the >>32 */ \ - : "r"(X),"r"(Y)); \ - high; \ + MPC_SAMPLE_FORMAT lo; \ + MPC_SAMPLE_FORMAT hi; \ + asm volatile ( \ + "smull %[lo], %[hi], %[x], %[y]" /* hi = result */ \ + : [lo]"=&r"(lo), [hi]"=&r"(hi) \ + : [x]"r"(X), [y]"r"(Y)); \ + hi; \ }) #else #define MPC_MULTIPLY_FRACT(X,Y) MPC_MULTIPLY_EX(X,Y,32) -- cgit v1.2.3