diff mbox series

[v6,07/34] Refactor 'ctz' functions into a new file

Message ID	20211227190530.3136549-8-gnu@danielengel.com
State	Superseded
Delegated to:	Richard Earnshaw
Headers	DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 974E03858436 From: Daniel Engel <gnu@danielengel.com> To: Richard Earnshaw <Richard.Earnshaw@foss.arm.com>, gcc-patches@gcc.gnu.org Subject: [PATCH v6 07/34] Refactor 'ctz' functions into a new file Date: Mon, 27 Dec 2021 11:05:03 -0800 Message-Id: <20211227190530.3136549-8-gnu@danielengel.com> In-Reply-To: <20211227190530.3136549-1-gnu@danielengel.com> References: <20211227190530.3136549-1-gnu@danielengel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Cc: Daniel Engel <gnu@danielengel.com>, Christophe Lyon <christophe.lyon@linaro.org> Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" <gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org>
Series	libgcc: Thumb-1 Floating-Point Assembly for Cortex M0 \| [v6,00/34] libgcc: Thumb-1 Floating-Point Assembly for Cortex M0 [v6,01/34] Add and restructure function declaration macros [v6,02/34] Rename THUMB_FUNC_START to THUMB_FUNC_ENTRY [v6,03/34] Fix syntax warnings on conditional instructions [v6,04/34] Reorganize LIB1ASMFUNCS object wrapper macros [v6,05/34] Add the __HAVE_FEATURE_IT and IT() macros [v6,06/34] Refactor 'clz' functions into a new file [v6,07/34] Refactor 'ctz' functions into a new file [v6,08/34] Refactor 64-bit shift functions into a new file [v6,09/34] Import 'clz' functions from the CM0 library [v6,10/34] Import 'ctz' functions from the CM0 library [v6,11/34] Import 64-bit shift functions from the CM0 library [v6,12/34] Import 'clrsb' functions from the CM0 library [v6,13/34] Import 'ffs' functions from the CM0 library [v6,14/34] Import 'parity' functions from the CM0 library [v6,15/34] Import 'popcnt' functions from the CM0 library [v6,16/34] Refactor Thumb-1 64-bit comparison into a new file [v6,17/34] Import 64-bit comparison from CM0 library [v6,18/34] Merge Thumb-2 optimizations for 64-bit comparison [v6,19/34] Import 32-bit division from the CM0 library [v6,20/34] Refactor Thumb-1 64-bit division into a new file [v6,21/34] Import 64-bit division from the CM0 library [v6,22/34] Import integer multiplication from the CM0 library [v6,23/34] Refactor Thumb-1 float comparison into a new file [v6,24/34] Import float comparison from the CM0 library [v6,25/34] Refactor Thumb-1 float subtraction into a new file [v6,26/34] Import float addition and subtraction from the CM0 library [v6,27/34] Import float multiplication from the CM0 library [v6,28/34] Import float division from the CM0 library [v6,29/34] Import integer-to-float conversion from the CM0 library [v6,30/34] Import float-to-integer conversion from the CM0 library [v6,31/34] Import float<->double conversion from the CM0 library [v6,32/34] Import float<->__fp16 conversion from the CM0 library [v6,33/34] Drop single-precision Thumb-1 soft-float functions [v6,34/34] Add -mpure-code support to the CM0 functions.

Commit Message

Daniel Engel Dec. 27, 2021, 7:05 p.m. UTC

  This will make it easier to isolate changes in subsequent patches.

gcc/libgcc/ChangeLog:
2021-01-13 Daniel Engel <gnu@danielengel.com>

	* config/arm/lib1funcs.S (__ctzsi2): Moved to ...
	* config/arm/ctz2.S: New file.
---
 libgcc/config/arm/ctz2.S      | 86 +++++++++++++++++++++++++++++++++++
 libgcc/config/arm/lib1funcs.S | 65 +-------------------------
 2 files changed, 87 insertions(+), 64 deletions(-)
 create mode 100644 libgcc/config/arm/ctz2.S

diff mbox series

Patch

