mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
* sysdeps/powerpc/powerpc64/dl-trampoline.S: Use register names.

	* sysdeps/powerpc/powerpc32/dl-trampoline.S: New file.
	* sysdeps/powerpc/powerpc32/dl-machine.h: Remove trampoline code here.
	Define ARCH_LA_PLTENTER and ARCH_LA_PLTEXIT.
	* sysdeps/generic/ldsodefs.h (struct audit_ifaces): Add ppc32 variants.
	* elf/tst-auditmod1.c: Add ppc32 support.
	* sysdeps/powerpc/powerpc32/bits/link.h: New file.
	* sysdeps/powerpc/powerpc64/bits/link.h: Add ppc32 definitions.
This commit is contained in:
Ulrich Drepper 2005-01-07 23:14:21 +00:00
parent ae7f5313df
commit 2413fdba7a
7 changed files with 280 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,5 +1,15 @@
2005-01-07 Ulrich Drepper <drepper@redhat.com>
* sysdeps/powerpc/powerpc64/dl-trampoline.S: Use register names.
* sysdeps/powerpc/powerpc32/dl-trampoline.S: New file.
* sysdeps/powerpc/powerpc32/dl-machine.h: Remove trampoline code here.
Define ARCH_LA_PLTENTER and ARCH_LA_PLTEXIT.
* sysdeps/generic/ldsodefs.h (struct audit_ifaces): Add ppc32 variants.
* elf/tst-auditmod1.c: Add ppc32 support.
* sysdeps/powerpc/powerpc32/bits/link.h: New file.
* sysdeps/powerpc/powerpc64/bits/link.h: Add ppc32 definitions.
* malloc/malloc.c (malloc_printerr): Print program name as part of
error message.

27
elf/tst-auditmod1.c
View File

@ -126,7 +126,7 @@ la_i86_gnu_pltexit (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return 0;
}
#elif defined __x86_64__
uintptr_t
Elf64_Addr
la_x86_64_gnu_pltenter (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
uintptr_t *defcook, La_x86_64_regs *regs,
unsigned int *flags, const char *symname,
@ -148,8 +148,31 @@ la_x86_64_gnu_pltexit (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
return 0;
}
#elif defined __powerpc__ && __WORDSIZE == 32
Elf32_Addr
la_ppc32_gnu_pltenter (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook,
uintptr_t *defcook, La_ppc32_regs *regs,
unsigned int *flags, const char *symname,
long int *framesizep)
{
printf ("ppc32_pltenter: symname=%s, st_value=%#lx, ndx=%u, flags=%u\n",
symname, (long int) sym->st_value, ndx, *flags);
return sym->st_value;
}
unsigned int
la_ppc32_gnu_pltexit (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook,
uintptr_t *defcook, const La_ppc32_regs *inregs,
La_ppc32_retval *outregs, const char *symname)
{
printf ("ppc32_pltexit: symname=%s, st_value=%#lx, ndx=%u, retval=%tu\n",
symname, (long int) sym->st_value, ndx, outregs->lrv_r3);
return 0;
}
#elif defined __powerpc__ && __WORDSIZE == 64
uintptr_t
Elf64_Addr
la_ppc64_gnu_pltenter (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
uintptr_t *defcook, La_ppc64_regs *regs,
unsigned int *flags, const char *symname,

35
sysdeps/generic/ldsodefs.h
View File

@ -179,6 +179,8 @@ struct La_i86_regs;
struct La_i86_retval;
struct La_x86_64_regs;
struct La_x86_64_retval;
struct La_ppc32_regs;
struct La_ppc32_retval;
struct La_ppc64_regs;
struct La_ppc64_retval;
@ -198,20 +200,22 @@ struct audit_ifaces
};
union
{
uintptr_t (*i86_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *,
uintptr_t *, const struct La_i86_regs *,
unsigned int *, const char *name,
long int *framesizep);
uintptr_t (*x86_64_gnu_pltenter) (Elf64_Sym *, unsigned int, uintptr_t *,
uintptr_t *,
const struct La_x86_64_regs *,
Elf32_Addr (*i86_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *,
uintptr_t *, struct La_i86_regs *,
unsigned int *, const char *name,
long int *framesizep);
Elf64_Addr (*x86_64_gnu_pltenter) (Elf64_Sym *, unsigned int, uintptr_t *,
uintptr_t *, struct La_x86_64_regs *,
unsigned int *, const char *name,
long int *framesizep);
Elf32_Addr (*ppc32_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *,
uintptr_t *, struct La_ppc32_regs *,
unsigned int *, const char *name,
long int *framesizep);
Elf64_Addr (*ppc64_gnu_pltenter) (Elf64_Sym *, unsigned int, uintptr_t *,
uintptr_t *, struct La_ppc64_regs *,
unsigned int *, const char *name,
long int *framesizep);
uintptr_t (*ppc64_gnu_pltenter) (Elf64_Sym *, unsigned int, uintptr_t *,
uintptr_t *,
const struct La_ppc64_regs *,
unsigned int *, const char *name,
long int *framesizep);
};
union
{
@ -223,11 +227,14 @@ struct audit_ifaces
const struct La_x86_64_regs *,
struct La_x86_64_retval *,
const char *);
unsigned int (*ppc32_gnu_pltexit) (Elf32_Sym *, unsigned int, uintptr_t *,
uintptr_t *,
const struct La_ppc32_regs *,
struct La_ppc32_retval *, const char *);
unsigned int (*ppc64_gnu_pltexit) (Elf64_Sym *, unsigned int, uintptr_t *,
uintptr_t *,
const struct La_ppc64_regs *,
struct La_ppc64_retval *,
const char *);
struct La_ppc64_retval *, const char *);
};
unsigned int (*objclose) (uintptr_t *);

