public inbox for libc-ports@sourceware.org
 help / color / mirror / Atom feed
From: Richard Henderson <rth@twiddle.net>
To: libc-ports@sourceware.org
Cc: Joseph Myers <joseph@codesourcery.com>
Subject: [PATCH 18/26] arm: Use GET_TLS more often
Date: Wed, 27 Feb 2013 03:17:00 -0000	[thread overview]
Message-ID: <1361934986-17018-19-git-send-email-rth@twiddle.net> (raw)
In-Reply-To: <1361934986-17018-1-git-send-email-rth@twiddle.net>

---
	* sysdeps/arm/dl-tlsdesc.S (_dl_tlsdesc_undefweak): Use GET_TLS,
	save LR in R1, and return directly from R1.
	(_dl_tlsdesc_dynamic): Use GET_TLS.
	* sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h 
	(SINGLE_THREAD_P): Use GET_TLS.
---
 ports/sysdeps/arm/dl-tlsdesc.S                     | 23 +++++++---------------
 .../unix/sysv/linux/arm/nptl/sysdep-cancel.h       |  2 +-
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/ports/sysdeps/arm/dl-tlsdesc.S b/ports/sysdeps/arm/dl-tlsdesc.S
index 6c47743..12214f1 100644
--- a/ports/sysdeps/arm/dl-tlsdesc.S
+++ b/ports/sysdeps/arm/dl-tlsdesc.S
@@ -44,22 +44,13 @@ _dl_tlsdesc_return:
 	.fnstart
 	.align 2
 _dl_tlsdesc_undefweak:
-	@ Are we allowed a misaligned stack pointer calling read_tp?
-	.save	{lr}
-	push	{lr}
-	cfi_adjust_cfa_offset (4)
-	cfi_rel_offset (lr,0)
-	bl 	__aeabi_read_tp
+	@ ??? The only GET_TLS implementation in tree is Linux,
+	@ which is guaranteed to clobber only R0 and LR.
+	mov	r1, lr
+	cfi_register (lr, r1)
+	GET_TLS
 	rsb 	r0, r0, #0
-#if defined (__ARM_ARCH_4T__) && defined (__THUMB_INTERWORK__)
-	pop	{lr}
-	cfi_adjust_cfa_offset (-4)
-	cfi_restore (lr)
-	bx	lr
-#else
-	pop	{pc}
-#endif
-
+	BX	(r1)
 	cfi_endproc
 	.fnend
 	.size	_dl_tlsdesc_undefweak, .-_dl_tlsdesc_undefweak
@@ -104,7 +95,7 @@ _dl_tlsdesc_dynamic:
 	cfi_rel_offset (r4,8)
 	cfi_rel_offset (lr,12)
 	ldr	r1, [r0] /* td */
