[xiph-commits] r10796 - trunk/speex/libspeex
jm at svn.xiph.org
jm at svn.xiph.org
Sat Feb 11 02:06:45 PST 2006
Author: jm
Date: 2006-02-11 02:06:41 -0800 (Sat, 11 Feb 2006)
New Revision: 10796
Modified:
trunk/speex/libspeex/filters_bfin.h
trunk/speex/libspeex/lpc_bfin.h
trunk/speex/libspeex/ltp_bfin.h
Log:
Think I fixed some Blackfin assembly syntax issues. It does compile, but
haven't been able to test it yet.
Modified: trunk/speex/libspeex/filters_bfin.h
===================================================================
--- trunk/speex/libspeex/filters_bfin.h 2006-02-11 03:22:41 UTC (rev 10795)
+++ trunk/speex/libspeex/filters_bfin.h 2006-02-11 10:06:41 UTC (rev 10796)
@@ -143,7 +143,7 @@
"R4 = [I0++] || R5 = [I2--];\n\t"
"LOOP filter_start_inner%= LC1;\n\t"
"LOOP_BEGIN filter_start_inner%=;\n\t"
- "A0 += R4.L*R5.L (IS), A1 -= R4.H*R5.H (IS) || R4 = [I0++] || R5 = [I2--];\n\t"
+ "A1 -= R4.H*R5.H, A0 += R4.L*R5.L (IS) || R4 = [I0++] || R5 = [I2--];\n\t"
"LOOP_END filter_start_inner%=;\n\t"
"A0 += A1;\n\t"
"R4 = A0;\n\t"
@@ -175,13 +175,13 @@
"R0 += 8;\n\t"
"I2 = P2;\n\t"
"M0 = R0;\n\t"
- "A0 = A1 = 0;\n\t"
+ "A1 = A0 = 0;\n\t"
"R5 = [I2--];\n\t"
"LOOP filter_mid%= LC0;\n\t"
"LOOP_BEGIN filter_mid%=;\n\t"
"LOOP filter_mid_inner%= LC1=P3;\n\t"
"LOOP_BEGIN filter_mid_inner%=;\n\t"
- "A0 += R4.L*R5.L (IS), A1 -= R4.H*R5.H (IS) || R4 = [I0++] || R5 = [I2--];\n\t"
+ "A1 -= R4.H*R5.H, A0 += R4.L*R5.L (IS) || R4 = [I0++] || R5 = [I2--];\n\t"
"LOOP_END filter_mid_inner%=;\n\t"
"R0 = (A0 += A1) || I2 += M0;\n\t"
"R0 = R0 << 1 || R5 = [P0++];\n\t"
@@ -189,7 +189,7 @@
"R0 = R0 << 2 || [P1++] = R0;\n\t"
"R5 = R5 << 2;\n\t"
"R5 = PACK(R0.H, R5.H);\n\t"
- "A0 = A1 = 0 || [I2--] = R5\n\t"
+ "A1 = A0 = 0 || [I2--] = R5\n\t"
"LOOP_END filter_mid%=;\n\t"
"I2 += 4;\n\t"
"P2 = I2;\n\t"
@@ -198,7 +198,7 @@
"R0 = %5;\n\t"
"LC0 = R0;\n\t"
"P0 = B0;\n\t"
- "A0 = A1 = 0;\n\t"
+ "A1 = A0 = 0;\n\t"
"LOOP mem_update%= LC0;\n\t"
"LOOP_BEGIN mem_update%=;\n\t"
"I2 = P2;\n\t"
@@ -209,10 +209,10 @@
"R5 = [I2--] || R4 = [I0++];\n\t"
"LOOP mem_accum%= LC1;\n\t"
"LOOP_BEGIN mem_accum%=;\n\t"
- "A0 += R4.L*R5.L (IS), A1 -= R4.H*R5.H (IS) || R4 = [I0++] || R5 = [I2--];\n\t"
+ "A1 -= R4.H*R5.H, A0 += R4.L*R5.L (IS) || R4 = [I0++] || R5 = [I2--];\n\t"
"LOOP_END mem_accum%=;\n\t"
"R0 = (A0 += A1);\n\t"
- "A0 = A1 = 0 || [P4++] = R0;\n\t"
+ "A1 = A0 = 0 || [P4++] = R0;\n\t"
"LOOP_END mem_update%=;\n\t"
"L0 = 0;\n\t"
: : "m" (xy), "m" (_x), "m" (_y), "m" (numden), "m" (N), "m" (ord), "m" (mem)
@@ -400,7 +400,7 @@
"I3 = %3;\n\t"
"%0 += 2;\n\t"
"%1 += 2;\n\t"
- "A0 = A1 = 0;\n\t"
+ "A1 = A0 = 0;\n\t"
"R0.L = W[I0--] || R1.L = W[I2++];\n\t"
"LC1 = R2;\n\t"
"LOOP filter%= LC1;\n\t"
Modified: trunk/speex/libspeex/lpc_bfin.h
===================================================================
--- trunk/speex/libspeex/lpc_bfin.h 2006-02-11 03:22:41 UTC (rev 10795)
+++ trunk/speex/libspeex/lpc_bfin.h 2006-02-11 10:06:41 UTC (rev 10796)
@@ -95,8 +95,8 @@
"R1 = [I1++];\n\t"
"LOOP inner_prod%= LC1 = P3 >> 1;\n\t"
"LOOP_BEGIN inner_prod%=;\n\t"
- "A0 += R0.L*R1.L , A1 += R0.L*R1.H (is) || R1.L = W[I1++];\n\t"
- "A0 += R0.H*R1.H , A1 += R0.H*R1.L (is) || R1.H = W[I1++] || R0 = [I0++];\n\t"
+ "A1 += R0.L*R1.H, A0 += R0.L*R1.L (IS) || R1.L = W[I1++];\n\t"
+ "A1 += R0.H*R1.L, A0 += R0.H*R1.H (IS) || R1.H = W[I1++] || R0 = [I0++];\n\t"
"LOOP_END inner_prod%=;\n\t"
"A0 = ASHIFT A0 by R4.L;\n\t"
"A1 = ASHIFT A1 by R4.L;\n\t"
Modified: trunk/speex/libspeex/ltp_bfin.h
===================================================================
--- trunk/speex/libspeex/ltp_bfin.h 2006-02-11 03:22:41 UTC (rev 10795)
+++ trunk/speex/libspeex/ltp_bfin.h 2006-02-11 10:06:41 UTC (rev 10796)
@@ -90,11 +90,11 @@
"R1 = [I1++];\n\t"
"LOOP inner_prod%= LC1 = P3 >> 1;\n\t"
"LOOP_BEGIN inner_prod%=;\n\t"
- "A0 += R0.L*R1.L , A1 += R0.L*R1.H (is) || R1.L = W[I1++];\n\t"
- "A0 += R0.H*R1.H , A1 += R0.H*R1.L (is) || R1.H = W[I1++] || R0 = [I0++];\n\t"
+ "A1 += R0.L*R1.H, A0 += R0.L*R1.L (IS) || R1.L = W[I1++];\n\t"
+ "A1 += R0.H*R1.L, A0 += R0.H*R1.H (IS) || R1.H = W[I1++] || R0 = [I0++];\n\t"
"LOOP_END inner_prod%=;\n\t"
- "A0 += R0.L*R1.L , A1 += R0.L*R1.H (is) || R1.L = W[I1++];\n\t"
- "A0 += R0.H*R1.H , A1 += R0.H*R1.L (is) || R0 = [I0++];\n\t"
+ "A1 += R0.L*R1.H, A0 += R0.L*R1.L (IS) || R1.L = W[I1++];\n\t"
+ "A1 += R0.H*R1.L, A0 += R0.H*R1.H (IS) || R0 = [I0++];\n\t"
"A0 = A0 >>> 6;\n\t"
"A1 = A1 >>> 6;\n\t"
"R2 = A0, R3 = A1;\n\t"
@@ -114,44 +114,44 @@
spx_word32_t sum;
__asm__ __volatile__
(
- "A0 = A1 = 0;\n\t"
+ "A1 = A0 = 0;\n\t"
"R0 = [%1++];\n\t"
"R1.L = %2.L*%5.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 += R1.L*R0.H (IS), A1 += R1.L*R0.L (M,IS) || R0 = [%1++];\n\t"
+ "A1 += R1.L*R0.L (M), A0 += R1.L*R0.H (IS) || R0 = [%1++];\n\t"
"R1.L = %3.L*%5.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 += R1.L*R0.H (IS), A1 += R1.L*R0.L (M,IS) || R0 = [%1++];\n\t"
+ "A1 += R1.L*R0.L (M), A0 += R1.L*R0.H (IS) || R0 = [%1++];\n\t"
"R1.L = %4.L*%5.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 += R1.L*R0.H (IS), A1 += R1.L*R0.L (M,IS) || R0 = [%1++];\n\t"
+ "A1 += R1.L*R0.L (M), A0 += R1.L*R0.H (IS) || R0 = [%1++];\n\t"
"R1.L = %2.L*%3.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 -= R1.L*R0.H (IS), A1 -= R1.L*R0.L (M,IS) || R0 = [%1++];\n\t"
+ "A1 -= R1.L*R0.L (M), A0 -= R1.L*R0.H (IS) || R0 = [%1++];\n\t"
"R1.L = %4.L*%3.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 -= R1.L*R0.H (IS), A1 -= R1.L*R0.L (M,IS) || R0 = [%1++];\n\t"
+ "A1 -= R1.L*R0.L (M), A0 -= R1.L*R0.H (IS) || R0 = [%1++];\n\t"
"R1.L = %4.L*%2.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 -= R1.L*R0.H (IS), A1 -= R1.L*R0.L (M,IS) || R0 = [%1++];\n\t"
+ "A1 -= R1.L*R0.L (M), A0 -= R1.L*R0.H (IS) || R0 = [%1++];\n\t"
"R1.L = %2.L*%2.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 -= R1.L*R0.H (IS), A1 -= R1.L*R0.L (M,IS) || R0 = [%1++];\n\t"
+ "A1 -= R1.L*R0.L (M), A0 -= R1.L*R0.H (IS) || R0 = [%1++];\n\t"
"R1.L = %3.L*%3.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 -= R1.L*R0.H (IS), A1 -= R1.L*R0.L (M,IS) || R0 = [%1++];\n\t"
+ "A1 -= R1.L*R0.L (M), A0 -= R1.L*R0.H (IS) || R0 = [%1++];\n\t"
"R1.L = %4.L*%4.L (IS);\n\t"
"R0 <<= 1;\n\t"
- "A0 -= R1.L*R0.H (IS), A1 -= R1.L*R0.L (M,IS);\n\t"
+ "A1 -= R1.L*R0.L (M), A0 -= R1.L*R0.H (IS);\n\t"
"A1 = A1 >>> 16;\n\t"
"A0 += A1;\n\t"
More information about the commits
mailing list