62
sysdeps/powerpc/powerpc32/bits/link.h Normal file
View File

@ -0,0 +1,62 @@
/* Copyright (C) 2004, 2005 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, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifndef _LINK_H
# error "Never include <bits/link.h> directly; use <link.h> instead."
#endif
/* Registers for entry into PLT on PPC32. */
typedef struct La_ppc32_regs
{
uint64_t lr_reg[8];
double lr_fp[8];
uint32_t lr_vreg[12][4];
uint64_t lr_r1;
uint64_t lr_lr;
} La_ppc32_regs;
/* Return values for calls from PLT on PPC32. */
typedef struct La_ppc32_retval
{
uint64_t lrv_r3;
uint64_t lrv_r4;
double lrv_fp[8];
uint32_t lrv_v2[4];
} La_ppc32_retval;
__BEGIN_DECLS
extern Elf32_Addr la_ppc32_gnu_pltenter (Elf32_Sym *__sym,
unsigned int __ndx,
uintptr_t *__refcook,
uintptr_t *__defcook,
La_ppc32_regs *__regs,
unsigned int *__flags,
const char *__symname,
long int *__framesizep);
extern unsigned int la_ppc32_gnu_pltexit (Elf32_Sym *__sym,
unsigned int __ndx,
uintptr_t *__refcook,
uintptr_t *__defcook,
const La_ppc32_regs *__inregs,
La_ppc32_retval *__outregs,
const char *symname);
__END_DECLS

