Commit a30794da by Andreas Jaeger Committed by Andreas Jaeger

2003-10-31 Andreas Jaeger <aj@suse.de>,

            Zack Weinberg  <zack@codesourcery.com>


        * crtstuff.c (__register_frame_info, __register_frame_info_bases)
        (__deregister_frame_info, __deregister_frame_info_bases):
        Constify void * argument.
        * unwind-dw2-fde.h (struct fde_vector):
        Constify 'orig_data' and 'array' fields.
        (__register_frame_info, __register_frame_info_bases)
        (__deregister_frame_info, __deregister_frame_info_bases):
        Constify void * argument.
        (get_cie, next_fde, _Unwind_Find_FDE): Constify arguments,
        return values, and casts of type fde *, struct dwarf_fde *,
        and struct dwarf_cie *.
        * unwind-dw2-fde.c (__register_frame_info, __register_frame_info_bases)
        (__deregister_frame_info, __deregister_frame_info_bases):
        Constify void * argument.
        (get_cie_encoding, ): Constify struct dwarf_cie * argument.
        (get_fde_encoding, fde_unencoded_compare, fde_single_encoding_compare)
        (fde_mixed_encoding_compare, fde_compare_t, start_fde_sort, fde_insert)
        fde_split, SWAP, frame_downheap, frame_heapsort)
        (classify_object_over_fdes, add_fdes, linear_search_fdes,
        binary_search_unencoded_fdes, binary_search_single_encoding_fdes,
        binary_search_mixed_encoding_fdes, search_object, _Unwind_Find_FDE):
        Constify arguments, local variables, return values, and casts
        of type fde *, fde **, struct dwarf_fde *, and struct dwarf_cie *.
        Use const pointer types in sizeof expressions, for clarity.
        * unwind-dw2-fde-glibc.c
        (_Unwind_find_registered_FDE, _Unwind_find_FDE): Constify return value.
        (struct unw_eh_callback_data): Constify 'ret' field.

Co-Authored-By: Zack Weinberg <zack@codesourcery.com>

