* [PATCH roland/arm-setjmp] ARM: Consolidate setjmp details in include/bits/setjmp.h file.
@ 2013-03-11 20:26 Roland McGrath
2013-03-11 23:37 ` Joseph S. Myers
0 siblings, 1 reply; 3+ messages in thread
From: Roland McGrath @ 2013-03-11 20:26 UTC (permalink / raw)
To: Joseph Myers; +Cc: libc-ports
This actually hasn't changed materially from the first posting, but it got
no response after a week.
This puts some related bits of magic knowledge closer to each other and
reduces duplication. It also makes it easy for a new configuration to
override the general register set in its own
sysdeps/.../include/bits/setjmp.h file, which I'm doing in arm-nacl for r9
avoidance.
Tested armv7l-linux-gnueabihf that no object code is changed.
OK?
Thanks,
Roland
ports/ChangeLog.arm
2013-03-11 Roland McGrath <roland@hack.frob.com>
* sysdeps/arm/bits/setjmp.h: Test [!__ASSEMBLER__] rather than [!_ASM].
* sysdeps/arm/jmpbuf-offsets.h: File removed.
* sysdeps/arm/jmpbuf-unwind.h: Don't #include it.
* sysdeps/arm/include/bits/setjmp.h: New file.
* sysdeps/arm/setjmp.S (_SETJMP_H, _ASM): Macros removed.
Use JMP_BUF_REGLIST macro.
* sysdeps/arm/__longjmp.S: Likewise.
--- a/ports/sysdeps/arm/__longjmp.S
+++ b/ports/sysdeps/arm/__longjmp.S
@@ -19,8 +19,6 @@
/* ??? Needs more rearrangement for the LDM to handle thumb mode. */
#define NO_THUMB
#include <sysdep.h>
-#define _SETJMP_H
-#define _ASM
#include <bits/setjmp.h>
#include <rtld-global-offsets.h>
#include <arm-features.h>
@@ -37,7 +35,7 @@ ENTRY (__longjmp)
cfi_undefined (r4)
CHECK_SP (r4)
#endif
- ldmia ip!, {v1-v6, sl, fp, sp, lr}
+ ldmia ip!, JMP_BUF_REGLIST
cfi_restore (v1)
cfi_restore (v2)
cfi_restore (v3)
--- a/ports/sysdeps/arm/bits/setjmp.h
+++ b/ports/sysdeps/arm/bits/setjmp.h
@@ -24,7 +24,7 @@
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
-#ifndef _ASM
+#ifndef __ASSEMBLER__
/* The exact set of registers saved may depend on the particular core
in use, as some coprocessor registers may need to be saved. The C
Library ABI requires that the buffer be 8-byte aligned, and
--- a/ports/sysdeps/arm/jmpbuf-offsets.h
+++ b/ports/sysdeps/arm/include/bits/setjmp.h
@@ -1,5 +1,5 @@
-/* Private macros for accessing __jmp_buf contents. ARM EABI version.
- Copyright (C) 2007-2013 Free Software Foundation, Inc.
+/* Private jmp_buf-related definitions. ARM EABI version.
+ Copyright (C) 2013 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -16,4 +16,19 @@
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
+#ifndef _INCLUDE_BITS_SETJMP_H
+#define _INCLUDE_BITS_SETJMP_H 1
+
+#ifndef __ASSEMBLER__
+/* Get the public declarations. */
+# include <sysdeps/arm/bits/setjmp.h>
+#endif
+
+/* Register list for a ldm/stm instruction to load/store
+ the general registers from a __jmp_buf. */
+#define JMP_BUF_REGLIST {v1-v6, sl, fp, sp, lr}
+
+/* Index of __jmp_buf where the sp register resides. */
#define __JMP_BUF_SP 8
+
+#endif /* include/bits/setjmp.h */
--- a/ports/sysdeps/arm/jmpbuf-unwind.h
+++ b/ports/sysdeps/arm/jmpbuf-unwind.h
@@ -16,7 +16,6 @@
<http://www.gnu.org/licenses/>. */
#include <setjmp.h>
-#include <jmpbuf-offsets.h>
#include <stdint.h>
#include <unwind.h>
--- a/ports/sysdeps/arm/setjmp.S
+++ b/ports/sysdeps/arm/setjmp.S
@@ -19,8 +19,6 @@
/* ??? Needs more rearrangement for the STM to handle thumb mode. */
#define NO_THUMB
#include <sysdep.h>
-#define _SETJMP_H
-#define _ASM
#include <bits/setjmp.h>
#include <rtld-global-offsets.h>
#include <arm-features.h>
@@ -29,7 +27,7 @@ ENTRY (__sigsetjmp)
mov ip, r0
/* Save registers */
- stmia ip!, {v1-v6, sl, fp, sp, lr}
+ stmia ip!, JMP_BUF_REGLIST
#if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__
# define NEED_HWCAP 1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH roland/arm-setjmp] ARM: Consolidate setjmp details in include/bits/setjmp.h file.
2013-03-11 20:26 [PATCH roland/arm-setjmp] ARM: Consolidate setjmp details in include/bits/setjmp.h file Roland McGrath
@ 2013-03-11 23:37 ` Joseph S. Myers
0 siblings, 0 replies; 3+ messages in thread
From: Joseph S. Myers @ 2013-03-11 23:37 UTC (permalink / raw)
To: Roland McGrath; +Cc: libc-ports
On Mon, 11 Mar 2013, Roland McGrath wrote:
> 2013-03-11 Roland McGrath <roland@hack.frob.com>
>
> * sysdeps/arm/bits/setjmp.h: Test [!__ASSEMBLER__] rather than [!_ASM].
> * sysdeps/arm/jmpbuf-offsets.h: File removed.
> * sysdeps/arm/jmpbuf-unwind.h: Don't #include it.
> * sysdeps/arm/include/bits/setjmp.h: New file.
> * sysdeps/arm/setjmp.S (_SETJMP_H, _ASM): Macros removed.
> Use JMP_BUF_REGLIST macro.
> * sysdeps/arm/__longjmp.S: Likewise.
OK.
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH roland/arm-setjmp] ARM: Consolidate setjmp details in include/bits/setjmp.h file.
@ 2013-03-05 1:08 Roland McGrath
0 siblings, 0 replies; 3+ messages in thread
From: Roland McGrath @ 2013-03-05 1:08 UTC (permalink / raw)
To: libc-ports
This puts some related bits of magic knowledge closer to each other and
reduces duplication. It also makes it easy for a new configuration to
override the general register set in its own
sysdeps/.../include/bits/setjmp.h file, which I'm doing in arm-nacl for r9
avoidance.
Tested armv7l-linux-gnueabihf that no object code is changed.
Thanks,
Roland
ports/ChangeLog.arm
2013-03-04 Roland McGrath <roland@hack.frob.com>
* sysdeps/arm/bits/setjmp.h: Test [!__ASSEMBLER__] rather than [!_ASM].
* sysdeps/arm/jmpbuf-offsets.h: File removed.
* sysdeps/arm/jmpbuf-unwind.h: Don't #include it.
* sysdeps/arm/include/bits/setjmp.h: New file.
* sysdeps/arm/setjmp.S (_SETJMP_H, _ASM): Macros removed.
Use JMP_BUF_REGLIST macro.
* sysdeps/arm/__longjmp.S: Likewise.
--- a/ports/sysdeps/arm/__longjmp.S
+++ b/ports/sysdeps/arm/__longjmp.S
@@ -37,7 +37,7 @@ ENTRY (__longjmp)
cfi_undefined (r4)
CHECK_SP (r4)
#endif
- LOADREGS(ia, ip!, {v1-v6, sl, fp, sp, lr})
+ LOADREGS(ia, ip!, JMP_BUF_REGLIST)
cfi_restore (v1)
cfi_restore (v2)
cfi_restore (v3)
--- a/ports/sysdeps/arm/bits/setjmp.h
+++ b/ports/sysdeps/arm/bits/setjmp.h
@@ -24,7 +24,7 @@
# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
#endif
-#ifndef _ASM
+#ifndef __ASSEMBLER__
/* The exact set of registers saved may depend on the particular core
in use, as some coprocessor registers may need to be saved. The C
Library ABI requires that the buffer be 8-byte aligned, and
--- /dev/null
+++ b/ports/sysdeps/arm/include/bits/setjmp.h
@@ -0,0 +1,34 @@
+/* Private jmp_buf-related definitions. ARM EABI version.
+ Copyright (C) 2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _INCLUDE_BITS_SETJMP_H
+#define _INCLUDE_BITS_SETJMP_H 1
+
+#ifndef __ASSEMBLER__
+/* Get the public declarations. */
+# include <sysdeps/arm/bits/setjmp.h>
+#endif
+
+/* Register list for a ldm/stm instruction to load/store
+ the general registers from a __jmp_buf. */
+#define JMP_BUF_REGLIST {v1-v6, sl, fp, sp, lr}
+
+/* Index of __jmp_buf where the sp register resides. */
+#define __JMP_BUF_SP 8
+
+#endif /* include/bits/setjmp.h */
--- a/ports/sysdeps/arm/jmpbuf-offsets.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Private macros for accessing __jmp_buf contents. ARM EABI version.
- Copyright (C) 2007-2013 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library 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
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-#define __JMP_BUF_SP 8
--- a/ports/sysdeps/arm/jmpbuf-unwind.h
+++ b/ports/sysdeps/arm/jmpbuf-unwind.h
@@ -16,7 +16,6 @@
<http://www.gnu.org/licenses/>. */
#include <setjmp.h>
-#include <jmpbuf-offsets.h>
#include <stdint.h>
#include <unwind.h>
--- a/ports/sysdeps/arm/setjmp.S
+++ b/ports/sysdeps/arm/setjmp.S
@@ -19,8 +19,6 @@
/* ??? Needs more rearrangement for the STM to handle thumb mode. */
#define NO_THUMB
#include <sysdep.h>
-#define _SETJMP_H
-#define _ASM
#include <bits/setjmp.h>
#include <rtld-global-offsets.h>
#include <arm-features.h>
@@ -29,7 +27,7 @@ ENTRY (__sigsetjmp)
mov ip, r0
/* Save registers */
- stmia ip!, {v1-v6, sl, fp, sp, lr}
+ stmia ip!, JMP_BUF_REGLIST
#if !defined ARM_ASSUME_NO_IWMMXT || defined __SOFTFP__
# define NEED_HWCAP 1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-11 23:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-11 20:26 [PATCH roland/arm-setjmp] ARM: Consolidate setjmp details in include/bits/setjmp.h file Roland McGrath
2013-03-11 23:37 ` Joseph S. Myers
-- strict thread matches above, loose matches on Subject: below --
2013-03-05 1:08 Roland McGrath
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).