SWCODEC: Get rid of extra swap buffer and get back 512K of RAM or 100K if the players RAM is <= 1MB. Make any needed changes to things to stabilize and facilitate this including removing flattening out initialization. Comment some things heavily. Fix a few logfs I didn't want to see the compiler complaining about.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12843 a1c6a512-1295-4272-9138-f99709370657
author: Michael Sevakis <jethead71@rockbox.org> 2007-03-19 22:04:17 +0000
committer: Michael Sevakis <jethead71@rockbox.org> 2007-03-19 22:04:17 +0000
commit: e1dd10ddfb49bfdd05fa8997bc097df93a9c9466 (patch)
tree: 0c530ecb1ab68eb335edf595829bf7786e6a683e /firmware/target
parent: fbf52ae8fe04f27368392b71a3572dc2bb00788f (diff)
download: rockbox-e1dd10ddfb49bfdd05fa8997bc097df93a9c9466.tar.gz
rockbox-e1dd10ddfb49bfdd05fa8997bc097df93a9c9466.zip
2 files changed, 94 insertions, 0 deletions
diff --git a/firmware/target/arm/memswap128-arm.S b/firmware/target/arm/memswap128-arm.S
new file mode 100644
index 0000000000..f5276ef353
--- /dev/null
+++ b/firmware/target/arm/memswap128-arm.S
@@ -0,0 +1,44 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2007 by Michael Sevakis
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+/****************************************************************************
+ * void memswap128(void *buf1, void *buf2, size_t len)
+ */
+    .section    .icode, "ax", %progbits
+    .align      2
+    .global     memswap128
+    .type       memswap128, %function
+memswap128:
+                                        @ r0 = buf1
+                                        @ r1 = buf2
+                                        @ r2 = len
+    movs        r2, r2, lsr #4          @ bytes => lines, len == 0?
+    moveq       pc, lr                  @ not at least a line? leave
+    stmdb       sp!, { r4-r10, lr }     @ save registers and return address
+.loop:                                  @
+    ldmia       r0, { r3-r6 }           @ read four longwords from buf1
+    ldmia       r1, { r7-r10 }          @ read four longwords from buf2
+    stmia       r0!, { r7-r10 }         @ write buf2 data to buf1, buf1 += 16
+    stmia       r1!, { r3-r6 }          @ write buf1 data to buf2, buf2 += 16
+    subs        r2, r2, #1              @ len -= 1, len > 0 ?
+    bhi         .loop                   @ yes? keep exchanging
+    ldmia       sp!, { r4-r10, pc }     @ restore registers and return
+.end:
+    .size       memswap128, .end-memswap128
diff --git a/firmware/target/coldfire/memswap128-coldfire.S b/firmware/target/coldfire/memswap128-coldfire.S
new file mode 100644
index 0000000000..2509fd0e45
--- /dev/null
+++ b/firmware/target/coldfire/memswap128-coldfire.S
@@ -0,0 +1,50 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2007 by Michael Sevakis
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+/****************************************************************************
+ * void memswap128(void *buf1, void *buf2, size_t len)
+ */
+    .section    .icode, "ax", @progbits
+    .align      2
+    .global     memswap128
+    .type       memswap128, @function
+memswap128:
+    lea.l       -28(%sp), %sp           | save registers
+    movem.l     %d2-%d7/%a2, (%sp)      |
+    movem.l     32(%sp), %a0-%a2        | %a0 = buf1
+                                        | %a1 = buf2
+                                        | %a2 = len
+    lea.l       -15(%a0, %a2.l), %a2    | %a2 = end address - 15
+    cmp.l       %a0, %a2                | end address <= buf1?
+    bls.b       .no_lines               | not at least a line? leave
+.loop:                                  |
+    movem.l         (%a0), %d0-%d3          | read four longwords from buf1
+    movem.l         (%a1), %d4-%d7          | read four longwords from buf2
+    movem.l         %d4-%d7, (%a0)          | write buf2 data to buf1
+    movem.l         %d0-%d3, (%a1)          | write buf1 data to buf2
+    lea.l       16(%a0), %a0            | buf1 += 16
+    lea.l       16(%a1), %a1            | buf2 += 16
+    cmp.l       %a0, %a2                | %a0 < %d0?
+    bhi.b       .loop                   | yes? keep exchanging
+.no_lines:                              |
+    movem.l     (%sp), %d2-%d7/%a2      | restore registers
+    lea.l       28(%sp), %sp            |
+    rts                                 |
+.end:
+        .size       memswap128, .end-memswap128
author	Michael Sevakis <jethead71@rockbox.org>	2007-03-19 22:04:17 +0000
committer	Michael Sevakis <jethead71@rockbox.org>	2007-03-19 22:04:17 +0000
commit	e1dd10ddfb49bfdd05fa8997bc097df93a9c9466 (patch)
tree	0c530ecb1ab68eb335edf595829bf7786e6a683e /firmware/target
parent	fbf52ae8fe04f27368392b71a3572dc2bb00788f (diff)
download	rockbox-e1dd10ddfb49bfdd05fa8997bc097df93a9c9466.tar.gz rockbox-e1dd10ddfb49bfdd05fa8997bc097df93a9c9466.zip