From-SVN: r73155
parent f3dd79b9
2003-10-31 Andreas Jaeger <aj@suse.de>,
Zack Weinberg <zack@codesourcery.com>
* crtstuff.c (__register_frame_info, __register_frame_info_bases)
(__deregister_frame_info, __deregister_frame_info_bases):
Constify void * argument.
* unwind-dw2-fde.h (struct fde_vector):
Constify 'orig_data' and 'array' fields.
(__register_frame_info, __register_frame_info_bases)
(__deregister_frame_info, __deregister_frame_info_bases):
Constify void * argument.
(get_cie, next_fde, _Unwind_Find_FDE): Constify arguments,
return values, and casts of type fde *, struct dwarf_fde *,
and struct dwarf_cie *.
* unwind-dw2-fde.c (__register_frame_info, __register_frame_info_bases)
(__deregister_frame_info, __deregister_frame_info_bases):
Constify void * argument.
(get_cie_encoding, ): Constify struct dwarf_cie * argument.
(get_fde_encoding, fde_unencoded_compare, fde_single_encoding_compare)
(fde_mixed_encoding_compare, fde_compare_t, start_fde_sort, fde_insert)
fde_split, SWAP, frame_downheap, frame_heapsort)
(classify_object_over_fdes, add_fdes, linear_search_fdes,
binary_search_unencoded_fdes, binary_search_single_encoding_fdes,
binary_search_mixed_encoding_fdes, search_object, _Unwind_Find_FDE):
Constify arguments, local variables, return values, and casts
of type fde *, fde **, struct dwarf_fde *, and struct dwarf_cie *.
Use const pointer types in sizeof expressions, for clarity.
* unwind-dw2-fde-glibc.c
(_Unwind_find_registered_FDE, _Unwind_find_FDE): Constify return value.
(struct unw_eh_callback_data): Constify 'ret' field.
2003-10-31 Fariborz Jahanian <fjahanian@apple.com>
David Edelsohn <edelsohn@gnu.org>
......
......@@ -120,14 +120,14 @@ call_ ## FUNC (void) \
/* References to __register_frame_info and __deregister_frame_info should
be weak in this file if at all possible. */
extern void __register_frame_info (void *, struct object *)
extern void __register_frame_info (const void *, struct object *)
TARGET_ATTRIBUTE_WEAK;
extern void __register_frame_info_bases (void *, struct object *,
extern void __register_frame_info_bases (const void *, struct object *,
void *, void *)
TARGET_ATTRIBUTE_WEAK;
extern void *__deregister_frame_info (void *)
extern void *__deregister_frame_info (const void *)
TARGET_ATTRIBUTE_WEAK;
extern void *__deregister_frame_info_bases (void *)
extern void *__deregister_frame_info_bases (const void *)
TARGET_ATTRIBUTE_WEAK;
extern void __do_global_ctors_1 (void);
......
......@@ -52,7 +52,7 @@
&& (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
static fde * _Unwind_Find_registered_FDE (void *pc, struct dwarf_eh_bases *bases);
static const fde * _Unwind_Find_registered_FDE (void *pc, struct dwarf_eh_bases *bases);
#define _Unwind_Find_FDE _Unwind_Find_registered_FDE
#include "unwind-dw2-fde.c"
......@@ -68,7 +68,7 @@ struct unw_eh_callback_data
void *tbase;
void *dbase;
void *func;
fde *ret;
const fde *ret;
};
struct unw_eh_frame_hdr
......@@ -261,11 +261,11 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr)
return 1;
}
fde *
const fde *
_Unwind_Find_FDE (void *pc, struct dwarf_eh_bases *bases)
{
struct unw_eh_callback_data data;
fde *ret;
const fde *ret;
ret = _Unwind_Find_registered_FDE (pc, bases);
if (ret != NULL)
......
......@@ -32,9 +32,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
struct fde_vector
{
void *orig_data;
const void *orig_data;
size_t count;
struct dwarf_fde *array[];
const struct dwarf_fde *array[];
};
struct object
......@@ -43,7 +43,7 @@ struct object
void *tbase;
void *dbase;
union {
struct dwarf_fde *single;
const struct dwarf_fde *single;
struct dwarf_fde **array;
struct fde_vector *sort;
} u;
......@@ -90,16 +90,16 @@ struct dwarf_eh_bases
};
extern void __register_frame_info_bases (void *, struct object *,
extern void __register_frame_info_bases (const void *, struct object *,
void *, void *);
extern void __register_frame_info (void *, struct object *);
extern void __register_frame_info (const void *, struct object *);
extern void __register_frame (void *);
extern void __register_frame_info_table_bases (void *, struct object *,
void *, void *);
extern void __register_frame_info_table (void *, struct object *);
extern void __register_frame_table (void *);
extern void *__deregister_frame_info (void *);
extern void *__deregister_frame_info_bases (void *);
extern void *__deregister_frame_info (const void *);
extern void *__deregister_frame_info_bases (const void *);
extern void __deregister_frame (void *);
......@@ -151,22 +151,22 @@ typedef struct dwarf_fde fde;
/* Locate the CIE for a given FDE. */
static inline struct dwarf_cie *
get_cie (struct dwarf_fde *f)
static inline const struct dwarf_cie *
get_cie (const struct dwarf_fde *f)
{
return (void *)&f->CIE_delta - f->CIE_delta;
}
static inline fde *
next_fde (fde *f)
static inline const fde *
next_fde (const fde *f)
{
return (fde *) ((char *) f + f->length + sizeof (f->length));
return (const fde *) ((char *) f + f->length + sizeof (f->length));
}
extern fde * _Unwind_Find_FDE (void *, struct dwarf_eh_bases *);
extern const fde * _Unwind_Find_FDE (void *, struct dwarf_eh_bases *);
static inline int
last_fde (struct object *obj __attribute__ ((__unused__)), fde *f)
last_fde (struct object *obj __attribute__ ((__unused__)), const fde *f)
{
#ifdef DWARF2_OBJECT_END_PTR_EXTENSION
return (char *)f == obj->fde_end || f->length == 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment