diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-01-08 00:22:58 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-22 18:46:45 +0100 |
commit | c94cf3b8885c8a9e192b95125ce4b8470a1aa3c3 (patch) | |
tree | 6ca83258616b00428b58e1e31c10dce020fbc310 | |
parent | 5e9b62cd8ad4d38c7ca43c916b5bc831454bc267 (diff) | |
download | rockbox-c94cf3b8885c8a9e192b95125ce4b8470a1aa3c3.tar.gz rockbox-c94cf3b8885c8a9e192b95125ce4b8470a1aa3c3.zip |
Move optimized ffs to firmware/asm, using the new automatic-asm-picking infrastructure.
Change-Id: I5e7bdc8be7de50ef604c16078857fff1b84650dc
-rw-r--r-- | firmware/SOURCES | 12 | ||||
-rw-r--r-- | firmware/asm/SOURCES | 1 | ||||
-rw-r--r-- | firmware/asm/arm/ffs.S (renamed from firmware/target/arm/ffs-arm.S) | 0 | ||||
-rw-r--r-- | firmware/asm/ffs.c (renamed from firmware/common/ffs.c) | 0 | ||||
-rw-r--r-- | firmware/asm/m68k/ffs.S (renamed from firmware/target/coldfire/ffs-coldfire.S) | 13 | ||||
-rw-r--r-- | firmware/asm/mips/ffs.S (renamed from firmware/target/mips/ffs-mips.S) | 0 |
6 files changed, 14 insertions, 12 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 5a6a554fa6..d8a5254385 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -419,10 +419,6 @@ target/sh/debug-sh.c | |||
419 | #elif defined(CPU_COLDFIRE) | 419 | #elif defined(CPU_COLDFIRE) |
420 | 420 | ||
421 | target/coldfire/crt0.S | 421 | target/coldfire/crt0.S |
422 | #ifdef HAVE_PRIORITY_SCHEDULING | ||
423 | common/ffs.c | ||
424 | target/coldfire/ffs-coldfire.S | ||
425 | #endif | ||
426 | target/coldfire/kernel-coldfire.c | 422 | target/coldfire/kernel-coldfire.c |
427 | target/coldfire/system-coldfire.c | 423 | target/coldfire/system-coldfire.c |
428 | target/coldfire/timer-coldfire.c | 424 | target/coldfire/timer-coldfire.c |
@@ -450,10 +446,6 @@ target/arm/mmu-arm.S | |||
450 | # endif | 446 | # endif |
451 | # endif | 447 | # endif |
452 | 448 | ||
453 | #ifdef HAVE_PRIORITY_SCHEDULING | ||
454 | target/arm/ffs-arm.S | ||
455 | #endif | ||
456 | |||
457 | #if CONFIG_PLATFORM & PLATFORM_NATIVE | 449 | #if CONFIG_PLATFORM & PLATFORM_NATIVE |
458 | target/arm/system-arm.c | 450 | target/arm/system-arm.c |
459 | #endif | 451 | #endif |
@@ -626,7 +618,6 @@ target/arm/crt0.S | |||
626 | #endif /* defined(CPU_*) */ | 618 | #endif /* defined(CPU_*) */ |
627 | 619 | ||
628 | #elif defined(CPU_MIPS) | 620 | #elif defined(CPU_MIPS) |
629 | target/mips/ffs-mips.S | ||
630 | target/mips/mmu-mips.c | 621 | target/mips/mmu-mips.c |
631 | #if CONFIG_CPU==JZ4732 | 622 | #if CONFIG_CPU==JZ4732 |
632 | target/mips/ingenic_jz47xx/crt0.S | 623 | target/mips/ingenic_jz47xx/crt0.S |
@@ -634,9 +625,6 @@ target/mips/ingenic_jz47xx/crt0.S | |||
634 | 625 | ||
635 | #else | 626 | #else |
636 | 627 | ||
637 | #ifdef HAVE_PRIORITY_SCHEDULING | ||
638 | common/ffs.c | ||
639 | #endif | ||
640 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 628 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
641 | crt0.S | 629 | crt0.S |
642 | drivers/i2c.c | 630 | drivers/i2c.c |
diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES index f56d99a7de..23563d11d8 100644 --- a/firmware/asm/SOURCES +++ b/firmware/asm/SOURCES | |||
@@ -1,3 +1,4 @@ | |||
1 | ffs.c | ||
1 | memset16.c | 2 | memset16.c |
2 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY) | 3 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(HAVE_ROCKBOX_C_LIBRARY) |
3 | memcpy.c | 4 | memcpy.c |
diff --git a/firmware/target/arm/ffs-arm.S b/firmware/asm/arm/ffs.S index 4e912c5317..4e912c5317 100644 --- a/firmware/target/arm/ffs-arm.S +++ b/firmware/asm/arm/ffs.S | |||
diff --git a/firmware/common/ffs.c b/firmware/asm/ffs.c index f68a9cef8c..f68a9cef8c 100644 --- a/firmware/common/ffs.c +++ b/firmware/asm/ffs.c | |||
diff --git a/firmware/target/coldfire/ffs-coldfire.S b/firmware/asm/m68k/ffs.S index 40a7297802..2a39ae5bcd 100644 --- a/firmware/target/coldfire/ffs-coldfire.S +++ b/firmware/asm/m68k/ffs.S | |||
@@ -62,4 +62,17 @@ find_first_set_bit: | |||
62 | move.b (%a0, %d1.l), %d0 | | 62 | move.b (%a0, %d1.l), %d0 | |
63 | rts | | 63 | rts | |
64 | 64 | ||
65 | .section .irodata | ||
66 | L_ffs_table: | ||
67 | | 0 1 2 3 4 5 6 7 | ||
68 | |---------------------------------------------- | ||
69 | .byte 32, 0, 1, 12, 2, 6, 0, 13 | 0- 7 | ||
70 | .byte 3, 0, 7, 0, 0, 0, 0, 14 | 8-15 | ||
71 | .byte 10, 4, 0, 0, 8, 0, 0, 25 | 16-23 | ||
72 | .byte 0, 0, 0, 0, 0, 21, 27, 15 | 24-31 | ||
73 | .byte 31, 11, 5, 0, 0, 0, 0, 0 | 32-39 | ||
74 | .byte 9, 0, 0, 24, 0, 0, 20, 26 | 40-47 | ||
75 | .byte 30, 0, 0, 0, 0, 23, 0, 19 | 48-55 | ||
76 | .byte 29, 0, 22, 18, 28, 17, 16, 0 | 56-63 | ||
77 | |||
65 | .size find_first_set_bit, .-find_first_set_bit | 78 | .size find_first_set_bit, .-find_first_set_bit |
diff --git a/firmware/target/mips/ffs-mips.S b/firmware/asm/mips/ffs.S index a2a82a6a32..a2a82a6a32 100644 --- a/firmware/target/mips/ffs-mips.S +++ b/firmware/asm/mips/ffs.S | |||