-	bl	__aeabi_read_tp
+	GET_TLS
 	mov	r4, r0 /* r4 = tp */
 	ldr	r0, [r0]
 	ldr	r2, [r1, #8] /* gen_count */
diff --git a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
index f0f7043..c2ab0ce 100644
--- a/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/sysdep-cancel.h
@@ -220,7 +220,7 @@ extern int __local_multiple_threads attribute_hidden;
 	push	{r0, lr};						\
 	cfi_adjust_cfa_offset (8);					\
 	cfi_rel_offset (lr, 4);						\
-	bl	__aeabi_read_tp;					\
+	GET_TLS;							\
 	NEGOFF_ADJ_BASE(r0, MULTIPLE_THREADS_OFFSET);			\
 	ldr	ip, NEGOFF_OFF1(r0, MULTIPLE_THREADS_OFFSET);		\
 	pop	{r0, lr};						\
-- 
1.8.1.2

  parent reply	other threads:[~2013-02-27  3:17 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-27  3:16 [PATCH 00/26] ARM improvements Richard Henderson
2013-02-27  3:16 ` [PATCH 03/26] arm: Handle armv6 in preconfigure Richard Henderson
2013-02-27 18:02   ` Joseph S. Myers
2013-02-27 18:04     ` Roland McGrath
2013-02-27 18:08       ` Richard Henderson
2013-02-27 18:34     ` Richard Henderson
2013-02-27 19:57       ` Joseph S. Myers
2013-02-27  3:16 ` [PATCH 09/26] arm: Mark assembly files that will not use thumb mode Richard Henderson
2013-02-28  0:58   ` Joseph S. Myers
2013-02-27  3:16 ` [PATCH 04/26] arm: Include libc-do-syscall in sysdep-rtld-routines Richard Henderson
2013-02-28  0:15   ` Joseph S. Myers
2013-02-27  3:16 ` [PATCH 01/26] Sync config.guess and config.sub with upstream Richard Henderson
2013-02-27 17:03   ` Joseph S. Myers
2013-02-27  3:16 ` [PATCH 05/26] arm: Introduce thumb helpers s and pc_ofs Richard Henderson
2013-02-28  0:20   ` Joseph S. Myers
2013-02-28  0:36     ` Richard Henderson
2013-02-28  1:45       ` Måns Rullgård
2013-02-27  3:17 ` Richard Henderson [this message]
2013-02-28 21:59   ` [PATCH 18/26] arm: Use GET_TLS more often Joseph S. Myers
2013-02-27  3:17 ` [PATCH 13/26] arm: Store lr in r2 around GET_TLS Richard Henderson
2013-02-27  3:17 ` [PATCH 19/26] arm: Add optimized ffs for armv6t2 Richard Henderson
2013-02-27 15:51   ` Måns Rullgård
2013-02-27 16:34     ` Richard Henderson
2013-02-27 17:49   ` Roland McGrath
2013-02-27  3:17 ` [PATCH 11/26] arm: Introduce and use NEGOFF series of macros Richard Henderson
2013-02-27  3:17 ` [PATCH 17/26] arm: Unless arm4t, pop return address directly into pc Richard Henderson
2013-02-28 21:57   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 07/26] arm: Introduce and use GET_TLS Richard Henderson
2013-02-28  0:34   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 14/26] arm: Use push/pop mnemonics Richard Henderson
2013-02-28  1:03   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 23/26] arm: Rewrite armv6t2 memchr with uqadd8 Richard Henderson
2013-02-27  7:04   ` Richard Henderson
2013-02-27  3:17 ` [PATCH 20/26] arm: Implement armv6t2 optimized strlen Richard Henderson
2013-02-27 17:12   ` Måns Rullgård
2013-02-27 17:44     ` Richard Henderson
2013-02-27  3:17 ` [PATCH 06/26] arm: Use pc_ofs Richard Henderson
2013-02-28  0:21   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 26/26] arm: Add optimized add_n and sub_n Richard Henderson
2013-02-27  3:17 ` [PATCH 10/26] arm: Introduce and use LDST_PCREL Richard Henderson
2013-02-28  1:00   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 25/26] arm: Add optimized submul_1 Richard Henderson
2013-02-27  3:17 ` [PATCH 02/26] arm: Update preconfigure fragment for gcc 4.8 Richard Henderson
2013-02-27 17:54   ` Joseph S. Myers
2013-02-27 18:11     ` Richard Henderson
2013-02-27  3:17 ` [PATCH 21/26] arm: Implement armv6t2 optimized strcpy Richard Henderson
2013-02-27  3:17 ` [PATCH 24/26] arm: Add optimized addmul_1 Richard Henderson
2013-02-28 13:58   ` Måns Rullgård
2013-02-28 18:19     ` Richard Henderson
2013-02-28 19:37       ` Måns Rullgård
2013-02-27  3:17 ` [PATCH 22/26] arm: Implement armv6t2 optimized strchr, strrchr, rawmemchr Richard Henderson
2013-02-28  1:31   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 08/26] arm: Add IT insns for thumb mode Richard Henderson
2013-02-28  0:41   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 16/26] arm: Commonize BX conditionals Richard Henderson
2013-02-28 21:51   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 15/26] arm: Delete LOADREGS macro Richard Henderson
2013-02-28  1:24   ` Joseph S. Myers
2013-02-27  3:17 ` [PATCH 12/26] arm: Enable thumb2 mode in assembly files Richard Henderson
2013-02-27 15:41 ` [PATCH 00/26] ARM improvements Måns Rullgård
2013-02-27 16:59 ` Joseph S. Myers
2013-02-27 17:34   ` Richard Henderson
2013-02-28 22:05 ` Joseph S. Myers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1361934986-17018-19-git-send-email-rth@twiddle.net \
    --to=rth@twiddle.net \
    --cc=joseph@codesourcery.com \
    --cc=libc-ports@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).