From c94cf3b8885c8a9e192b95125ce4b8470a1aa3c3 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 8 Jan 2012 00:22:58 +0100 Subject: Move optimized ffs to firmware/asm, using the new automatic-asm-picking infrastructure. Change-Id: I5e7bdc8be7de50ef604c16078857fff1b84650dc --- firmware/target/arm/ffs-arm.S | 75 --------------------------------- firmware/target/coldfire/ffs-coldfire.S | 65 ---------------------------- firmware/target/mips/ffs-mips.S | 59 -------------------------- 3 files changed, 199 deletions(-) delete mode 100644 firmware/target/arm/ffs-arm.S delete mode 100644 firmware/target/coldfire/ffs-coldfire.S delete mode 100644 firmware/target/mips/ffs-mips.S (limited to 'firmware/target') diff --git a/firmware/target/arm/ffs-arm.S b/firmware/target/arm/ffs-arm.S deleted file mode 100644 index 4e912c5317..0000000000 --- a/firmware/target/arm/ffs-arm.S +++ /dev/null @@ -1,75 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Michael Sevakis - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - #include "config.h" - -/**************************************************************************** - * int find_first_set_bit(uint32_t val); - * - * Find the index of the least significant set bit in the 32-bit word. - * - * return values: - * 0 - bit 0 is set - * 1 - bit 1 is set - * ... - * 31 - bit 31 is set - * 32 - no bits set - ****************************************************************************/ - .align 2 - .global find_first_set_bit - .type find_first_set_bit,%function -find_first_set_bit: - @ Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry - rsb r2, r0, #0 @ r1 = r0 & -r0 - ands r1, r0, r2 @ - - @ now r1 has at most one set bit, call this X - -#if ARM_ARCH >= 5 - clz r0, r1 @ Get lead 0's count - rsbne r0, r0, #31 @ lead 0's -> bit index - bx lr @ -#else - @ this is the ffs algorithm devised by D.Seal and posted to - @ comp.sys.arm on 16 Feb 1994. - @ - @ Output modified to suit Rockbox purposes. - - orrne r1, r1, r1, lsl #4 @ r1 = X * 0x11 - orrne r1, r1, r1, lsl #6 @ r1 = X * 0x451 - rsbne r1, r1, r1, lsl #16 @ r1 = X * 0x0450fbaf - - @ now lookup in table indexed on top 6 bits of r1 - ldrb r0, [ pc, r1, lsr #26 ] @ exploit location of table - bx lr @ - -L_ffs_table: - @ 0 1 2 3 4 5 6 7 - @---------------------------------------------- - .byte 32, 0, 1, 12, 2, 6, 0, 13 @ 0- 7 - .byte 3, 0, 7, 0, 0, 0, 0, 14 @ 8-15 - .byte 10, 4, 0, 0, 8, 0, 0, 25 @ 16-23 - .byte 0, 0, 0, 0, 0, 21, 27, 15 @ 24-31 - .byte 31, 11, 5, 0, 0, 0, 0, 0 @ 32-39 - .byte 9, 0, 0, 24, 0, 0, 20, 26 @ 40-47 - .byte 30, 0, 0, 0, 0, 23, 0, 19 @ 48-55 - .byte 29, 0, 22, 18, 28, 17, 16, 0 @ 56-63 -#endif - .size find_first_set_bit, .-find_first_set_bit diff --git a/firmware/target/coldfire/ffs-coldfire.S b/firmware/target/coldfire/ffs-coldfire.S deleted file mode 100644 index 40a7297802..0000000000 --- a/firmware/target/coldfire/ffs-coldfire.S +++ /dev/null @@ -1,65 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Michael Sevakis - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - #include "config.h" - -/**************************************************************************** - * int find_first_set_bit(uint32_t val); - * - * Find the index of the least significant set bit in the 32-bit word. - * - * return values: - * 0 - bit 0 is set - * 1 - bit 1 is set - * ... - * 31 - bit 31 is set - * 32 - no bits set - ****************************************************************************/ - .text - .align 2 - .global find_first_set_bit - .type find_first_set_bit,@function -find_first_set_bit: - | this is a coldfire version of the ffs algorithm devised by D.Seal - | and posted to comp.sys.arm on 16 Feb 1994. - | - | Output modified to suit rockbox purposes. - - | Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry - move.l 4(%sp), %d1 | %d1 = %d1 & -%d1 - lea.l L_ffs_table, %a0 | %a0 = table address - move.l %d1, %d0 | - neg.l %d1 | - and.l %d0, %d1 | - - | now %d1 has at most one set bit, call this X - - move.l #0x0450fbaf, %d0 | %d0 = multiplier - mulu.l %d0, %d1 | %d1 = X * 0x0450fbaf - - | now lookup in table indexed on top 6 bits of %d0 - moveq.l #26, %d0 | %d0 = final shift count - lsr.l %d0, %d1 | - - | the top 24 bits of d0 are 0 so just load the value over it - move.b (%a0, %d1.l), %d0 | - rts | - - .size find_first_set_bit, .-find_first_set_bit diff --git a/firmware/target/mips/ffs-mips.S b/firmware/target/mips/ffs-mips.S deleted file mode 100644 index a2a82a6a32..0000000000 --- a/firmware/target/mips/ffs-mips.S +++ /dev/null @@ -1,59 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2009 by Maurus Cuelenaere - * based on ffs-arm.S by Michael Sevakis - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -#include "config.h" -#include "mips.h" - -/**************************************************************************** - * int find_first_set_bit(uint32_t val); - * - * Find the index of the least significant set bit in the 32-bit word. - * - * return values: - * 0 - bit 0 is set - * 1 - bit 1 is set - * ... - * 31 - bit 31 is set - * 32 - no bits set - ****************************************************************************/ - .align 2 - .global find_first_set_bit - .type find_first_set_bit, %function - .set noreorder - .set noat - -find_first_set_bit: - beqz a0, l # if(a0 == 0) goto l - nop # - negu t0, a0 # t0 = -a0 - and t0, a0, t0 # t0 = a0 & t0 - clz v0, t0 # get lead 0's count - li t0, 31 # t0 = 31 - jr ra # - subu v0, t0, v0 # v0 = t0 - v0 - -l: - jr ra # - li v0, 32 # v0 = 32 - - .set reorder - .set at -- cgit v1.2.3