173
sysdeps/powerpc/powerpc32/dl-machine.h
View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. PowerPC version.
Copyright (C) 1995-2002, 2003 Free Software Foundation, Inc.
Copyright (C) 1995-2002, 2003, 2005 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
@ -100,160 +100,6 @@ elf_machine_load_address (void)
/* The PLT uses Elf32_Rela relocs. */
#define elf_machine_relplt elf_machine_rela
/* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. It is called
from code built in the PLT by elf_machine_runtime_setup. */
#if !defined PROF
#define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\n\
.section \".text\" \n\
.align 2 \n\
.globl _dl_runtime_resolve \n\
.type _dl_runtime_resolve,@function \n\
_dl_runtime_resolve: \n\
# We need to save the registers used to pass parameters, and register 0,\n\
# which is used by _mcount; the registers are saved in a stack frame.\n\
stwu 1,-64(1) \n\
stw 0,12(1) \n\
stw 3,16(1) \n\
stw 4,20(1) \n\
# The code that calls this has put parameters for `fixup' in r12 and r11.\n\
mr 3,12 \n\
stw 5,24(1) \n\
mr 4,11 \n\
stw 6,28(1) \n\
mflr 0 \n\
# We also need to save some of the condition register fields.\n\
stw 7,32(1) \n\
stw 0,48(1) \n\
stw 8,36(1) \n\
mfcr 0 \n\
stw 9,40(1) \n\
stw 10,44(1) \n\
stw 0,8(1) \n\
bl fixup@local \n\
# 'fixup' returns the address we want to branch to.\n\
mtctr 3 \n\
# Put the registers back...\n\
lwz 0,48(1) \n\
lwz 10,44(1) \n\
lwz 9,40(1) \n\
mtlr 0 \n\
lwz 8,36(1) \n\
lwz 0,8(1) \n\
lwz 7,32(1) \n\
lwz 6,28(1) \n\
mtcrf 0xFF,0 \n\
lwz 5,24(1) \n\
lwz 4,20(1) \n\
lwz 3,16(1) \n\
lwz 0,12(1) \n\
# ...unwind the stack frame, and jump to the PLT entry we updated.\n\
addi 1,1,64 \n\
bctr \n\
.size _dl_runtime_resolve,.-_dl_runtime_resolve \n\
\n\
.align 2 \n\
.globl _dl_prof_resolve \n\
.type _dl_prof_resolve,@function \n\
_dl_prof_resolve: \n\
# We need to save the registers used to pass parameters, and register 0,\n\
# which is used by _mcount; the registers are saved in a stack frame.\n\
stwu 1,-64(1) \n\
stw 0,12(1) \n\
stw 3,16(1) \n\
stw 4,20(1) \n\
# The code that calls this has put parameters for `fixup' in r12 and r11.\n\
mr 3,12 \n\
stw 5,24(1) \n\
mr 4,11 \n\
stw 6,28(1) \n\
mflr 5 \n\
# We also need to save some of the condition register fields.\n\
stw 7,32(1) \n\
stw 5,48(1) \n\
stw 8,36(1) \n\
mfcr 0 \n\
stw 9,40(1) \n\
stw 10,44(1) \n\
stw 0,8(1) \n\
bl profile_fixup@local \n\
# 'fixup' returns the address we want to branch to.\n\
mtctr 3 \n\
# Put the registers back...\n\
lwz 0,48(1) \n\
lwz 10,44(1) \n\
lwz 9,40(1) \n\
mtlr 0 \n\
lwz 8,36(1) \n\
lwz 0,8(1) \n\
lwz 7,32(1) \n\
lwz 6,28(1) \n\
mtcrf 0xFF,0 \n\
lwz 5,24(1) \n\
lwz 4,20(1) \n\
lwz 3,16(1) \n\
lwz 0,12(1) \n\
# ...unwind the stack frame, and jump to the PLT entry we updated.\n\
addi 1,1,64 \n\
bctr \n\
.size _dl_prof_resolve,.-_dl_prof_resolve \n\
# Undo '.section text'.\n\
.previous \n\
");
#else
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\n\
.section \".text\" \n\
.align 2 \n\
.globl _dl_runtime_resolve \n\
.globl _dl_prof_resolve \n\
.type _dl_runtime_resolve,@function \n\
.type _dl_prof_resolve,@function \n\
_dl_runtime_resolve: \n\
_dl_prof_resolve: \n\
# We need to save the registers used to pass parameters, and register 0,\n\
# which is used by _mcount; the registers are saved in a stack frame.\n\
stwu 1,-64(1) \n\
stw 0,12(1) \n\
stw 3,16(1) \n\
stw 4,20(1) \n\
# The code that calls this has put parameters for `fixup' in r12 and r11.\n\
mr 3,12 \n\
stw 5,24(1) \n\
mr 4,11 \n\
stw 6,28(1) \n\
mflr 0 \n\
# We also need to save some of the condition register fields.\n\
stw 7,32(1) \n\
stw 0,48(1) \n\
stw 8,36(1) \n\
mfcr 0 \n\
stw 9,40(1) \n\
stw 10,44(1) \n\
stw 0,8(1) \n\
bl fixup@local \n\
# 'fixup' returns the address we want to branch to.\n\
mtctr 3 \n\
# Put the registers back...\n\
lwz 0,48(1) \n\
lwz 10,44(1) \n\
lwz 9,40(1) \n\
mtlr 0 \n\
lwz 8,36(1) \n\
lwz 0,8(1) \n\
lwz 7,32(1) \n\
lwz 6,28(1) \n\
mtcrf 0xFF,0 \n\
lwz 5,24(1) \n\
lwz 4,20(1) \n\
lwz 3,16(1) \n\
lwz 0,12(1) \n\
# ...unwind the stack frame, and jump to the PLT entry we updated.\n\
addi 1,1,64 \n\
bctr \n\
.size _dl_runtime_resolve,.-_dl_runtime_resolve \n\
");
#endif
/* Mask identifying addresses reserved for the user program,
where the dynamic linker should not map anything. */
#define ELF_MACHINE_USER_ADDRESS_MASK 0xf0000000UL
@ -328,9 +174,14 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rela *reloc,
return value + reloc->r_addend;
}
/* Names of the architecture-specific auditing callback functions. */
#define ARCH_LA_PLTENTER ppc32_gnu_pltenter
#define ARCH_LA_PLTEXIT ppc32_gnu_pltexit
#endif /* dl_machine_h */
#ifdef RESOLVE
#ifdef RESOLVE_MAP
/* Do the actual processing of a reloc, once its target address
has been determined. */
@ -381,16 +232,8 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
value = map->l_addr;
else
{
# if defined USE_TLS && !defined RTLD_BOOTSTRAP
sym_map = RESOLVE_MAP (&sym, version, r_type);
value = sym == NULL ? 0 : sym_map->l_addr + sym->st_value;
# else
value = RESOLVE (&sym, version, r_type);
# ifndef RTLD_BOOTSTRAP
if (sym != NULL)
# endif
value += sym->st_value;
# endif
}
value += reloc->r_addend;
#else
@ -474,4 +317,4 @@ elf_machine_lazy_rel (struct link_map *map,
DT_RELA table. */
#define ELF_MACHINE_PLTREL_OVERLAP 1
#endif /* RESOLVE */
#endif /* RESOLVE_MAP */

113
sysdeps/powerpc/powerpc32/dl-trampoline.S Normal file
View File

@ -0,0 +1,113 @@
/* PLT trampolines. PPC32 version.
Copyright (C) 2005 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, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <sysdep.h>
.section ".text"
.align 2
.globl _dl_runtime_resolve
.type _dl_runtime_resolve,@function
_dl_runtime_resolve:
# We need to save the registers used to pass parameters, and register 0,
# which is used by _mcount; the registers are saved in a stack frame.
stwu 1,-64(1)
stw 0,12(1)
stw 3,16(1)
stw 4,20(1)
# The code that calls this has put parameters for `fixup' in r12 and r11.
mr 3,12
stw 5,24(1)
mr 4,11
stw 6,28(1)
mflr 0
# We also need to save some of the condition register fields
stw 7,32(1)
stw 0,48(1)
stw 8,36(1)
mfcr 0
stw 9,40(1)
stw 10,44(1)
stw 0,8(1)
bl _dl_fixup@local
# 'fixup' returns the address we want to branch to.
mtctr 3
# Put the registers back...
lwz 0,48(1)
lwz 10,44(1)
lwz 9,40(1)
mtlr 0
lwz 8,36(1)
lwz 0,8(1)
lwz 7,32(1)
lwz 6,28(1)
mtcrf 0xFF,0
lwz 5,24(1)
lwz 4,20(1)
lwz 3,16(1)
lwz 0,12(1)
# ...unwind the stack frame, and jump to the PLT entry we updated.
addi 1,1,64
bctr
.size _dl_runtime_resolve,.-_dl_runtime_resolve
.align 2
.globl _dl_prof_resolve
.type _dl_prof_resolve,@function
_dl_prof_resolve:
# We need to save the registers used to pass parameters, and register 0,
# which is used by _mcount; the registers are saved in a stack frame.
stwu 1,-64(1)
stw 0,12(1)
stw 3,16(1)
stw 4,20(1)
# The code that calls this has put parameters for `fixup' in r12 and r11.
mr 3,12
stw 5,24(1)
mr 4,11
stw 6,28(1)
mflr 5
# We also need to save some of the condition register fields.
stw 7,32(1)
stw 5,48(1)
stw 8,36(1)
mfcr 0
stw 9,40(1)
stw 10,44(1)
stw 0,8(1)
bl _dl_profile_fixup@local
# 'fixup' returns the address we want to branch to.
mtctr 3
# Put the registers back...
lwz 0,48(1)
lwz 10,44(1)
lwz 9,40(1)
mtlr 0
lwz 8,36(1)
lwz 0,8(1)
lwz 7,32(1)
lwz 6,28(1)
mtcrf 0xFF,0
lwz 5,24(1)
lwz 4,20(1)
lwz 3,16(1)
lwz 0,12(1)
# ...unwind the stack frame, and jump to the PLT entry we updated.
addi 1,1,64
bctr
.size _dl_prof_resolve,.-_dl_prof_resolve

44
sysdeps/powerpc/powerpc64/bits/link.h
View File

@ -23,11 +23,49 @@
#if __ELF_NATIVE_CLASS == 32
#error "fill in ppc32 data"
/* Registers for entry into PLT on PPC32. */
typedef struct La_ppc32_regs
{
uint64_t lr_reg[8];
double lr_fp[8];
uint32_t lr_vreg[12][4];
uint64_t lr_r1;
uint64_t lr_lr;
} La_ppc32_regs;
/* Return values for calls from PLT on PPC32. */
typedef struct La_ppc32_retval
{
uint64_t lrv_r3;
uint64_t lrv_r4;
double lrv_fp[8];
uint32_t lrv_v2[4];
} La_ppc32_retval;
__BEGIN_DECLS
extern Elf32_Addr la_ppc32_gnu_pltenter (Elf32_Sym *__sym,
unsigned int __ndx,
uintptr_t *__refcook,
uintptr_t *__defcook,
La_ppc32_regs *__regs,
unsigned int *__flags,
const char *__symname,
long int *__framesizep);
extern unsigned int la_ppc32_gnu_pltexit (Elf32_Sym *__sym,
unsigned int __ndx,
uintptr_t *__refcook,
uintptr_t *__defcook,
const La_ppc32_regs *__inregs,
La_ppc32_retval *__outregs,
const char *symname);
__END_DECLS
#else
/* Registers for entry into PLT on x86-64. */
/* Registers for entry into PLT on PPC64. */
typedef struct La_ppc64_regs
{
uint64_t lr_reg[8];
@ -37,7 +75,7 @@ typedef struct La_ppc64_regs
uint64_t lr_lr;
} La_ppc64_regs;
/* Return values for calls from PLT on x86-64. */
/* Return values for calls from PLT on PPC64. */
typedef struct La_ppc64_retval
{
uint64_t lrv_r3;