From 538c451b2bbbcb258640b0e0ea0c74f9da005beb Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Fri, 11 May 2012 14:27:57 -0400 Subject: tile: Remove elf/ and create crti.S/crtn.S This patches fixes up the tile startup files, moving elf/start.S up a directory level and implementing the required crti.S and crtn.S files based on the old initfini.c compiler output (hand-optimized to bum a couple of cycles). --- ChangeLog.tile | 11 ++ sysdeps/tile/Makefile | 5 - sysdeps/tile/crti.S | 111 +++++++++++++++++ sysdeps/tile/crtn.S | 55 +++++++++ sysdeps/tile/elf/start.S | 183 ----------------------------- sysdeps/tile/start.S | 183 +++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/tile/nptl/Makefile | 5 - 7 files changed, 360 insertions(+), 193 deletions(-) create mode 100644 sysdeps/tile/crti.S create mode 100644 sysdeps/tile/crtn.S delete mode 100644 sysdeps/tile/elf/start.S create mode 100644 sysdeps/tile/start.S diff --git a/ChangeLog.tile b/ChangeLog.tile index 77e03b58fe..a8b24588da 100644 --- a/ChangeLog.tile +++ b/ChangeLog.tile @@ -1,3 +1,14 @@ +2012-05-12 Chris Metcalf + + * sysdeps/tile/crti.S: New file, based on compiler output + for sysdeps/generic/initfini.c. + * sysdeps/tile/crtn.S: Likewise. + * sysdeps/tile/Makefile (CFLAGS-initfini.s): Remove variable. + * sysdeps/unix/sysv/linux/tile/nptl/Makefile + (CFLAGS-pt-initfini.s): Likewise. + * sysdeps/tile/elf/start.S: Moved to ... + * sysdeps/tile/start.S: ...here. + 2012-04-15 Mike Frysinger * sysdeps/unix/sysv/linux/tile/tilegx/register-dump.h: Include diff --git a/sysdeps/tile/Makefile b/sysdeps/tile/Makefile index 08c3385502..3cd4d1e752 100644 --- a/sysdeps/tile/Makefile +++ b/sysdeps/tile/Makefile @@ -11,8 +11,3 @@ ifeq ($(subdir),elf) # Extra shared linker files to link only into dl-allobjs.so. sysdep-rtld-routines += dl-start __tls_get_addr endif - -ifeq ($(subdir),csu) -# Avoid .cfi_startproc/endproc markers when creating init and fini pieces. -CFLAGS-initfini.s += -fno-asynchronous-unwind-tables -endif diff --git a/sysdeps/tile/crti.S b/sysdeps/tile/crti.S new file mode 100644 index 0000000000..ccb4464bb7 --- /dev/null +++ b/sysdeps/tile/crti.S @@ -0,0 +1,111 @@ +/* Special .init and .fini section support for tile. + Copyright (C) 2012 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. + + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + + 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 + . */ + +/* crti.S puts a function prologue at the beginning of the .init and + .fini sections and defines global symbols for those addresses, so + they can be called as functions. The symbols _init and _fini are + magic and cause the linker to emit DT_INIT and DT_FINI. */ + +#include +#include + +#ifndef PREINIT_FUNCTION +# define PREINIT_FUNCTION __gmon_start__ +#endif + +#ifndef PREINIT_FUNCTION_WEAK +# define PREINIT_FUNCTION_WEAK 1 +#endif + +#if PREINIT_FUNCTION_WEAK + weak_extern (PREINIT_FUNCTION) +#else + .hidden PREINIT_FUNCTION +#endif + + .section .init,"ax",@progbits + .align 8 + .globl _init + .type _init, @function +_init: + { + move r29, sp + ADDI_PTR r28, sp, -REGSIZE + ST sp, lr + } + ADDI_PTR sp, sp, -(2 * REGSIZE) + ST r28, r29 +#if PREINIT_FUNCTION_WEAK + lnk r2 +0: +#ifdef __tilegx__ + { + moveli r1, hw1_last(_GLOBAL_OFFSET_TABLE_ - 0b) + moveli r0, hw1_last_got(PREINIT_FUNCTION) + } + { + shl16insli r1, r1, hw0(_GLOBAL_OFFSET_TABLE_ - 0b) + shl16insli r0, r0, hw0_got(PREINIT_FUNCTION) + } +#else + { + moveli r1, lo16(_GLOBAL_OFFSET_TABLE_ - 0b) + moveli r0, got_lo16(PREINIT_FUNCTION) + } + { + auli r1, r1, ha16(_GLOBAL_OFFSET_TABLE_ - 0b) + auli r0, r0, got_ha16(PREINIT_FUNCTION) + } +#endif + ADD_PTR r0, r0, r1 + ADD_PTR r0, r0, r2 + LD_PTR r0, r0 + BEQZ r0, .Lno_weak_fn +#endif + jal plt(PREINIT_FUNCTION) +.Lno_weak_fn: + + .section .fini,"ax",@progbits + .align 8 + .globl _fini + .type _fini, @function +_fini: + { + move r29, sp + ADDI_PTR r28, sp, -REGSIZE + ST sp, lr + } + ADDI_PTR sp, sp, -(2 * REGSIZE) + ST r28, r29 diff --git a/sysdeps/tile/crtn.S b/sysdeps/tile/crtn.S new file mode 100644 index 0000000000..06931a119e --- /dev/null +++ b/sysdeps/tile/crtn.S @@ -0,0 +1,55 @@ +/* Special .init and .fini section support for tile. + Copyright (C) 2012 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. + + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + + 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 + . */ + +/* crtn.S puts function epilogues in the .init and .fini sections + corresponding to the prologues in crti.S. */ + +#include + + .section .init,"ax",@progbits + ADDI_PTR r29, sp, (2 * REGSIZE) + { + ADDI_PTR sp, sp, (2 * REGSIZE) + LD lr, r29 + } + jrp lr + + .section .fini,"ax",@progbits + ADDI_PTR r29, sp, (2 * REGSIZE) + { + ADDI_PTR sp, sp, (2 * REGSIZE) + LD lr, r29 + } + jrp lr diff --git a/sysdeps/tile/elf/start.S b/sysdeps/tile/elf/start.S deleted file mode 100644 index 999bb535ca..0000000000 --- a/sysdeps/tile/elf/start.S +++ /dev/null @@ -1,183 +0,0 @@ -/* Copyright (C) 2011 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Chris Metcalf , 2011. - - 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. - - In addition to the permissions in the GNU Lesser General Public - License, the Free Software Foundation gives you unlimited - permission to link the compiled version of this file with other - programs, and to distribute those programs without any restriction - coming from the use of this file. (The GNU Lesser General Public - License restrictions do apply in other respects; for example, they - cover modification of the file, and distribution when not linked - into another program.) - - Note that people who make modified versions of this file are not - obligated to grant this special exception for their modified - versions; it is their choice whether to do so. The GNU Lesser - General Public License gives permission to release a modified - version without this exception; this exception also makes it - possible to release a modified version which carries forward this - exception. - - 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 - . */ - -/* This is the canonical entry point, usually the first thing in the text - segment. The ELF standard tells us that the stack is set up like this on - entry (the left side is the offset from "sp"), in units of - __SIZEOF_POINTER__ entries: - - +0 argc - +1 argv[0] - ... - +(argc+1) NULL - +(argc+2) envp[0] - ... - NULL - ... ElfInfo - - The ElfInfo is pairs of key/value long words following the envp - pointers and terminated by a zero-valued key. - - Although not mandated by the standard, it happens to be the case - that we store the actual argv and envp strings immediately after - the ElfInfo data on the stack. - - On entry r0 points to the shared library termination function, or 0 - if there isn't one. -*/ - -#include -#include -#include - - .text - .global _start - .type _start,@function - .align 8 -_start: - /* Linux starts us with sp pointing at the conventional Elf layout, - but we need to allow two "caller" words for our ABI convention. */ - { - /* Load argc (stored as a "long", equivalent to a pointer type). */ - LD_PTR r1, sp - - /* Save incoming 'sp', which points to the Elf argument block. */ - move r52, sp - } - - { - /* Allocate stack frame callee space for __libc_start_main. */ - ADDI_PTR r12, sp, -(2 * REGSIZE) - } - - { - /* Get our PC. */ - lnk r13 - - /* sp is not necessarily properly aligned on startup because - of the way ld.so pops off leading argv elements. So align it. */ - andi sp, r12, -8 - } -.Lmy_pc: - - { - /* Pass the address of the shared library termination function. */ - move r5, r0 - - /* Compute location where __libc_start_main's caller is supposed to - store its frame pointer. */ - ADDI_PTR r12, sp, REGSIZE - - /* Zero out callee space for return address. Unnecessary but free. - This is just paranoia to help backtracing not go awry. */ - ST sp, zero - } - { - /* Zero out our frame pointer for __libc_start_main. */ - ST r12, zero - - /* Zero out lr to make __libc_start_main the end of backtrace. */ - move lr, zero - - /* Compute a pointer to argv. envp will be determined - later in __libc_start_main. We set up the first argument - (the address of main) below. */ - ADDI_PTR r2, r52, __SIZEOF_POINTER__ - } - { - /* Pass the highest stack address to user code. */ - ADDI_PTR r6, sp, (2 * REGSIZE) - - /* Pass address of main() in r0, and of our own entry - points to .fini and .init in r3 and r4. */ -#ifdef __tilegx__ - moveli r0, hw2_last(main - .Lmy_pc) - } - { - moveli r3, hw2_last(__libc_csu_init - .Lmy_pc) - shl16insli r0, r0, hw1(main - .Lmy_pc) - } - { - shl16insli r3, r3, hw1(__libc_csu_init - .Lmy_pc) - shl16insli r0, r0, hw0(main - .Lmy_pc) - } - { - shl16insli r3, r3, hw0(__libc_csu_init - .Lmy_pc) - moveli r4, hw2_last(__libc_csu_fini - .Lmy_pc) - } - { - ADD_PTR r0, r0, r13 - shl16insli r4, r4, hw1(__libc_csu_fini - .Lmy_pc) - } - { - ADD_PTR r3, r3, r13 - shl16insli r4, r4, hw0(__libc_csu_fini - .Lmy_pc) - } - { - ADD_PTR r4, r4, r13 -#else - addli r0, r13, lo16(main - .Lmy_pc) - } - { - auli r0, r0, ha16(main - .Lmy_pc) - addli r3, r13, lo16(__libc_csu_init - .Lmy_pc) - } - { - auli r3, r3, ha16(__libc_csu_init - .Lmy_pc) - addli r4, r13, lo16(__libc_csu_fini - .Lmy_pc) - } - { - auli r4, r4, ha16(__libc_csu_fini - .Lmy_pc) - -#endif - - /* Call the user's main function, and exit with its value. - But let the libc call main. */ - j plt(__libc_start_main) - } - { - /* Tell backtracer to give up (_start has no caller). */ - info INFO_OP_CANNOT_BACKTRACE - } -.size _start, .-_start - -/* Define a symbol for the first piece of initialized data. */ - .data - .global __data_start - .align 8 -__data_start: - .long 0 - .weak data_start - data_start = __data_start diff --git a/sysdeps/tile/start.S b/sysdeps/tile/start.S new file mode 100644 index 0000000000..999bb535ca --- /dev/null +++ b/sysdeps/tile/start.S @@ -0,0 +1,183 @@ +/* Copyright (C) 2011 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Chris Metcalf , 2011. + + 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. + + In addition to the permissions in the GNU Lesser General Public + License, the Free Software Foundation gives you unlimited + permission to link the compiled version of this file with other + programs, and to distribute those programs without any restriction + coming from the use of this file. (The GNU Lesser General Public + License restrictions do apply in other respects; for example, they + cover modification of the file, and distribution when not linked + into another program.) + + Note that people who make modified versions of this file are not + obligated to grant this special exception for their modified + versions; it is their choice whether to do so. The GNU Lesser + General Public License gives permission to release a modified + version without this exception; this exception also makes it + possible to release a modified version which carries forward this + exception. + + 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 + . */ + +/* This is the canonical entry point, usually the first thing in the text + segment. The ELF standard tells us that the stack is set up like this on + entry (the left side is the offset from "sp"), in units of + __SIZEOF_POINTER__ entries: + + +0 argc + +1 argv[0] + ... + +(argc+1) NULL + +(argc+2) envp[0] + ... + NULL + ... ElfInfo + + The ElfInfo is pairs of key/value long words following the envp + pointers and terminated by a zero-valued key. + + Although not mandated by the standard, it happens to be the case + that we store the actual argv and envp strings immediately after + the ElfInfo data on the stack. + + On entry r0 points to the shared library termination function, or 0 + if there isn't one. +*/ + +#include +#include +#include + + .text + .global _start + .type _start,@function + .align 8 +_start: + /* Linux starts us with sp pointing at the conventional Elf layout, + but we need to allow two "caller" words for our ABI convention. */ + { + /* Load argc (stored as a "long", equivalent to a pointer type). */ + LD_PTR r1, sp + + /* Save incoming 'sp', which points to the Elf argument block. */ + move r52, sp + } + + { + /* Allocate stack frame callee space for __libc_start_main. */ + ADDI_PTR r12, sp, -(2 * REGSIZE) + } + + { + /* Get our PC. */ + lnk r13 + + /* sp is not necessarily properly aligned on startup because + of the way ld.so pops off leading argv elements. So align it. */ + andi sp, r12, -8 + } +.Lmy_pc: + + { + /* Pass the address of the shared library termination function. */ + move r5, r0 + + /* Compute location where __libc_start_main's caller is supposed to + store its frame pointer. */ + ADDI_PTR r12, sp, REGSIZE + + /* Zero out callee space for return address. Unnecessary but free. + This is just paranoia to help backtracing not go awry. */ + ST sp, zero + } + { + /* Zero out our frame pointer for __libc_start_main. */ + ST r12, zero + + /* Zero out lr to make __libc_start_main the end of backtrace. */ + move lr, zero + + /* Compute a pointer to argv. envp will be determined + later in __libc_start_main. We set up the first argument + (the address of main) below. */ + ADDI_PTR r2, r52, __SIZEOF_POINTER__ + } + { + /* Pass the highest stack address to user code. */ + ADDI_PTR r6, sp, (2 * REGSIZE) + + /* Pass address of main() in r0, and of our own entry + points to .fini and .init in r3 and r4. */ +#ifdef __tilegx__ + moveli r0, hw2_last(main - .Lmy_pc) + } + { + moveli r3, hw2_last(__libc_csu_init - .Lmy_pc) + shl16insli r0, r0, hw1(main - .Lmy_pc) + } + { + shl16insli r3, r3, hw1(__libc_csu_init - .Lmy_pc) + shl16insli r0, r0, hw0(main - .Lmy_pc) + } + { + shl16insli r3, r3, hw0(__libc_csu_init - .Lmy_pc) + moveli r4, hw2_last(__libc_csu_fini - .Lmy_pc) + } + { + ADD_PTR r0, r0, r13 + shl16insli r4, r4, hw1(__libc_csu_fini - .Lmy_pc) + } + { + ADD_PTR r3, r3, r13 + shl16insli r4, r4, hw0(__libc_csu_fini - .Lmy_pc) + } + { + ADD_PTR r4, r4, r13 +#else + addli r0, r13, lo16(main - .Lmy_pc) + } + { + auli r0, r0, ha16(main - .Lmy_pc) + addli r3, r13, lo16(__libc_csu_init - .Lmy_pc) + } + { + auli r3, r3, ha16(__libc_csu_init - .Lmy_pc) + addli r4, r13, lo16(__libc_csu_fini - .Lmy_pc) + } + { + auli r4, r4, ha16(__libc_csu_fini - .Lmy_pc) + +#endif + + /* Call the user's main function, and exit with its value. + But let the libc call main. */ + j plt(__libc_start_main) + } + { + /* Tell backtracer to give up (_start has no caller). */ + info INFO_OP_CANNOT_BACKTRACE + } +.size _start, .-_start + +/* Define a symbol for the first piece of initialized data. */ + .data + .global __data_start + .align 8 +__data_start: + .long 0 + .weak data_start + data_start = __data_start diff --git a/sysdeps/unix/sysv/linux/tile/nptl/Makefile b/sysdeps/unix/sysv/linux/tile/nptl/Makefile index 79e03546fc..e98c9bd866 100644 --- a/sysdeps/unix/sysv/linux/tile/nptl/Makefile +++ b/sysdeps/unix/sysv/linux/tile/nptl/Makefile @@ -1,7 +1,2 @@ # pull in __syscall_error routine libpthread-routines += sysdep - -ifeq ($(subdir),nptl) -# Avoid .cfi_startproc/endproc markers when creating init and fini pieces. -CFLAGS-pt-initfini.s += -fno-asynchronous-unwind-tables -endif -- cgit v1.2.3