2001-11-16 02:27:24 +01:00
|
|
|
|
/* Subroutines needed for unwinding stack frames for exception handling. */
|
|
|
|
|
/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
|
|
|
|
|
Contributed by Jason Merrill <jason@cygnus.com>.
|
|
|
|
|
|
|
|
|
|
This file is part of GNU CC.
|
|
|
|
|
|
|
|
|
|
GNU CC 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 2, or (at your option)
|
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
In addition to the permissions in the GNU General Public License, the
|
|
|
|
|
Free Software Foundation gives you unlimited permission to link the
|
|
|
|
|
compiled version of this file into combinations with other programs,
|
|
|
|
|
and to distribute those combinations without any restriction coming
|
|
|
|
|
from the use of this file. (The General Public License restrictions
|
|
|
|
|
do apply in other respects; for example, they cover modification of
|
|
|
|
|
the file, and distribution when not linked into a combine
|
|
|
|
|
executable.)
|
|
|
|
|
|
|
|
|
|
GNU CC 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.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with GNU CC; see the file COPYING. If not, write to
|
|
|
|
|
the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
# include <shlib-compat.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#if !defined _LIBC || SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2_5)
|
|
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <bits/libc-lock.h>
|
|
|
|
|
#include <dwarf2.h>
|
|
|
|
|
#include <unwind.h>
|
|
|
|
|
#define NO_BASE_OF_ENCODED_VALUE
|
|
|
|
|
#include <unwind-pe.h>
|
|
|
|
|
#include <unwind-dw2-fde.h>
|
|
|
|
|
#else
|
|
|
|
|
#include "tconfig.h"
|
|
|
|
|
#include "tsystem.h"
|
|
|
|
|
#include "dwarf2.h"
|
|
|
|
|
#include "unwind.h"
|
|
|
|
|
#define NO_BASE_OF_ENCODED_VALUE
|
|
|
|
|
#include "unwind-pe.h"
|
|
|
|
|
#include "unwind-dw2-fde.h"
|
|
|
|
|
#include "gthr.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* The unseen_objects list contains objects that have been registered
|
|
|
|
|
but not yet categorized in any way. The seen_objects list has had
|
|
|
|
|
it's pc_begin and count fields initialized at minimum, and is sorted
|
|
|
|
|
by decreasing value of pc_begin. */
|
|
|
|
|
static struct object *unseen_objects;
|
|
|
|
|
static struct object *seen_objects;
|
|
|
|
|
|
|
|
|
|
#ifdef _LIBC
|
|
|
|
|
|
2001-11-16 02:43:09 +01:00
|
|
|
|
__libc_lock_define_initialized (static, object_mutex)
|
2001-11-16 02:27:24 +01:00
|
|
|
|
#define init_object_mutex_once()
|
2001-11-16 02:43:09 +01:00
|
|
|
|
#define __gthread_mutex_lock(m) __libc_lock_lock (*(m))
|
|
|
|
|
#define __gthread_mutex_unlock(m) __libc_lock_unlock (*(m))
|
2001-11-16 02:27:24 +01:00
|
|
|
|
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
void __register_frame_info_bases_internal (void *begin, struct object *ob,
|
|
|
|
|
void *tbase, void *dbase);
|
|
|
|
|
void __register_frame_info_table_bases_internal (void *begin,
|
|
|
|
|
struct object *ob,
|
|
|
|
|
void *tbase, void *dbase);
|
|
|
|
|
void *__deregister_frame_info_bases_internal (void *begin);
|
|
|
|
|
|
2001-11-16 02:27:24 +01:00
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
#ifdef __GTHREAD_MUTEX_INIT
|
|
|
|
|
static __gthread_mutex_t object_mutex = __GTHREAD_MUTEX_INIT;
|
|
|
|
|
#else
|
|
|
|
|
static __gthread_mutex_t object_mutex;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef __GTHREAD_MUTEX_INIT_FUNCTION
|
|
|
|
|
static void
|
|
|
|
|
init_object_mutex (void)
|
|
|
|
|
{
|
|
|
|
|
__GTHREAD_MUTEX_INIT_FUNCTION (&object_mutex);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
init_object_mutex_once (void)
|
|
|
|
|
{
|
|
|
|
|
static __gthread_once_t once = __GTHREAD_ONCE_INIT;
|
|
|
|
|
__gthread_once (&once, init_object_mutex);
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
#define init_object_mutex_once()
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#endif /* _LIBC */
|
|
|
|
|
|
|
|
|
|
/* Called from crtbegin.o to register the unwind info for an object. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
__register_frame_info_bases (void *begin, struct object *ob,
|
|
|
|
|
void *tbase, void *dbase)
|
|
|
|
|
{
|
2002-01-08 07:28:46 +01:00
|
|
|
|
/* If .eh_frame is empty, don't register at all. */
|
|
|
|
|
if (*(uword *)begin == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
2001-11-16 02:27:24 +01:00
|
|
|
|
ob->pc_begin = (void *)-1;
|
|
|
|
|
ob->tbase = tbase;
|
|
|
|
|
ob->dbase = dbase;
|
|
|
|
|
ob->u.single = begin;
|
|
|
|
|
ob->s.i = 0;
|
|
|
|
|
ob->s.b.encoding = DW_EH_PE_omit;
|
|
|
|
|
|
|
|
|
|
init_object_mutex_once ();
|
|
|
|
|
__gthread_mutex_lock (&object_mutex);
|
|
|
|
|
|
|
|
|
|
ob->next = unseen_objects;
|
|
|
|
|
unseen_objects = ob;
|
|
|
|
|
|
|
|
|
|
__gthread_mutex_unlock (&object_mutex);
|
|
|
|
|
}
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
INTDEF(__register_frame_info_bases)
|
2001-11-16 02:27:24 +01:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
__register_frame_info (void *begin, struct object *ob)
|
|
|
|
|
{
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
INTUSE(__register_frame_info_bases) (begin, ob, 0, 0);
|
2001-11-16 02:27:24 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
__register_frame (void *begin)
|
|
|
|
|
{
|
2002-01-08 07:28:46 +01:00
|
|
|
|
struct object *ob;
|
|
|
|
|
|
|
|
|
|
/* If .eh_frame is empty, don't register at all. */
|
|
|
|
|
if (*(uword *)begin == 0)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
ob = (struct object *) malloc (sizeof (struct object));
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
INTUSE(__register_frame_info_bases) (begin, ob, 0, 0);
|
2001-11-16 02:27:24 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Similar, but BEGIN is actually a pointer to a table of unwind entries
|
|
|
|
|
for different translation units. Called from the file generated by
|
|
|
|
|
collect2. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
__register_frame_info_table_bases (void *begin, struct object *ob,
|
|
|
|
|
void *tbase, void *dbase)
|
|
|
|
|
{
|
|
|
|
|
ob->pc_begin = (void *)-1;
|
|
|
|
|
ob->tbase = tbase;
|
|
|
|
|
ob->dbase = dbase;
|
|
|
|
|
ob->u.array = begin;
|
|
|
|
|
ob->s.i = 0;
|
|
|
|
|
ob->s.b.from_array = 1;
|
|
|
|
|
ob->s.b.encoding = DW_EH_PE_omit;
|
|
|
|
|
|
|
|
|
|
init_object_mutex_once ();
|
|
|
|
|
__gthread_mutex_lock (&object_mutex);
|
|
|
|
|
|
|
|
|
|
ob->next = unseen_objects;
|
|
|
|
|
unseen_objects = ob;
|
|
|
|
|
|
|
|
|
|
__gthread_mutex_unlock (&object_mutex);
|
|
|
|
|
}
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
INTDEF(__register_frame_info_table_bases)
|
2001-11-16 02:27:24 +01:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
__register_frame_info_table (void *begin, struct object *ob)
|
|
|
|
|
{
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
INTUSE(__register_frame_info_table_bases) (begin, ob, 0, 0);
|
2001-11-16 02:27:24 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
__register_frame_table (void *begin)
|
|
|
|
|
{
|
|
|
|
|
struct object *ob = (struct object *) malloc (sizeof (struct object));
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
INTUSE(__register_frame_info_table_bases) (begin, ob, 0, 0);
|
2001-11-16 02:27:24 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Called from crtbegin.o to deregister the unwind info for an object. */
|
|
|
|
|
/* ??? Glibc has for a while now exported __register_frame_info and
|
|
|
|
|
__deregister_frame_info. If we call __register_frame_info_bases
|
|
|
|
|
from crtbegin (wherein it is declared weak), and this object does
|
|
|
|
|
not get pulled from libgcc.a for other reasons, then the
|
|
|
|
|
invocation of __deregister_frame_info will be resolved from glibc.
|
|
|
|
|
Since the registration did not happen there, we'll abort.
|
|
|
|
|
|
|
|
|
|
Therefore, declare a new deregistration entry point that does the
|
|
|
|
|
exact same thing, but will resolve to the same library as
|
|
|
|
|
implements __register_frame_info_bases. */
|
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
|
__deregister_frame_info_bases (void *begin)
|
|
|
|
|
{
|
|
|
|
|
struct object **p;
|
|
|
|
|
struct object *ob = 0;
|
|
|
|
|
|
2002-01-08 07:28:46 +01:00
|
|
|
|
/* If .eh_frame is empty, we haven't registered. */
|
|
|
|
|
if (*(uword *)begin == 0)
|
|
|
|
|
return ob;
|
|
|
|
|
|
2001-11-16 02:27:24 +01:00
|
|
|
|
init_object_mutex_once ();
|
|
|
|
|
__gthread_mutex_lock (&object_mutex);
|
|
|
|
|
|
|
|
|
|
for (p = &unseen_objects; *p ; p = &(*p)->next)
|
|
|
|
|
if ((*p)->u.single == begin)
|
|
|
|
|
{
|
|
|
|
|
ob = *p;
|
|
|
|
|
*p = ob->next;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (p = &seen_objects; *p ; p = &(*p)->next)
|
|
|
|
|
if ((*p)->s.b.sorted)
|
|
|
|
|
{
|
|
|
|
|
if ((*p)->u.sort->orig_data == begin)
|
|
|
|
|
{
|
|
|
|
|
ob = *p;
|
|
|
|
|
*p = ob->next;
|
|
|
|
|
free (ob->u.sort);
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if ((*p)->u.single == begin)
|
|
|
|
|
{
|
|
|
|
|
ob = *p;
|
|
|
|
|
*p = ob->next;
|
|
|
|
|
goto out;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__gthread_mutex_unlock (&object_mutex);
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
out:
|
|
|
|
|
__gthread_mutex_unlock (&object_mutex);
|
|
|
|
|
return (void *) ob;
|
|
|
|
|
}
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
INTDEF(__deregister_frame_info_bases)
|
2001-11-16 02:27:24 +01:00
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
|
__deregister_frame_info (void *begin)
|
|
|
|
|
{
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
return INTUSE(__deregister_frame_info_bases) (begin);
|
2001-11-16 02:27:24 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
__deregister_frame (void *begin)
|
|
|
|
|
{
|
2002-01-08 07:28:46 +01:00
|
|
|
|
/* If .eh_frame is empty, we haven't registered. */
|
|
|
|
|
if (*(uword *)begin != 0)
|
Update.
2002-05-11 Jakub Jelinek <jakub@redhat.com>
* include/netinet/in.h (bindresvport_internal): Add prototype.
* include/rpc/auth.h (authunix_create_internal,
authunix_create_default_internal, authnone_create_internal,
authdes_pk_create_internal): Add prototypes.
* include/rpc/clnt.h (clnt_create_internal, clnttcp_create_internal,
clntudp_create_internal, clntudp_bufcreate_internal,
clntunix_create_internal): Add prototypes.
* include/rpc/svc.h (svc_sendreply_internal, svcerr_decode_internal,
svc_getreq_internal, svc_getreq_common_internal,
svc_getreqset_internal, svc_getreq_poll_internal,
svc_register_internal, svc_unregister_internal,
svcudp_create_internal, svcudp_bufcreate_internal): Add prototypes.
* include/rpc/svc_auth.h (_authenticate_internal): Add prototype.
* include/sys/socket.h (__sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname, __bind, __listen): Add prototypes.
* inet/rexec.c (rexec_af): Use __listen and __getsockname.
* inet/rcmd.c (rcmd_af): Use __listen.
(rresvport_af): Use __bind.
* sunrpc/clnt_udp.c: Use INTUSE calls to bindresvport,
authunix_create, authunix_create_default, authnone_create,
authdes_pk_create, clnt_create, clnttcp_create, clntudp_create,
clntudp_bufcreate, clntunix_create svc_sendreply, svcerr_decode,
svc_getreq, svc_getreq_common, svc_getreqset, svc_getreq_poll,
svc_register, svc_unregister, svcudp_create, svcudp_bufcreate,
_authenticate, add INTDEF after such function definitions.
Use __listen, __bind, __sendto, __recvfrom, __sendmsg, __recvmsg,
__setsockopt, __getsockname instead of non-__ variants.
* sunrpc/pmap_rmt.c: Likewise.
* sunrpc/rtime.c: Likewise.
* sunrpc/svc_udp.c: Likewise.
* sunrpc/clnt_unix.c: Likewise.
* sunrpc/svc_unix.c: Likewise.
* sunrpc/bindrsvprt.c: Likewise.
* sunrpc/svc_tcp.c: Likewise.
* sunrpc/auth_none.c: Likewise.
* sunrpc/clnt_raw.c: Likewise.
* sunrpc/clnt_tcp.c: Likewise.
* sunrpc/auth_unix.c: Likewise.
* sunrpc/key_call.c: Likewise.
* sunrpc/clnt_gen.c: Likewise.
* sunrpc/pm_getmaps.c: Likewise.
* sunrpc/clnt_simp.c: Likewise.
* sunrpc/pmap_clnt.c: Likewise.
* sunrpc/svc_run.c: Likewise.
* sunrpc/svc.c: Likewise.
* sunrpc/svc_simple.c: Likewise.
* sunrpc/pm_getport.c: Likewise.
* sunrpc/auth_des.c: Likewise.
* sunrpc/svc_auth.c: Likewise.
* sysdeps/generic/unwind-dw2-fde.c (__register_frame_info_bases,
__register_frame_info_table_bases, __deregister_frame_info_bases):
Add INTDEF.
(__register_frame_info_bases_internal,
__register_frame_info_table_bases_internal,
__deregister_frame_info_bases_internal): Add prototypes.
(__register_frame_info, __register_frame): Use INTUSE in call to
__register_frame_info_bases.
(__register_frame_info_table): Similarly.
(__deregister_frame_info, __deregister_frame): Similarly.
* sysdeps/generic/sendto.c (__sendto): Renamed from sendto, add
sendto as weak alias.
* sysdeps/mach/hurd/sendto.c: Likewise.
* sysdeps/generic/recvfrom.c (__recvfrom): Renamed from recvfrom, add
recvfrom as weak alias.
* sysdeps/mach/hurd/recvfrom.c: Likewise.
* sysdeps/unix/sysv/aix/recvfrom.c: Likewise.
* sysdeps/generic/recvmsg.c (__recvmsg): Renamed from recvmsg, add
recvmsg as weak alias.
* sysdeps/unix/sysv/aix/recvmsg.c: Likewise.
* sysdeps/generic/sendmsg.c (__sendmsg): Renamed from sendmsg, add
sendmsg as weak alias.
* sysdeps/unix/sysv/aix/sendmsg.c: Likewise.
* sysdeps/generic/setsockopt.c (__setsockopt): Renamed from
setsockopt, add setsockopt as weak alias.
* sysdeps/mach/hurd/setsockopt.c: Likewise.
* sysdeps/generic/bind.c (__bind): Renamed from bind, add bind as
weak alias.
* sysdeps/mach/hurd/bind.c: Likewise.
* sysdeps/generic/listen.c (__listen): Renamed from listen, add listen
as weak alias.
* sysdeps/mach/hurd/listen.c: Likewise.
* sysdeps/generic/getsockname.c (__getsockname): Renamed from
getsockname, add getsockname as weak alias.
* sysdeps/mach/hurd/getsockname.c: Likewise.
* sysdeps/unix/sysv/aix/getsockname.c: Likewise.
* sysdeps/mach/hurd/recvmsg.c (__recvmsg): Add weak alias.
* sysdeps/mach/hurd/sendmsg.c (__sendmsg): Add weak alias.
* sysdeps/unix/inet/syscalls.list (__bind, __listen, __recvmsg,
__recvfrom, __sendmsg, __sendto, __setsockopt): Add aliases.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (__recvmsg, __sendmsg):
Add aliases.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S (__recvfrom): Add weak alias.
* sysdeps/unix/sysv/linux/recvmsg.S (__recvmsg): Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S (__sendmsg): Likewise.
* sysdeps/unix/sysv/linux/sendto.S (__sendto): Likewise.
* sysdeps/unix/sysv/linux/setsockopt.S (__setsockopt): Likewise.
* sysdeps/unix/sysv/linux/bind.S (__bind): Likewise.
* sysdeps/unix/sysv/linux/listen.S (__listen): Likewise.
* sysdeps/unix/sysv/linux/getsockname.S (__getsockname): Likewise.
2002-05-10 Jakub Jelinek <jakub@redhat.com>
* locale/programs/localedef.h (show_archive_content): Add verbose
argument.
* locale/programs/localedef.c (main): Adjust caller.
* locale/programs/locarchive.c (struct nameent, struct dataent): New.
(nameentcmp, dataentcmp): New functions.
(xstrcmp): Remove.
(show_archive_content): Print verbose listing with --list-archive -v.
* locale/programs/locarchive.c (open_archive): Take extra argument
readonly. If true open file with O_RDONLY and don't create the
archive if it doesn't exist.
Adapt all callers.
(close_archive): Don't do anything if fd element is -1.
* locale/programs/localedef.h (open_archive): Adjust prototype.
* locale/programs/locfile.c (write_all_categories): Adjust open_archive
call.
* malloc/malloc.c (__posix_memalign): Correct check for size of
alignment value [PR libc/3444].
2002-05-15 02:22:23 +02:00
|
|
|
|
free (INTUSE(__deregister_frame_info_bases) (begin));
|
2001-11-16 02:27:24 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Like base_of_encoded_value, but take the base from a struct object
|
|
|
|
|
instead of an _Unwind_Context. */
|
|
|
|
|
|
|
|
|
|
static _Unwind_Ptr
|
|
|
|
|
base_from_object (unsigned char encoding, struct object *ob)
|
|
|
|
|
{
|
|
|
|
|
if (encoding == DW_EH_PE_omit)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
switch (encoding & 0x70)
|
|
|
|
|
{
|
|
|
|
|
case DW_EH_PE_absptr:
|
|
|
|
|
case DW_EH_PE_pcrel:
|
|
|
|
|
case DW_EH_PE_aligned:
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
case DW_EH_PE_textrel:
|
|
|
|
|
return (_Unwind_Ptr) ob->tbase;
|
|
|
|
|
case DW_EH_PE_datarel:
|
|
|
|
|
return (_Unwind_Ptr) ob->dbase;
|
|
|
|
|
}
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the FDE pointer encoding from the CIE. */
|
|
|
|
|
/* ??? This is a subset of extract_cie_info from unwind-dw2.c. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
get_cie_encoding (struct dwarf_cie *cie)
|
|
|
|
|
{
|
|
|
|
|
const unsigned char *aug, *p;
|
|
|
|
|
_Unwind_Ptr dummy;
|
|
|
|
|
|
|
|
|
|
aug = cie->augmentation;
|
|
|
|
|
if (aug[0] != 'z')
|
|
|
|
|
return DW_EH_PE_absptr;
|
|
|
|
|
|
|
|
|
|
p = aug + strlen (aug) + 1; /* Skip the augmentation string. */
|
|
|
|
|
p = read_uleb128 (p, &dummy); /* Skip code alignment. */
|
|
|
|
|
p = read_sleb128 (p, &dummy); /* Skip data alignment. */
|
|
|
|
|
p++; /* Skip return address column. */
|
|
|
|
|
|
|
|
|
|
aug++; /* Skip 'z' */
|
|
|
|
|
p = read_uleb128 (p, &dummy); /* Skip augmentation length. */
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
/* This is what we're looking for. */
|
|
|
|
|
if (*aug == 'R')
|
|
|
|
|
return *p;
|
|
|
|
|
/* Personality encoding and pointer. */
|
|
|
|
|
else if (*aug == 'P')
|
|
|
|
|
{
|
|
|
|
|
/* ??? Avoid dereferencing indirect pointers, since we're
|
|
|
|
|
faking the base address. Gotta keep DW_EH_PE_aligned
|
|
|
|
|
intact, however. */
|
|
|
|
|
p = read_encoded_value_with_base (*p & 0x7F, 0, p + 1, &dummy);
|
|
|
|
|
}
|
|
|
|
|
/* LSDA encoding. */
|
|
|
|
|
else if (*aug == 'L')
|
|
|
|
|
p++;
|
|
|
|
|
/* Otherwise end of string, or unknown augmentation. */
|
|
|
|
|
else
|
|
|
|
|
return DW_EH_PE_absptr;
|
|
|
|
|
aug++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
|
get_fde_encoding (struct dwarf_fde *f)
|
|
|
|
|
{
|
|
|
|
|
return get_cie_encoding (get_cie (f));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Sorting an array of FDEs by address.
|
|
|
|
|
(Ideally we would have the linker sort the FDEs so we don't have to do
|
|
|
|
|
it at run time. But the linkers are not yet prepared for this.) */
|
|
|
|
|
|
|
|
|
|
/* Comparison routines. Three variants of increasing complexity. */
|
|
|
|
|
|
|
|
|
|
static saddr
|
|
|
|
|
fde_unencoded_compare (struct object *ob __attribute__((unused)),
|
|
|
|
|
fde *x, fde *y)
|
|
|
|
|
{
|
|
|
|
|
return *(saddr *)x->pc_begin - *(saddr *)y->pc_begin;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static saddr
|
|
|
|
|
fde_single_encoding_compare (struct object *ob, fde *x, fde *y)
|
|
|
|
|
{
|
|
|
|
|
_Unwind_Ptr base, x_ptr, y_ptr;
|
|
|
|
|
|
|
|
|
|
base = base_from_object (ob->s.b.encoding, ob);
|
|
|
|
|
read_encoded_value_with_base (ob->s.b.encoding, base, x->pc_begin, &x_ptr);
|
|
|
|
|
read_encoded_value_with_base (ob->s.b.encoding, base, y->pc_begin, &y_ptr);
|
|
|
|
|
|
|
|
|
|
return x_ptr - y_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static saddr
|
|
|
|
|
fde_mixed_encoding_compare (struct object *ob, fde *x, fde *y)
|
|
|
|
|
{
|
|
|
|
|
int x_encoding, y_encoding;
|
|
|
|
|
_Unwind_Ptr x_ptr, y_ptr;
|
|
|
|
|
|
|
|
|
|
x_encoding = get_fde_encoding (x);
|
|
|
|
|
read_encoded_value_with_base (x_encoding, base_from_object (x_encoding, ob),
|
|
|
|
|
x->pc_begin, &x_ptr);
|
|
|
|
|
|
|
|
|
|
y_encoding = get_fde_encoding (y);
|
|
|
|
|
read_encoded_value_with_base (y_encoding, base_from_object (y_encoding, ob),
|
|
|
|
|
y->pc_begin, &y_ptr);
|
|
|
|
|
|
|
|
|
|
return x_ptr - y_ptr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
typedef saddr (*fde_compare_t) (struct object *, fde *, fde *);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This is a special mix of insertion sort and heap sort, optimized for
|
|
|
|
|
the data sets that actually occur. They look like
|
|
|
|
|
101 102 103 127 128 105 108 110 190 111 115 119 125 160 126 129 130.
|
|
|
|
|
I.e. a linearly increasing sequence (coming from functions in the text
|
|
|
|
|
section), with additionally a few unordered elements (coming from functions
|
|
|
|
|
in gnu_linkonce sections) whose values are higher than the values in the
|
|
|
|
|
surrounding linear sequence (but not necessarily higher than the values
|
|
|
|
|
at the end of the linear sequence!).
|
|
|
|
|
The worst-case total run time is O(N) + O(n log (n)), where N is the
|
|
|
|
|
total number of FDEs and n is the number of erratic ones. */
|
|
|
|
|
|
|
|
|
|
struct fde_accumulator
|
|
|
|
|
{
|
|
|
|
|
struct fde_vector *linear;
|
|
|
|
|
struct fde_vector *erratic;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
|
start_fde_sort (struct fde_accumulator *accu, size_t count)
|
|
|
|
|
{
|
|
|
|
|
size_t size;
|
|
|
|
|
if (! count)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
size = sizeof (struct fde_vector) + sizeof (fde *) * count;
|
|
|
|
|
if ((accu->linear = (struct fde_vector *) malloc (size)))
|
|
|
|
|
{
|
|
|
|
|
accu->linear->count = 0;
|
|
|
|
|
if ((accu->erratic = (struct fde_vector *) malloc (size)))
|
|
|
|
|
accu->erratic->count = 0;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
fde_insert (struct fde_accumulator *accu, fde *this_fde)
|
|
|
|
|
{
|
|
|
|
|
if (accu->linear)
|
|
|
|
|
accu->linear->array[accu->linear->count++] = this_fde;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Split LINEAR into a linear sequence with low values and an erratic
|
|
|
|
|
sequence with high values, put the linear one (of longest possible
|
|
|
|
|
length) into LINEAR and the erratic one into ERRATIC. This is O(N).
|
|
|
|
|
|
|
|
|
|
Because the longest linear sequence we are trying to locate within the
|
|
|
|
|
incoming LINEAR array can be interspersed with (high valued) erratic
|
|
|
|
|
entries. We construct a chain indicating the sequenced entries.
|
|
|
|
|
To avoid having to allocate this chain, we overlay it onto the space of
|
|
|
|
|
the ERRATIC array during construction. A final pass iterates over the
|
|
|
|
|
chain to determine what should be placed in the ERRATIC array, and
|
|
|
|
|
what is the linear sequence. This overlay is safe from aliasing. */
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
fde_split (struct object *ob, fde_compare_t fde_compare,
|
|
|
|
|
struct fde_vector *linear, struct fde_vector *erratic)
|
|
|
|
|
{
|
|
|
|
|
static fde *marker;
|
|
|
|
|
size_t count = linear->count;
|
|
|
|
|
fde **chain_end = ▮
|
|
|
|
|
size_t i, j, k;
|
|
|
|
|
|
|
|
|
|
/* This should optimize out, but it is wise to make sure this assumption
|
|
|
|
|
is correct. Should these have different sizes, we cannot cast between
|
|
|
|
|
them and the overlaying onto ERRATIC will not work. */
|
|
|
|
|
if (sizeof (fde *) != sizeof (fde **))
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
|
{
|
|
|
|
|
fde **probe;
|
|
|
|
|
|
|
|
|
|
for (probe = chain_end;
|
|
|
|
|
probe != &marker && fde_compare (ob, linear->array[i], *probe) < 0;
|
|
|
|
|
probe = chain_end)
|
|
|
|
|
{
|
|
|
|
|
chain_end = (fde **)erratic->array[probe - linear->array];
|
|
|
|
|
erratic->array[probe - linear->array] = NULL;
|
|
|
|
|
}
|
|
|
|
|
erratic->array[i] = (fde *)chain_end;
|
|
|
|
|
chain_end = &linear->array[i];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Each entry in LINEAR which is part of the linear sequence we have
|
|
|
|
|
discovered will correspond to a non-NULL entry in the chain we built in
|
|
|
|
|
the ERRATIC array. */
|
|
|
|
|
for (i = j = k = 0; i < count; i++)
|
|
|
|
|
if (erratic->array[i])
|
|
|
|
|
linear->array[j++] = linear->array[i];
|
|
|
|
|
else
|
|
|
|
|
erratic->array[k++] = linear->array[i];
|
|
|
|
|
linear->count = j;
|
|
|
|
|
erratic->count = k;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This is O(n log(n)). BSD/OS defines heapsort in stdlib.h, so we must
|
|
|
|
|
use a name that does not conflict. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
frame_heapsort (struct object *ob, fde_compare_t fde_compare,
|
|
|
|
|
struct fde_vector *erratic)
|
|
|
|
|
{
|
|
|
|
|
/* For a description of this algorithm, see:
|
|
|
|
|
Samuel P. Harbison, Guy L. Steele Jr.: C, a reference manual, 2nd ed.,
|
|
|
|
|
p. 60-61. */
|
|
|
|
|
fde ** a = erratic->array;
|
|
|
|
|
/* A portion of the array is called a "heap" if for all i>=0:
|
|
|
|
|
If i and 2i+1 are valid indices, then a[i] >= a[2i+1].
|
|
|
|
|
If i and 2i+2 are valid indices, then a[i] >= a[2i+2]. */
|
|
|
|
|
#define SWAP(x,y) do { fde * tmp = x; x = y; y = tmp; } while (0)
|
|
|
|
|
size_t n = erratic->count;
|
|
|
|
|
size_t m = n;
|
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
|
|
while (m > 0)
|
|
|
|
|
{
|
|
|
|
|
/* Invariant: a[m..n-1] is a heap. */
|
|
|
|
|
m--;
|
|
|
|
|
for (i = m; 2*i+1 < n; )
|
|
|
|
|
{
|
|
|
|
|
if (2*i+2 < n
|
|
|
|
|
&& fde_compare (ob, a[2*i+2], a[2*i+1]) > 0
|
|
|
|
|
&& fde_compare (ob, a[2*i+2], a[i]) > 0)
|
|
|
|
|
{
|
|
|
|
|
SWAP (a[i], a[2*i+2]);
|
|
|
|
|
i = 2*i+2;
|
|
|
|
|
}
|
|
|
|
|
else if (fde_compare (ob, a[2*i+1], a[i]) > 0)
|
|
|
|
|
{
|
|
|
|
|
SWAP (a[i], a[2*i+1]);
|
|
|
|
|
i = 2*i+1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
while (n > 1)
|
|
|
|
|
{
|
|
|
|
|
/* Invariant: a[0..n-1] is a heap. */
|
|
|
|
|
n--;
|
|
|
|
|
SWAP (a[0], a[n]);
|
|
|
|
|
for (i = 0; 2*i+1 < n; )
|
|
|
|
|
{
|
|
|
|
|
if (2*i+2 < n
|
|
|
|
|
&& fde_compare (ob, a[2*i+2], a[2*i+1]) > 0
|
|
|
|
|
&& fde_compare (ob, a[2*i+2], a[i]) > 0)
|
|
|
|
|
{
|
|
|
|
|
SWAP (a[i], a[2*i+2]);
|
|
|
|
|
i = 2*i+2;
|
|
|
|
|
}
|
|
|
|
|
else if (fde_compare (ob, a[2*i+1], a[i]) > 0)
|
|
|
|
|
{
|
|
|
|
|
SWAP (a[i], a[2*i+1]);
|
|
|
|
|
i = 2*i+1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#undef SWAP
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Merge V1 and V2, both sorted, and put the result into V1. */
|
|
|
|
|
static inline void
|
|
|
|
|
fde_merge (struct object *ob, fde_compare_t fde_compare,
|
|
|
|
|
struct fde_vector *v1, struct fde_vector *v2)
|
|
|
|
|
{
|
|
|
|
|
size_t i1, i2;
|
|
|
|
|
fde * fde2;
|
|
|
|
|
|
|
|
|
|
i2 = v2->count;
|
|
|
|
|
if (i2 > 0)
|
|
|
|
|
{
|
|
|
|
|
i1 = v1->count;
|
|
|
|
|
do {
|
|
|
|
|
i2--;
|
|
|
|
|
fde2 = v2->array[i2];
|
|
|
|
|
while (i1 > 0 && fde_compare (ob, v1->array[i1-1], fde2) > 0)
|
|
|
|
|
{
|
|
|
|
|
v1->array[i1+i2] = v1->array[i1-1];
|
|
|
|
|
i1--;
|
|
|
|
|
}
|
|
|
|
|
v1->array[i1+i2] = fde2;
|
|
|
|
|
} while (i2 > 0);
|
|
|
|
|
v1->count += v2->count;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
end_fde_sort (struct object *ob, struct fde_accumulator *accu, size_t count)
|
|
|
|
|
{
|
|
|
|
|
fde_compare_t fde_compare;
|
|
|
|
|
|
|
|
|
|
if (accu->linear && accu->linear->count != count)
|
|
|
|
|
abort ();
|
|
|
|
|
|
|
|
|
|
if (ob->s.b.mixed_encoding)
|
|
|
|
|
fde_compare = fde_mixed_encoding_compare;
|
|
|
|
|
else if (ob->s.b.encoding == DW_EH_PE_absptr)
|
|
|
|
|
fde_compare = fde_unencoded_compare;
|
|
|
|
|
else
|
|
|
|
|
fde_compare = fde_single_encoding_compare;
|
|
|
|
|
|
|
|
|
|
if (accu->erratic)
|
|
|
|
|
{
|
|
|
|
|
fde_split (ob, fde_compare, accu->linear, accu->erratic);
|
|
|
|
|
if (accu->linear->count + accu->erratic->count != count)
|
|
|
|
|
abort ();
|
|
|
|
|
frame_heapsort (ob, fde_compare, accu->erratic);
|
|
|
|
|
fde_merge (ob, fde_compare, accu->linear, accu->erratic);
|
|
|
|
|
free (accu->erratic);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* We've not managed to malloc an erratic array,
|
|
|
|
|
so heap sort in the linear one. */
|
|
|
|
|
frame_heapsort (ob, fde_compare, accu->linear);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Update encoding, mixed_encoding, and pc_begin for OB for the
|
|
|
|
|
fde array beginning at THIS_FDE. Return the number of fdes
|
|
|
|
|
encountered along the way. */
|
|
|
|
|
|
|
|
|
|
static size_t
|
|
|
|
|
classify_object_over_fdes (struct object *ob, fde *this_fde)
|
|
|
|
|
{
|
|
|
|
|
struct dwarf_cie *last_cie = 0;
|
|
|
|
|
size_t count = 0;
|
|
|
|
|
int encoding = DW_EH_PE_absptr;
|
|
|
|
|
_Unwind_Ptr base = 0;
|
|
|
|
|
|
|
|
|
|
for (; this_fde->length != 0; this_fde = next_fde (this_fde))
|
|
|
|
|
{
|
|
|
|
|
struct dwarf_cie *this_cie;
|
|
|
|
|
_Unwind_Ptr mask, pc_begin;
|
|
|
|
|
|
|
|
|
|
/* Skip CIEs. */
|
|
|
|
|
if (this_fde->CIE_delta == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Determine the encoding for this FDE. Note mixed encoded
|
|
|
|
|
objects for later. */
|
|
|
|
|
this_cie = get_cie (this_fde);
|
|
|
|
|
if (this_cie != last_cie)
|
|
|
|
|
{
|
|
|
|
|
last_cie = this_cie;
|
|
|
|
|
encoding = get_cie_encoding (this_cie);
|
|
|
|
|
base = base_from_object (encoding, ob);
|
|
|
|
|
if (ob->s.b.encoding == DW_EH_PE_omit)
|
|
|
|
|
ob->s.b.encoding = encoding;
|
|
|
|
|
else if (ob->s.b.encoding != encoding)
|
|
|
|
|
ob->s.b.mixed_encoding = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
read_encoded_value_with_base (encoding, base, this_fde->pc_begin,
|
|
|
|
|
&pc_begin);
|
|
|
|
|
|
|
|
|
|
/* Take care to ignore link-once functions that were removed.
|
|
|
|
|
In these cases, the function address will be NULL, but if
|
|
|
|
|
the encoding is smaller than a pointer a true NULL may not
|
|
|
|
|
be representable. Assume 0 in the representable bits is NULL. */
|
|
|
|
|
mask = size_of_encoded_value (encoding);
|
|
|
|
|
if (mask < sizeof (void *))
|
|
|
|
|
mask = (1L << (mask << 3)) - 1;
|
|
|
|
|
else
|
|
|
|
|
mask = -1;
|
|
|
|
|
|
|
|
|
|
if ((pc_begin & mask) == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
count += 1;
|
|
|
|
|
if ((void *)pc_begin < ob->pc_begin)
|
|
|
|
|
ob->pc_begin = (void *)pc_begin;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
add_fdes (struct object *ob, struct fde_accumulator *accu, fde *this_fde)
|
|
|
|
|
{
|
|
|
|
|
struct dwarf_cie *last_cie = 0;
|
|
|
|
|
int encoding = ob->s.b.encoding;
|
|
|
|
|
_Unwind_Ptr base = base_from_object (ob->s.b.encoding, ob);
|
|
|
|
|
|
|
|
|
|
for (; this_fde->length != 0; this_fde = next_fde (this_fde))
|
|
|
|
|
{
|
|
|
|
|
struct dwarf_cie *this_cie;
|
|
|
|
|
|
|
|
|
|
/* Skip CIEs. */
|
|
|
|
|
if (this_fde->CIE_delta == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (ob->s.b.mixed_encoding)
|
|
|
|
|
{
|
|
|
|
|
/* Determine the encoding for this FDE. Note mixed encoded
|
|
|
|
|
objects for later. */
|
|
|
|
|
this_cie = get_cie (this_fde);
|
|
|
|
|
if (this_cie != last_cie)
|
|
|
|
|
{
|
|
|
|
|
last_cie = this_cie;
|
|
|
|
|
encoding = get_cie_encoding (this_cie);
|
|
|
|
|
base = base_from_object (encoding, ob);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (encoding == DW_EH_PE_absptr)
|
|
|
|
|
{
|
|
|
|
|
if (*(_Unwind_Ptr *)this_fde->pc_begin == 0)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
_Unwind_Ptr pc_begin, mask;
|
|
|
|
|
|
|
|
|
|
read_encoded_value_with_base (encoding, base, this_fde->pc_begin,
|
|
|
|
|
&pc_begin);
|
|
|
|
|
|
|
|
|
|
/* Take care to ignore link-once functions that were removed.
|
|
|
|
|
In these cases, the function address will be NULL, but if
|
|
|
|
|
the encoding is smaller than a pointer a true NULL may not
|
|
|
|
|
be representable. Assume 0 in the representable bits is NULL. */
|
|
|
|
|
mask = size_of_encoded_value (encoding);
|
|
|
|
|
if (mask < sizeof (void *))
|
|
|
|
|
mask = (1L << (mask << 3)) - 1;
|
|
|
|
|
else
|
|
|
|
|
mask = -1;
|
|
|
|
|
|
|
|
|
|
if ((pc_begin & mask) == 0)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fde_insert (accu, this_fde);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Set up a sorted array of pointers to FDEs for a loaded object. We
|
|
|
|
|
count up the entries before allocating the array because it's likely to
|
|
|
|
|
be faster. We can be called multiple times, should we have failed to
|
|
|
|
|
allocate a sorted fde array on a previous occasion. */
|
|
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
|
init_object (struct object* ob)
|
|
|
|
|
{
|
|
|
|
|
struct fde_accumulator accu;
|
|
|
|
|
size_t count;
|
|
|
|
|
|
|
|
|
|
count = ob->s.b.count;
|
|
|
|
|
if (count == 0)
|
|
|
|
|
{
|
|
|
|
|
if (ob->s.b.from_array)
|
|
|
|
|
{
|
|
|
|
|
fde **p = ob->u.array;
|
|
|
|
|
for (count = 0; *p; ++p)
|
|
|
|
|
count += classify_object_over_fdes (ob, *p);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
count = classify_object_over_fdes (ob, ob->u.single);
|
|
|
|
|
|
|
|
|
|
/* The count field we have in the main struct object is somewhat
|
|
|
|
|
limited, but should suffice for virtually all cases. If the
|
|
|
|
|
counted value doesn't fit, re-write a zero. The worst that
|
|
|
|
|
happens is that we re-count next time -- admittedly non-trivial
|
|
|
|
|
in that this implies some 2M fdes, but at least we function. */
|
|
|
|
|
ob->s.b.count = count;
|
|
|
|
|
if (ob->s.b.count != count)
|
|
|
|
|
ob->s.b.count = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!start_fde_sort (&accu, count))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (ob->s.b.from_array)
|
|
|
|
|
{
|
|
|
|
|
fde **p;
|
|
|
|
|
for (p = ob->u.array; *p; ++p)
|
|
|
|
|
add_fdes (ob, &accu, *p);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
add_fdes (ob, &accu, ob->u.single);
|
|
|
|
|
|
|
|
|
|
end_fde_sort (ob, &accu, count);
|
|
|
|
|
|
|
|
|
|
/* Save the original fde pointer, since this is the key by which the
|
|
|
|
|
DSO will deregister the object. */
|
|
|
|
|
accu.linear->orig_data = ob->u.single;
|
|
|
|
|
ob->u.sort = accu.linear;
|
|
|
|
|
|
|
|
|
|
ob->s.b.sorted = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* A linear search through a set of FDEs for the given PC. This is
|
|
|
|
|
used when there was insufficient memory to allocate and sort an
|
|
|
|
|
array. */
|
|
|
|
|
|
|
|
|
|
static fde *
|
|
|
|
|
linear_search_fdes (struct object *ob, fde *this_fde, void *pc)
|
|
|
|
|
{
|
|
|
|
|
struct dwarf_cie *last_cie = 0;
|
|
|
|
|
int encoding = ob->s.b.encoding;
|
|
|
|
|
_Unwind_Ptr base = base_from_object (ob->s.b.encoding, ob);
|
|
|
|
|
|
|
|
|
|
for (; this_fde->length != 0; this_fde = next_fde (this_fde))
|
|
|
|
|
{
|
|
|
|
|
struct dwarf_cie *this_cie;
|
|
|
|
|
_Unwind_Ptr pc_begin, pc_range;
|
|
|
|
|
|
|
|
|
|
/* Skip CIEs. */
|
|
|
|
|
if (this_fde->CIE_delta == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (ob->s.b.mixed_encoding)
|
|
|
|
|
{
|
|
|
|
|
/* Determine the encoding for this FDE. Note mixed encoded
|
|
|
|
|
objects for later. */
|
|
|
|
|
this_cie = get_cie (this_fde);
|
|
|
|
|
if (this_cie != last_cie)
|
|
|
|
|
{
|
|
|
|
|
last_cie = this_cie;
|
|
|
|
|
encoding = get_cie_encoding (this_cie);
|
|
|
|
|
base = base_from_object (encoding, ob);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (encoding == DW_EH_PE_absptr)
|
|
|
|
|
{
|
|
|
|
|
pc_begin = ((_Unwind_Ptr *)this_fde->pc_begin)[0];
|
|
|
|
|
pc_range = ((_Unwind_Ptr *)this_fde->pc_begin)[1];
|
|
|
|
|
if (pc_begin == 0)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
_Unwind_Ptr mask;
|
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
|
|
p = read_encoded_value_with_base (encoding, base,
|
|
|
|
|
this_fde->pc_begin, &pc_begin);
|
|
|
|
|
read_encoded_value_with_base (encoding & 0x0F, 0, p, &pc_range);
|
|
|
|
|
|
|
|
|
|
/* Take care to ignore link-once functions that were removed.
|
|
|
|
|
In these cases, the function address will be NULL, but if
|
|
|
|
|
the encoding is smaller than a pointer a true NULL may not
|
|
|
|
|
be representable. Assume 0 in the representable bits is NULL. */
|
|
|
|
|
mask = size_of_encoded_value (encoding);
|
|
|
|
|
if (mask < sizeof (void *))
|
|
|
|
|
mask = (1L << (mask << 3)) - 1;
|
|
|
|
|
else
|
|
|
|
|
mask = -1;
|
|
|
|
|
|
|
|
|
|
if ((pc_begin & mask) == 0)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ((_Unwind_Ptr)pc - pc_begin < pc_range)
|
|
|
|
|
return this_fde;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Binary search for an FDE containing the given PC. Here are three
|
|
|
|
|
implementations of increasing complexity. */
|
|
|
|
|
|
|
|
|
|
static inline fde *
|
|
|
|
|
binary_search_unencoded_fdes (struct object *ob, void *pc)
|
|
|
|
|
{
|
|
|
|
|
struct fde_vector *vec = ob->u.sort;
|
|
|
|
|
size_t lo, hi;
|
|
|
|
|
|
|
|
|
|
for (lo = 0, hi = vec->count; lo < hi; )
|
|
|
|
|
{
|
|
|
|
|
size_t i = (lo + hi) / 2;
|
|
|
|
|
fde *f = vec->array[i];
|
|
|
|
|
void *pc_begin;
|
|
|
|
|
uaddr pc_range;
|
|
|
|
|
|
|
|
|
|
pc_begin = ((void **)f->pc_begin)[0];
|
|
|
|
|
pc_range = ((uaddr *)f->pc_begin)[1];
|
|
|
|
|
|
|
|
|
|
if (pc < pc_begin)
|
|
|
|
|
hi = i;
|
|
|
|
|
else if (pc >= pc_begin + pc_range)
|
|
|
|
|
lo = i + 1;
|
|
|
|
|
else
|
|
|
|
|
return f;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline fde *
|
|
|
|
|
binary_search_single_encoding_fdes (struct object *ob, void *pc)
|
|
|
|
|
{
|
|
|
|
|
struct fde_vector *vec = ob->u.sort;
|
|
|
|
|
int encoding = ob->s.b.encoding;
|
|
|
|
|
_Unwind_Ptr base = base_from_object (encoding, ob);
|
|
|
|
|
size_t lo, hi;
|
|
|
|
|
|
|
|
|
|
for (lo = 0, hi = vec->count; lo < hi; )
|
|
|
|
|
{
|
|
|
|
|
size_t i = (lo + hi) / 2;
|
|
|
|
|
fde *f = vec->array[i];
|
|
|
|
|
_Unwind_Ptr pc_begin, pc_range;
|
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
|
|
p = read_encoded_value_with_base (encoding, base, f->pc_begin,
|
|
|
|
|
&pc_begin);
|
|
|
|
|
read_encoded_value_with_base (encoding & 0x0F, 0, p, &pc_range);
|
|
|
|
|
|
|
|
|
|
if ((_Unwind_Ptr)pc < pc_begin)
|
|
|
|
|
hi = i;
|
|
|
|
|
else if ((_Unwind_Ptr)pc >= pc_begin + pc_range)
|
|
|
|
|
lo = i + 1;
|
|
|
|
|
else
|
|
|
|
|
return f;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline fde *
|
|
|
|
|
binary_search_mixed_encoding_fdes (struct object *ob, void *pc)
|
|
|
|
|
{
|
|
|
|
|
struct fde_vector *vec = ob->u.sort;
|
|
|
|
|
size_t lo, hi;
|
|
|
|
|
|
|
|
|
|
for (lo = 0, hi = vec->count; lo < hi; )
|
|
|
|
|
{
|
|
|
|
|
size_t i = (lo + hi) / 2;
|
|
|
|
|
fde *f = vec->array[i];
|
|
|
|
|
_Unwind_Ptr pc_begin, pc_range;
|
|
|
|
|
const char *p;
|
|
|
|
|
int encoding;
|
|
|
|
|
|
|
|
|
|
encoding = get_fde_encoding (f);
|
|
|
|
|
p = read_encoded_value_with_base (encoding,
|
|
|
|
|
base_from_object (encoding, ob),
|
|
|
|
|
f->pc_begin, &pc_begin);
|
|
|
|
|
read_encoded_value_with_base (encoding & 0x0F, 0, p, &pc_range);
|
|
|
|
|
|
|
|
|
|
if ((_Unwind_Ptr)pc < pc_begin)
|
|
|
|
|
hi = i;
|
|
|
|
|
else if ((_Unwind_Ptr)pc >= pc_begin + pc_range)
|
|
|
|
|
lo = i + 1;
|
|
|
|
|
else
|
|
|
|
|
return f;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static fde *
|
|
|
|
|
search_object (struct object* ob, void *pc)
|
|
|
|
|
{
|
|
|
|
|
/* If the data hasn't been sorted, try to do this now. We may have
|
|
|
|
|
more memory available than last time we tried. */
|
|
|
|
|
if (! ob->s.b.sorted)
|
|
|
|
|
{
|
|
|
|
|
init_object (ob);
|
|
|
|
|
|
|
|
|
|
/* Despite the above comment, the normal reason to get here is
|
|
|
|
|
that we've not processed this object before. A quick range
|
|
|
|
|
check is in order. */
|
|
|
|
|
if (pc < ob->pc_begin)
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ob->s.b.sorted)
|
|
|
|
|
{
|
|
|
|
|
if (ob->s.b.mixed_encoding)
|
|
|
|
|
return binary_search_mixed_encoding_fdes (ob, pc);
|
|
|
|
|
else if (ob->s.b.encoding == DW_EH_PE_absptr)
|
|
|
|
|
return binary_search_unencoded_fdes (ob, pc);
|
|
|
|
|
else
|
|
|
|
|
return binary_search_single_encoding_fdes (ob, pc);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Long slow labourious linear search, cos we've no memory. */
|
|
|
|
|
if (ob->s.b.from_array)
|
|
|
|
|
{
|
|
|
|
|
fde **p;
|
|
|
|
|
for (p = ob->u.array; *p ; p++)
|
|
|
|
|
{
|
|
|
|
|
fde *f = linear_search_fdes (ob, *p, pc);
|
|
|
|
|
if (f)
|
|
|
|
|
return f;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return linear_search_fdes (ob, ob->u.single, pc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fde *
|
|
|
|
|
_Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases)
|
|
|
|
|
{
|
|
|
|
|
struct object *ob;
|
|
|
|
|
fde *f = NULL;
|
|
|
|
|
|
|
|
|
|
init_object_mutex_once ();
|
|
|
|
|
__gthread_mutex_lock (&object_mutex);
|
|
|
|
|
|
|
|
|
|
/* Linear search through the classified objects, to find the one
|
2002-01-08 07:28:46 +01:00
|
|
|
|
containing the pc. Note that pc_begin is sorted descending, and
|
2001-11-16 02:27:24 +01:00
|
|
|
|
we expect objects to be non-overlapping. */
|
|
|
|
|
for (ob = seen_objects; ob; ob = ob->next)
|
|
|
|
|
if (pc >= ob->pc_begin)
|
|
|
|
|
{
|
|
|
|
|
f = search_object (ob, pc);
|
|
|
|
|
if (f)
|
|
|
|
|
goto fini;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Classify and search the objects we've not yet processed. */
|
|
|
|
|
while ((ob = unseen_objects))
|
|
|
|
|
{
|
|
|
|
|
struct object **p;
|
|
|
|
|
|
|
|
|
|
unseen_objects = ob->next;
|
|
|
|
|
f = search_object (ob, pc);
|
|
|
|
|
|
|
|
|
|
/* Insert the object into the classified list. */
|
|
|
|
|
for (p = &seen_objects; *p ; p = &(*p)->next)
|
|
|
|
|
if ((*p)->pc_begin < ob->pc_begin)
|
|
|
|
|
break;
|
|
|
|
|
ob->next = *p;
|
|
|
|
|
*p = ob;
|
|
|
|
|
|
|
|
|
|
if (f)
|
|
|
|
|
goto fini;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fini:
|
|
|
|
|
__gthread_mutex_unlock (&object_mutex);
|
|
|
|
|
|
|
|
|
|
if (f)
|
|
|
|
|
{
|
|
|
|
|
int encoding;
|
|
|
|
|
|
|
|
|
|
bases->tbase = ob->tbase;
|
|
|
|
|
bases->dbase = ob->dbase;
|
|
|
|
|
|
|
|
|
|
encoding = ob->s.b.encoding;
|
|
|
|
|
if (ob->s.b.mixed_encoding)
|
|
|
|
|
encoding = get_fde_encoding (f);
|
|
|
|
|
read_encoded_value_with_base (encoding, base_from_object (encoding, ob),
|
|
|
|
|
f->pc_begin, (_Unwind_Ptr *)&bases->func);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return f;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|