diff --git a/firmware/target/arm/memswap128-arm.S b/firmware/target/arm/memswap128-arm.S new file mode 100644 index 0000000000..f5276ef353 --- /dev/null +++ b/firmware/target/arm/memswap128-arm.S
@@ -0,0 +1,44 @@
	1	/***************************************************************************
	2	* __________ __ ___.
	3	* Open \______ \ ____ ____ \| \| _\_ \|__ _______ ___
	4	* Source \| _// _ \_/ ___\\| \|/ /\| __ \ / _ \ \/ /
	5	* Jukebox \| \| ( <_> ) \___\| < \| \_\ ( <_> > < <
	6	* Firmware \|____\|_ /\____/ \___ >__\|_ \\|___ /\____/__/\_ \
	7	* \/ \/ \/ \/ \/
	8	* $Id$
	9	*
	10	* Copyright (C) 2007 by Michael Sevakis
	11	*
	12	* All files in this archive are subject to the GNU General Public License.
	13	* See the file COPYING in the source tree root for full license agreement.
	14	*
	15	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
	16	* KIND, either express or implied.
	17	*
	18	****************************************************************************/
	19
	20	/****************************************************************************
	21	* void memswap128(void buf1, void buf2, size_t len)
	22	*/
	23	.section .icode, "ax", %progbits
	24	.align 2
	25	.global memswap128
	26	.type memswap128, %function
	27	memswap128:
	28	@ r0 = buf1
	29	@ r1 = buf2
	30	@ r2 = len
	31	movs r2, r2, lsr #4 @ bytes => lines, len == 0?
	32	moveq pc, lr @ not at least a line? leave
	33	stmdb sp!, { r4-r10, lr } @ save registers and return address
	34	.loop: @
	35	ldmia r0, { r3-r6 } @ read four longwords from buf1
	36	ldmia r1, { r7-r10 } @ read four longwords from buf2
	37	stmia r0!, { r7-r10 } @ write buf2 data to buf1, buf1 += 16
	38	stmia r1!, { r3-r6 } @ write buf1 data to buf2, buf2 += 16
	39	subs r2, r2, #1 @ len -= 1, len > 0 ?
	40	bhi .loop @ yes? keep exchanging
	41	ldmia sp!, { r4-r10, pc } @ restore registers and return
	42	.end:
	43	.size memswap128, .end-memswap128
	44


diff --git a/firmware/target/coldfire/memswap128-coldfire.S b/firmware/target/coldfire/memswap128-coldfire.S new file mode 100644 index 0000000000..2509fd0e45 --- /dev/null +++ b/firmware/target/coldfire/memswap128-coldfire.S
@@ -0,0 +1,50 @@
	1	/***************************************************************************
	2	* __________ __ ___.
	3	* Open \______ \ ____ ____ \| \| _\_ \|__ _______ ___
	4	* Source \| _// _ \_/ ___\\| \|/ /\| __ \ / _ \ \/ /
	5	* Jukebox \| \| ( <_> ) \___\| < \| \_\ ( <_> > < <
	6	* Firmware \|____\|_ /\____/ \___ >__\|_ \\|___ /\____/__/\_ \
	7	* \/ \/ \/ \/ \/
	8	* $Id$
	9	*
	10	* Copyright (C) 2007 by Michael Sevakis
	11	*
	12	* All files in this archive are subject to the GNU General Public License.
	13	* See the file COPYING in the source tree root for full license agreement.
	14	*
	15	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
	16	* KIND, either express or implied.
	17	*
	18	****************************************************************************/
	19
	20	/****************************************************************************
	21	* void memswap128(void buf1, void buf2, size_t len)
	22	*/
	23	.section .icode, "ax", @progbits
	24	.align 2
	25	.global memswap128
	26	.type memswap128, @function
	27	memswap128:
	28	lea.l -28(%sp), %sp \| save registers
	29	movem.l %d2-%d7/%a2, (%sp) \|
	30	movem.l 32(%sp), %a0-%a2 \| %a0 = buf1
	31	\| %a1 = buf2
	32	\| %a2 = len
	33	lea.l -15(%a0, %a2.l), %a2 \| %a2 = end address - 15
	34	cmp.l %a0, %a2 \| end address <= buf1?
	35	bls.b .no_lines \| not at least a line? leave
	36	.loop: \|
	37	movem.l (%a0), %d0-%d3 \| read four longwords from buf1
	38	movem.l (%a1), %d4-%d7 \| read four longwords from buf2
	39	movem.l %d4-%d7, (%a0) \| write buf2 data to buf1
	40	movem.l %d0-%d3, (%a1) \| write buf1 data to buf2
	41	lea.l 16(%a0), %a0 \| buf1 += 16
	42	lea.l 16(%a1), %a1 \| buf2 += 16
	43	cmp.l %a0, %a2 \| %a0 < %d0?
	44	bhi.b .loop \| yes? keep exchanging
	45	.no_lines: \|
	46	movem.l (%sp), %d2-%d7/%a2 \| restore registers
	47	lea.l 28(%sp), %sp \|
	48	rts \|
	49	.end:
	50	.size memswap128, .end-memswap128