diff --git a/libgcc/config/arm/ctz2.S b/libgcc/config/arm/ctz2.S
new file mode 100644
index 00000000000..8702c9afb94
--- /dev/null
+++ b/libgcc/config/arm/ctz2.S
@@ -0,0 +1,86 @@ 
+/* Copyright (C) 1995-2021 Free Software Foundation, Inc.
+
+This file 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 3, or (at your option) any
+later version.
+
+This file is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+
+#ifdef L_ctzsi2
+#ifdef NOT_ISA_TARGET_32BIT
+FUNC_START ctzsi2
+	negs	r1, r0
+	ands	r0, r0, r1
+	movs	r1, #28
+	movs	r3, #1
+	lsls	r3, r3, #16
+	cmp	r0, r3 /* 0x10000 */
+	bcc	2f
+	lsrs	r0, r0, #16
+	subs	r1, r1, #16
+2:	lsrs	r3, r3, #8
+	cmp	r0, r3 /* #0x100 */
+	bcc	2f
+	lsrs	r0, r0, #8
+	subs	r1, r1, #8
+2:	lsrs	r3, r3, #4
+	cmp	r0, r3 /* #0x10 */
+	bcc	2f
+	lsrs	r0, r0, #4
+	subs	r1, r1, #4
+2:	adr	r2, 1f
+	ldrb	r0, [r2, r0]
+	subs	r0, r0, r1
+	bx lr
+.align 2
+1:
+.byte	27, 28, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31
+	FUNC_END ctzsi2
+#else
+ARM_FUNC_START ctzsi2
+	rsb	r1, r0, #0
+	and	r0, r0, r1
+# if defined (__ARM_FEATURE_CLZ)
+	clz	r0, r0
+	rsb	r0, r0, #31
+	RET
+# else
+	mov	r1, #28
+	cmp	r0, #0x10000
+	do_it	cs, t
+	movcs	r0, r0, lsr #16
+	subcs	r1, r1, #16
+	cmp	r0, #0x100
+	do_it	cs, t
+	movcs	r0, r0, lsr #8
+	subcs	r1, r1, #8
+	cmp	r0, #0x10
+	do_it	cs, t
+	movcs	r0, r0, lsr #4
+	subcs	r1, r1, #4
+	adr	r2, 1f
+	ldrb	r0, [r2, r0]
+	sub	r0, r0, r1
+	RET
+.align 2
+1:
+.byte	27, 28, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31
+# endif /* !defined (__ARM_FEATURE_CLZ) */
+	FUNC_END ctzsi2
+#endif
+#endif /* L_clzsi2 */
+
diff --git a/libgcc/config/arm/lib1funcs.S b/libgcc/config/arm/lib1funcs.S
index d92f73ba0c9..b1df00ac597 100644
--- a/libgcc/config/arm/lib1funcs.S
+++ b/libgcc/config/arm/lib1funcs.S
@@ -1804,70 +1804,7 @@  LSYM(Lover12):
 #endif /* __symbian__ */
 
 #include "clz2.S"
-
-#ifdef L_ctzsi2
-#ifdef NOT_ISA_TARGET_32BIT
-FUNC_START ctzsi2
-	negs	r1, r0
-	ands	r0, r0, r1
-	movs	r1, #28
-	movs	r3, #1
-	lsls	r3, r3, #16
-	cmp	r0, r3 /* 0x10000 */
-	bcc	2f
-	lsrs	r0, r0, #16
-	subs	r1, r1, #16
-2:	lsrs	r3, r3, #8
-	cmp	r0, r3 /* #0x100 */
-	bcc	2f
-	lsrs	r0, r0, #8
-	subs	r1, r1, #8
-2:	lsrs	r3, r3, #4
-	cmp	r0, r3 /* #0x10 */
-	bcc	2f
-	lsrs	r0, r0, #4
-	subs	r1, r1, #4
-2:	adr	r2, 1f
-	ldrb	r0, [r2, r0]
-	subs	r0, r0, r1
-	bx lr
-.align 2
-1:
-.byte	27, 28, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31
-	FUNC_END ctzsi2
-#else
-ARM_FUNC_START ctzsi2
-	rsb	r1, r0, #0
-	and	r0, r0, r1
-# if defined (__ARM_FEATURE_CLZ)
-	clz	r0, r0
-	rsb	r0, r0, #31
-	RET
-# else
-	mov	r1, #28
-	cmp	r0, #0x10000
-	do_it	cs, t
-	movcs	r0, r0, lsr #16
-	subcs	r1, r1, #16
-	cmp	r0, #0x100
-	do_it	cs, t
-	movcs	r0, r0, lsr #8
-	subcs	r1, r1, #8
-	cmp	r0, #0x10
-	do_it	cs, t
-	movcs	r0, r0, lsr #4
-	subcs	r1, r1, #4
-	adr	r2, 1f
-	ldrb	r0, [r2, r0]
-	sub	r0, r0, r1
-	RET
-.align 2
-1:
-.byte	27, 28, 29, 29, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31
-# endif /* !defined (__ARM_FEATURE_CLZ) */
-	FUNC_END ctzsi2
-#endif
-#endif /* L_clzsi2 */
+#include "ctz2.S"
 
 /* ------------------------------------------------------------------------ */
 /* These next two sections are here despite the fact that they contain Thumb