/* prdbg.c -- Print out generic debugging information.
- Copyright 1995, 1996, 2002, 2003 Free Software Foundation, Inc.
+ Copyright 1995, 1996, 1999, 2002, 2003, 2004, 2006, 2007, 2008
+ Free Software Foundation, Inc.
Written by Ian Lance Taylor <ian@cygnus.com>.
Tags style generation written by Salvador E. Tropea <set@computer.org>.
This program 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 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA. */
/* This file prints out the generic debugging information, by
supplying a set of routines to debug_write. */
-#include <stdio.h>
+#include "sysdep.h"
#include <assert.h>
-
#include "bfd.h"
-#include "bucomm.h"
#include "libiberty.h"
+#include "demangle.h"
#include "debug.h"
#include "budbg.h"
/* The symbols table for this BFD. */
asymbol **syms;
/* Pointer to a function to demangle symbols. */
- char *(*demangler) (bfd *, const char *);
+ char *(*demangler) (bfd *, const char *, int);
};
/* The type stack. */
int num_parents;
};
-static void indent
- PARAMS ((struct pr_handle *));
-static bfd_boolean push_type
- PARAMS ((struct pr_handle *, const char *));
-static bfd_boolean prepend_type
- PARAMS ((struct pr_handle *, const char *));
-static bfd_boolean append_type
- PARAMS ((struct pr_handle *, const char *));
-static bfd_boolean substitute_type
- PARAMS ((struct pr_handle *, const char *));
-static bfd_boolean indent_type
- PARAMS ((struct pr_handle *));
-static char *pop_type
- PARAMS ((struct pr_handle *));
-static void print_vma
- PARAMS ((bfd_vma, char *, bfd_boolean, bfd_boolean));
+static void indent (struct pr_handle *);
+static bfd_boolean push_type (struct pr_handle *, const char *);
+static bfd_boolean prepend_type (struct pr_handle *, const char *);
+static bfd_boolean append_type (struct pr_handle *, const char *);
+static bfd_boolean substitute_type (struct pr_handle *, const char *);
+static bfd_boolean indent_type (struct pr_handle *);
+static char *pop_type (struct pr_handle *);
+static void print_vma (bfd_vma, char *, bfd_boolean, bfd_boolean);
static bfd_boolean pr_fix_visibility
- PARAMS ((struct pr_handle *, enum debug_visibility));
-static bfd_boolean pr_start_compilation_unit
- PARAMS ((PTR, const char *));
-static bfd_boolean pr_start_source
- PARAMS ((PTR, const char *));
-static bfd_boolean pr_empty_type
- PARAMS ((PTR));
-static bfd_boolean pr_void_type
- PARAMS ((PTR));
-static bfd_boolean pr_int_type
- PARAMS ((PTR, unsigned int, bfd_boolean));
-static bfd_boolean pr_float_type
- PARAMS ((PTR, unsigned int));
-static bfd_boolean pr_complex_type
- PARAMS ((PTR, unsigned int));
-static bfd_boolean pr_bool_type
- PARAMS ((PTR, unsigned int));
+ (struct pr_handle *, enum debug_visibility);
+static bfd_boolean pr_start_compilation_unit (void *, const char *);
+static bfd_boolean pr_start_source (void *, const char *);
+static bfd_boolean pr_empty_type (void *);
+static bfd_boolean pr_void_type (void *);
+static bfd_boolean pr_int_type (void *, unsigned int, bfd_boolean);
+static bfd_boolean pr_float_type (void *, unsigned int);
+static bfd_boolean pr_complex_type (void *, unsigned int);
+static bfd_boolean pr_bool_type (void *, unsigned int);
static bfd_boolean pr_enum_type
- PARAMS ((PTR, const char *, const char **, bfd_signed_vma *));
-static bfd_boolean pr_pointer_type
- PARAMS ((PTR));
-static bfd_boolean pr_function_type
- PARAMS ((PTR, int, bfd_boolean));
-static bfd_boolean pr_reference_type
- PARAMS ((PTR));
-static bfd_boolean pr_range_type
- PARAMS ((PTR, bfd_signed_vma, bfd_signed_vma));
+ (void *, const char *, const char **, bfd_signed_vma *);
+static bfd_boolean pr_pointer_type (void *);
+static bfd_boolean pr_function_type (void *, int, bfd_boolean);
+static bfd_boolean pr_reference_type (void *);
+static bfd_boolean pr_range_type (void *, bfd_signed_vma, bfd_signed_vma);
static bfd_boolean pr_array_type
- PARAMS ((PTR, bfd_signed_vma, bfd_signed_vma, bfd_boolean));
-static bfd_boolean pr_set_type
- PARAMS ((PTR, bfd_boolean));
-static bfd_boolean pr_offset_type
- PARAMS ((PTR));
-static bfd_boolean pr_method_type
- PARAMS ((PTR, bfd_boolean, int, bfd_boolean));
-static bfd_boolean pr_const_type
- PARAMS ((PTR));
-static bfd_boolean pr_volatile_type
- PARAMS ((PTR));
+ (void *, bfd_signed_vma, bfd_signed_vma, bfd_boolean);
+static bfd_boolean pr_set_type (void *, bfd_boolean);
+static bfd_boolean pr_offset_type (void *);
+static bfd_boolean pr_method_type (void *, bfd_boolean, int, bfd_boolean);
+static bfd_boolean pr_const_type (void *);
+static bfd_boolean pr_volatile_type (void *);
static bfd_boolean pr_start_struct_type
- PARAMS ((PTR, const char *, unsigned int, bfd_boolean, unsigned int));
+ (void *, const char *, unsigned int, bfd_boolean, unsigned int);
static bfd_boolean pr_struct_field
- PARAMS ((PTR, const char *, bfd_vma, bfd_vma, enum debug_visibility));
-static bfd_boolean pr_end_struct_type
- PARAMS ((PTR));
+ (void *, const char *, bfd_vma, bfd_vma, enum debug_visibility);
+static bfd_boolean pr_end_struct_type (void *);
static bfd_boolean pr_start_class_type
- PARAMS ((PTR, const char *, unsigned int, bfd_boolean, unsigned int,
- bfd_boolean, bfd_boolean));
+ (void *, const char *, unsigned int, bfd_boolean, unsigned int,
+ bfd_boolean, bfd_boolean);
static bfd_boolean pr_class_static_member
- PARAMS ((PTR, const char *, const char *, enum debug_visibility));
+ (void *, const char *, const char *, enum debug_visibility);
static bfd_boolean pr_class_baseclass
- PARAMS ((PTR, bfd_vma, bfd_boolean, enum debug_visibility));
-static bfd_boolean pr_class_start_method
- PARAMS ((PTR, const char *));
+ (void *, bfd_vma, bfd_boolean, enum debug_visibility);
+static bfd_boolean pr_class_start_method (void *, const char *);
static bfd_boolean pr_class_method_variant
- PARAMS ((PTR, const char *, enum debug_visibility, bfd_boolean, bfd_boolean,
- bfd_vma, bfd_boolean));
+ (void *, const char *, enum debug_visibility, bfd_boolean, bfd_boolean,
+ bfd_vma, bfd_boolean);
static bfd_boolean pr_class_static_method_variant
- PARAMS ((PTR, const char *, enum debug_visibility, bfd_boolean,
- bfd_boolean));
-static bfd_boolean pr_class_end_method
- PARAMS ((PTR));
-static bfd_boolean pr_end_class_type
- PARAMS ((PTR));
-static bfd_boolean pr_typedef_type
- PARAMS ((PTR, const char *));
+ (void *, const char *, enum debug_visibility, bfd_boolean, bfd_boolean);
+static bfd_boolean pr_class_end_method (void *);
+static bfd_boolean pr_end_class_type (void *);
+static bfd_boolean pr_typedef_type (void *, const char *);
static bfd_boolean pr_tag_type
- PARAMS ((PTR, const char *, unsigned int, enum debug_type_kind));
-static bfd_boolean pr_typdef
- PARAMS ((PTR, const char *));
-static bfd_boolean pr_tag
- PARAMS ((PTR, const char *));
-static bfd_boolean pr_int_constant
- PARAMS ((PTR, const char *, bfd_vma));
-static bfd_boolean pr_float_constant
- PARAMS ((PTR, const char *, double));
-static bfd_boolean pr_typed_constant
- PARAMS ((PTR, const char *, bfd_vma));
+ (void *, const char *, unsigned int, enum debug_type_kind);
+static bfd_boolean pr_typdef (void *, const char *);
+static bfd_boolean pr_tag (void *, const char *);
+static bfd_boolean pr_int_constant (void *, const char *, bfd_vma);
+static bfd_boolean pr_float_constant (void *, const char *, double);
+static bfd_boolean pr_typed_constant (void *, const char *, bfd_vma);
static bfd_boolean pr_variable
- PARAMS ((PTR, const char *, enum debug_var_kind, bfd_vma));
-static bfd_boolean pr_start_function
- PARAMS ((PTR, const char *, bfd_boolean));
+ (void *, const char *, enum debug_var_kind, bfd_vma);
+static bfd_boolean pr_start_function (void *, const char *, bfd_boolean);
static bfd_boolean pr_function_parameter
- PARAMS ((PTR, const char *, enum debug_parm_kind, bfd_vma));
-static bfd_boolean pr_start_block
- PARAMS ((PTR, bfd_vma));
-static bfd_boolean pr_end_block
- PARAMS ((PTR, bfd_vma));
-static bfd_boolean pr_end_function
- PARAMS ((PTR));
-static bfd_boolean pr_lineno
- PARAMS ((PTR, const char *, unsigned long, bfd_vma));
+ (void *, const char *, enum debug_parm_kind, bfd_vma);
+static bfd_boolean pr_start_block (void *, bfd_vma);
+static bfd_boolean pr_end_block (void *, bfd_vma);
+static bfd_boolean pr_end_function (void *);
+static bfd_boolean pr_lineno (void *, const char *, unsigned long, bfd_vma);
static bfd_boolean append_parent (struct pr_handle *, const char *);
/* Only used by tg_ code. */
-static bfd_boolean tg_fix_visibility (struct pr_handle *, enum debug_visibility);
+static bfd_boolean tg_fix_visibility
+ (struct pr_handle *, enum debug_visibility);
static void find_address_in_section (bfd *, asection *, void *);
static void translate_addresses (bfd *, char *, FILE *, asymbol **);
static const char *visibility_name (enum debug_visibility);
/* Tags style replacements. */
static bfd_boolean tg_start_compilation_unit (void *, const char *);
static bfd_boolean tg_start_source (void *, const char *);
-static bfd_boolean tg_enum_type (void *, const char *, const char **, bfd_signed_vma *);
-static bfd_boolean tg_start_struct_type (void *, const char *, unsigned int, bfd_boolean, unsigned int);
-static bfd_boolean pr_struct_field (void *, const char *, bfd_vma, bfd_vma, enum debug_visibility);
-static bfd_boolean tg_struct_field (void *, const char *, bfd_vma, bfd_vma, enum debug_visibility);
-static bfd_boolean tg_struct_field (void *, const char *, bfd_vma, bfd_vma, enum debug_visibility);
+static bfd_boolean tg_enum_type
+ (void *, const char *, const char **, bfd_signed_vma *);
+static bfd_boolean tg_start_struct_type
+ (void *, const char *, unsigned int, bfd_boolean, unsigned int);
+static bfd_boolean pr_struct_field
+ (void *, const char *, bfd_vma, bfd_vma, enum debug_visibility);
+static bfd_boolean tg_struct_field
+ (void *, const char *, bfd_vma, bfd_vma, enum debug_visibility);
+static bfd_boolean tg_struct_field
+ (void *, const char *, bfd_vma, bfd_vma, enum debug_visibility);
static bfd_boolean tg_end_struct_type (void *);
-static bfd_boolean tg_start_class_type (void *, const char *, unsigned int, bfd_boolean, unsigned int, bfd_boolean, bfd_boolean);
-static bfd_boolean tg_class_static_member (void *, const char *, const char *, enum debug_visibility);
-static bfd_boolean tg_class_baseclass (void *, bfd_vma, bfd_boolean, enum debug_visibility);
-static bfd_boolean tg_class_method_variant (void *, const char *, enum debug_visibility, bfd_boolean, bfd_boolean, bfd_vma, bfd_boolean);
-static bfd_boolean tg_class_static_method_variant (void *, const char *, enum debug_visibility, bfd_boolean, bfd_boolean);
+static bfd_boolean tg_start_class_type
+ (void *, const char *, unsigned int, bfd_boolean, unsigned int, bfd_boolean, bfd_boolean);
+static bfd_boolean tg_class_static_member
+ (void *, const char *, const char *, enum debug_visibility);
+static bfd_boolean tg_class_baseclass
+ (void *, bfd_vma, bfd_boolean, enum debug_visibility);
+static bfd_boolean tg_class_method_variant
+ (void *, const char *, enum debug_visibility, bfd_boolean, bfd_boolean, bfd_vma, bfd_boolean);
+static bfd_boolean tg_class_static_method_variant
+ (void *, const char *, enum debug_visibility, bfd_boolean, bfd_boolean);
static bfd_boolean tg_end_class_type (void *);
-static bfd_boolean tg_tag_type (void *, const char *, unsigned int, enum debug_type_kind);
+static bfd_boolean tg_tag_type
+ (void *, const char *, unsigned int, enum debug_type_kind);
static bfd_boolean tg_typdef (void *, const char *);
static bfd_boolean tg_tag (void *, const char *);
static bfd_boolean tg_int_constant (void *, const char *, bfd_vma);
static bfd_boolean tg_float_constant (void *, const char *, double);
static bfd_boolean tg_typed_constant (void *, const char *, bfd_vma);
-static bfd_boolean tg_variable (void *, const char *, enum debug_var_kind, bfd_vma);
+static bfd_boolean tg_variable
+ (void *, const char *, enum debug_var_kind, bfd_vma);
static bfd_boolean tg_start_function (void *, const char *, bfd_boolean);
-static bfd_boolean tg_function_parameter (void *, const char *, enum debug_parm_kind, bfd_vma);
+static bfd_boolean tg_function_parameter
+ (void *, const char *, enum debug_parm_kind, bfd_vma);
static bfd_boolean tg_start_block (void *, bfd_vma);
static bfd_boolean tg_end_block (void *, bfd_vma);
static bfd_boolean tg_lineno (void *, const char *, unsigned long, bfd_vma);
tg_start_class_type,
tg_class_static_member,
tg_class_baseclass,
- pr_class_start_method, /* Same, remmembers that's a method. */
+ pr_class_start_method, /* Same, remembers that's a method. */
tg_class_method_variant,
tg_class_static_method_variant,
pr_class_end_method, /* Same, forgets that's a method. */
/* Print out the generic debugging information recorded in dhandle. */
bfd_boolean
-print_debugging_info (f, dhandle, abfd, syms, demangler, as_tags)
- FILE *f;
- PTR dhandle;
- bfd *abfd;
- asymbol **syms;
- PTR demangler;
- bfd_boolean as_tags;
+print_debugging_info (FILE *f, void *dhandle, bfd *abfd, asymbol **syms,
+ void *demangler, bfd_boolean as_tags)
{
struct pr_handle info;
/* Indent to the current indentation level. */
static void
-indent (info)
- struct pr_handle *info;
+indent (struct pr_handle *info)
{
unsigned int i;
/* Push a type on the type stack. */
static bfd_boolean
-push_type (info, type)
- struct pr_handle *info;
- const char *type;
+push_type (struct pr_handle *info, const char *type)
{
struct pr_stack *n;
/* Prepend a string onto the type on the top of the type stack. */
static bfd_boolean
-prepend_type (info, s)
- struct pr_handle *info;
- const char *s;
+prepend_type (struct pr_handle *info, const char *s)
{
char *n;
/* Append a string to the type on the top of the type stack. */
static bfd_boolean
-append_type (info, s)
- struct pr_handle *info;
- const char *s;
+append_type (struct pr_handle *info, const char *s)
{
unsigned int len;
there is no underscore, the name follows the type. */
static bfd_boolean
-substitute_type (info, s)
- struct pr_handle *info;
- const char *s;
+substitute_type (struct pr_handle *info, const char *s)
{
char *u;
/* Indent the type at the top of the stack by appending spaces. */
static bfd_boolean
-indent_type (info)
- struct pr_handle *info;
+indent_type (struct pr_handle *info)
{
unsigned int i;
/* Pop a type from the type stack. */
static char *
-pop_type (info)
- struct pr_handle *info;
+pop_type (struct pr_handle *info)
{
struct pr_stack *o;
char *ret;
/* Print a VMA value into a string. */
static void
-print_vma (vma, buf, unsignedp, hexp)
- bfd_vma vma;
- char *buf;
- bfd_boolean unsignedp;
- bfd_boolean hexp;
+print_vma (bfd_vma vma, char *buf, bfd_boolean unsignedp, bfd_boolean hexp)
{
if (sizeof (vma) <= sizeof (unsigned long))
{
else
sprintf (buf, "%ld", (long) vma);
}
+#if BFD_HOST_64BIT_LONG_LONG
+ else if (sizeof (vma) <= sizeof (unsigned long long))
+ {
+#ifndef __MSVCRT__
+ if (hexp)
+ sprintf (buf, "0x%llx", (unsigned long long) vma);
+ else if (unsignedp)
+ sprintf (buf, "%llu", (unsigned long long) vma);
+ else
+ sprintf (buf, "%lld", (long long) vma);
+#else
+ if (hexp)
+ sprintf (buf, "0x%I64x", (unsigned long long) vma);
+ else if (unsignedp)
+ sprintf (buf, "%I64u", (unsigned long long) vma);
+ else
+ sprintf (buf, "%I64d", (long long) vma);
+#endif
+ }
+#endif
else
{
buf[0] = '0';
/* Start a new compilation unit. */
static bfd_boolean
-pr_start_compilation_unit (p, filename)
- PTR p;
- const char *filename;
+pr_start_compilation_unit (void *p, const char *filename)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Start a source file within a compilation unit. */
static bfd_boolean
-pr_start_source (p, filename)
- PTR p;
- const char *filename;
+pr_start_source (void *p, const char *filename)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Push an empty type onto the type stack. */
static bfd_boolean
-pr_empty_type (p)
- PTR p;
+pr_empty_type (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Push a void type onto the type stack. */
static bfd_boolean
-pr_void_type (p)
- PTR p;
+pr_void_type (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Push an integer type onto the type stack. */
static bfd_boolean
-pr_int_type (p, size, unsignedp)
- PTR p;
- unsigned int size;
- bfd_boolean unsignedp;
+pr_int_type (void *p, unsigned int size, bfd_boolean unsignedp)
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[10];
/* Push a floating type onto the type stack. */
static bfd_boolean
-pr_float_type (p, size)
- PTR p;
- unsigned int size;
+pr_float_type (void *p, unsigned int size)
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[10];
/* Push a complex type onto the type stack. */
static bfd_boolean
-pr_complex_type (p, size)
- PTR p;
- unsigned int size;
+pr_complex_type (void *p, unsigned int size)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Push a bfd_boolean type onto the type stack. */
static bfd_boolean
-pr_bool_type (p, size)
- PTR p;
- unsigned int size;
+pr_bool_type (void *p, unsigned int size)
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[10];
/* Push an enum type onto the type stack. */
static bfd_boolean
-pr_enum_type (p, tag, names, values)
- PTR p;
- const char *tag;
- const char **names;
- bfd_signed_vma *values;
+pr_enum_type (void *p, const char *tag, const char **names,
+ bfd_signed_vma *values)
{
struct pr_handle *info = (struct pr_handle *) p;
unsigned int i;
/* Turn the top type on the stack into a pointer. */
static bfd_boolean
-pr_pointer_type (p)
- PTR p;
+pr_pointer_type (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
char *s;
/* Turn the top type on the stack into a function returning that type. */
static bfd_boolean
-pr_function_type (p, argcount, varargs)
- PTR p;
- int argcount;
- bfd_boolean varargs;
+pr_function_type (void *p, int argcount, bfd_boolean varargs)
{
struct pr_handle *info = (struct pr_handle *) p;
char **arg_types;
/* Now the return type is on the top of the stack. */
- s = (char *) xmalloc (len);
- strcpy (s, "(|) (");
+ s = xmalloc (len);
+ LITSTRCPY (s, "(|) (");
if (argcount < 0)
strcat (s, "/* unknown */");
/* Turn the top type on the stack into a reference to that type. */
static bfd_boolean
-pr_reference_type (p)
- PTR p;
+pr_reference_type (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Make a range type. */
static bfd_boolean
-pr_range_type (p, lower, upper)
- PTR p;
- bfd_signed_vma lower;
- bfd_signed_vma upper;
+pr_range_type (void *p, bfd_signed_vma lower, bfd_signed_vma upper)
{
struct pr_handle *info = (struct pr_handle *) p;
char abl[20], abu[20];
/* Make an array type. */
static bfd_boolean
-pr_array_type (p, lower, upper, stringp)
- PTR p;
- bfd_signed_vma lower;
- bfd_signed_vma upper;
- bfd_boolean stringp;
+pr_array_type (void *p, bfd_signed_vma lower, bfd_signed_vma upper,
+ bfd_boolean stringp)
{
struct pr_handle *info = (struct pr_handle *) p;
char *range_type;
/* Make a set type. */
static bfd_boolean
-pr_set_type (p, bitstringp)
- PTR p;
- bfd_boolean bitstringp;
+pr_set_type (void *p, bfd_boolean bitstringp)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Make an offset type. */
static bfd_boolean
-pr_offset_type (p)
- PTR p;
+pr_offset_type (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
/* Make a method type. */
static bfd_boolean
-pr_method_type (p, domain, argcount, varargs)
- PTR p;
- bfd_boolean domain;
- int argcount;
- bfd_boolean varargs;
+pr_method_type (void *p, bfd_boolean domain, int argcount, bfd_boolean varargs)
{
struct pr_handle *info = (struct pr_handle *) p;
unsigned int len;
domain_type = pop_type (info);
if (domain_type == NULL)
return FALSE;
- if (strncmp (domain_type, "class ", sizeof "class " - 1) == 0
+ if (CONST_STRNEQ (domain_type, "class ")
&& strchr (domain_type + sizeof "class " - 1, ' ') == NULL)
domain_type += sizeof "class " - 1;
- else if (strncmp (domain_type, "union class ",
- sizeof "union class ") == 0
+ else if (CONST_STRNEQ (domain_type, "union class ")
&& (strchr (domain_type + sizeof "union class " - 1, ' ')
== NULL))
domain_type += sizeof "union class " - 1;
/* Make a const qualified type. */
static bfd_boolean
-pr_const_type (p)
- PTR p;
+pr_const_type (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Make a volatile qualified type. */
static bfd_boolean
-pr_volatile_type (p)
- PTR p;
+pr_volatile_type (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Start accumulating a struct type. */
static bfd_boolean
-pr_start_struct_type (p, tag, id, structp, size)
- PTR p;
- const char *tag;
- unsigned int id;
- bfd_boolean structp;
- unsigned int size;
+pr_start_struct_type (void *p, const char *tag, unsigned int id,
+ bfd_boolean structp, unsigned int size)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Output the visibility of a field in a struct. */
static bfd_boolean
-pr_fix_visibility (info, visibility)
- struct pr_handle *info;
- enum debug_visibility visibility;
+pr_fix_visibility (struct pr_handle *info, enum debug_visibility visibility)
{
const char *s = NULL;
char *t;
/* Add a field to a struct type. */
static bfd_boolean
-pr_struct_field (p, name, bitpos, bitsize, visibility)
- PTR p;
- const char *name;
- bfd_vma bitpos;
- bfd_vma bitsize;
- enum debug_visibility visibility;
+pr_struct_field (void *p, const char *name, bfd_vma bitpos, bfd_vma bitsize,
+ enum debug_visibility visibility)
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[20];
/* Finish a struct type. */
static bfd_boolean
-pr_end_struct_type (p)
- PTR p;
+pr_end_struct_type (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
char *s;
/* Start a class type. */
static bfd_boolean
-pr_start_class_type (p, tag, id, structp, size, vptr, ownvptr)
- PTR p;
- const char *tag;
- unsigned int id;
- bfd_boolean structp;
- unsigned int size;
- bfd_boolean vptr;
- bfd_boolean ownvptr;
+pr_start_class_type (void *p, const char *tag, unsigned int id,
+ bfd_boolean structp, unsigned int size,
+ bfd_boolean vptr, bfd_boolean ownvptr)
{
struct pr_handle *info = (struct pr_handle *) p;
char *tv = NULL;
/* Add a static member to a class. */
static bfd_boolean
-pr_class_static_member (p, name, physname, visibility)
- PTR p;
- const char *name;
- const char *physname;
- enum debug_visibility visibility;
+pr_class_static_member (void *p, const char *name, const char *physname,
+ enum debug_visibility visibility)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
/* Add a base class to a class. */
static bfd_boolean
-pr_class_baseclass (p, bitpos, virtual, visibility)
- PTR p;
- bfd_vma bitpos;
- bfd_boolean virtual;
- enum debug_visibility visibility;
+pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean virtual,
+ enum debug_visibility visibility)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
if (t == NULL)
return FALSE;
- if (strncmp (t, "class ", sizeof "class " - 1) == 0)
+ if (CONST_STRNEQ (t, "class "))
t += sizeof "class " - 1;
/* Push it back on to take advantage of the prepend_type and
/* Start adding a method to a class. */
static bfd_boolean
-pr_class_start_method (p, name)
- PTR p;
- const char *name;
+pr_class_start_method (void *p, const char *name)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Add a variant to a method. */
static bfd_boolean
-pr_class_method_variant (p, physname, visibility, constp, volatilep, voffset,
- context)
- PTR p;
- const char *physname;
- enum debug_visibility visibility;
- bfd_boolean constp;
- bfd_boolean volatilep;
- bfd_vma voffset;
- bfd_boolean context;
+pr_class_method_variant (void *p, const char *physname,
+ enum debug_visibility visibility,
+ bfd_boolean constp, bfd_boolean volatilep,
+ bfd_vma voffset, bfd_boolean context)
{
struct pr_handle *info = (struct pr_handle *) p;
char *method_type;
/* Add a static variant to a method. */
static bfd_boolean
-pr_class_static_method_variant (p, physname, visibility, constp, volatilep)
- PTR p;
- const char *physname;
- enum debug_visibility visibility;
- bfd_boolean constp;
- bfd_boolean volatilep;
+pr_class_static_method_variant (void *p, const char *physname,
+ enum debug_visibility visibility,
+ bfd_boolean constp, bfd_boolean volatilep)
{
struct pr_handle *info = (struct pr_handle *) p;
char *method_type;
/* Finish up a method. */
static bfd_boolean
-pr_class_end_method (p)
- PTR p;
+pr_class_end_method (void *p)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Finish up a class. */
static bfd_boolean
-pr_end_class_type (p)
- PTR p;
+pr_end_class_type (void *p)
{
return pr_end_struct_type (p);
}
/* Push a type on the stack using a typedef name. */
static bfd_boolean
-pr_typedef_type (p, name)
- PTR p;
- const char *name;
+pr_typedef_type (void *p, const char *name)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Push a type on the stack using a tag name. */
static bfd_boolean
-pr_tag_type (p, name, id, kind)
- PTR p;
- const char *name;
- unsigned int id;
- enum debug_type_kind kind;
+pr_tag_type (void *p, const char *name, unsigned int id,
+ enum debug_type_kind kind)
{
struct pr_handle *info = (struct pr_handle *) p;
const char *t, *tag;
/* Output a typedef. */
static bfd_boolean
-pr_typdef (p, name)
- PTR p;
- const char *name;
+pr_typdef (void *p, const char *name)
{
struct pr_handle *info = (struct pr_handle *) p;
char *s;
stack, so all we have to do here is print it out. */
static bfd_boolean
-pr_tag (p, name)
- PTR p;
- const char *name ATTRIBUTE_UNUSED;
+pr_tag (void *p, const char *name ATTRIBUTE_UNUSED)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
/* Output an integer constant. */
static bfd_boolean
-pr_int_constant (p, name, val)
- PTR p;
- const char *name;
- bfd_vma val;
+pr_int_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[20];
/* Output a floating point constant. */
static bfd_boolean
-pr_float_constant (p, name, val)
- PTR p;
- const char *name;
- double val;
+pr_float_constant (void *p, const char *name, double val)
{
struct pr_handle *info = (struct pr_handle *) p;
/* Output a typed constant. */
static bfd_boolean
-pr_typed_constant (p, name, val)
- PTR p;
- const char *name;
- bfd_vma val;
+pr_typed_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
/* Output a variable. */
static bfd_boolean
-pr_variable (p, name, kind, val)
- PTR p;
- const char *name;
- enum debug_var_kind kind;
- bfd_vma val;
+pr_variable (void *p, const char *name, enum debug_var_kind kind,
+ bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
/* Start outputting a function. */
static bfd_boolean
-pr_start_function (p, name, global)
- PTR p;
- const char *name;
- bfd_boolean global;
+pr_start_function (void *p, const char *name, bfd_boolean global)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
/* Output a function parameter. */
static bfd_boolean
-pr_function_parameter (p, name, kind, val)
- PTR p;
- const char *name;
- enum debug_parm_kind kind;
- bfd_vma val;
+pr_function_parameter (void *p, const char *name,
+ enum debug_parm_kind kind, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
/* Start writing out a block. */
static bfd_boolean
-pr_start_block (p, addr)
- PTR p;
- bfd_vma addr;
+pr_start_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[20];
/* Write out line number information. */
static bfd_boolean
-pr_lineno (p, filename, lineno, addr)
- PTR p;
- const char *filename;
- unsigned long lineno;
- bfd_vma addr;
+pr_lineno (void *p, const char *filename, unsigned long lineno, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[20];
/* Finish writing out a block. */
static bfd_boolean
-pr_end_block (p, addr)
- PTR p;
- bfd_vma addr;
+pr_end_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
char ab[20];
/* Finish writing out a function. */
static bfd_boolean
-pr_end_function (p)
- PTR p ATTRIBUTE_UNUSED;
+pr_end_function (void *p ATTRIBUTE_UNUSED)
{
return TRUE;
}
if (pc < vma)
return;
- size = bfd_get_section_size_before_reloc (section);
+ size = bfd_get_section_size (section);
if (pc >= vma + size)
return;
{
struct pr_handle *info = (struct pr_handle *) p;
- fprintf (stderr, "New compilation unit: %s\n", filename);
-
free (info->filename);
/* Should it be relative? best way to do it here?. */
info->filename = strdup (filename);
static bfd_boolean
tg_start_struct_type (void *p, const char *tag, unsigned int id,
- bfd_boolean structp, unsigned int size ATTRIBUTE_UNUSED)
+ bfd_boolean structp,
+ unsigned int size ATTRIBUTE_UNUSED)
{
struct pr_handle *info = (struct pr_handle *) p;
const char *name;
if (! tg_fix_visibility (info, visibility))
return FALSE;
- /* It happends, a bug? */
+ /* It happens, a bug? */
if (! name[0])
return TRUE;
len_var = strlen (name);
len_class = strlen (info->stack->next->type);
- full_name = (char *) xmalloc (len_var + len_class + 3);
+ full_name = xmalloc (len_var + len_class + 3);
if (! full_name)
return FALSE;
- memcpy (full_name, info->stack->next->type, len_class);
- memcpy (full_name + len_class, "::", 2);
- memcpy (full_name + len_class + 2, name, len_var + 1);
+ sprintf (full_name, "%s::%s", info->stack->next->type, name);
if (! substitute_type (info, full_name))
return FALSE;
if (t == NULL)
return FALSE;
- if (strncmp (t, "class ", sizeof "class " - 1) == 0)
+ if (CONST_STRNEQ (t, "class "))
t += sizeof "class " - 1;
/* Push it back on to take advantage of the prepend_type and
method_name = strdup (context ? info->stack->next->next->method
: info->stack->next->method);
-
+
/* Stick the name of the method into its type. */
if (! substitute_type (info, method_name))
return FALSE;
free (method_type);
free (method_name);
free (context_type);
-
+
return TRUE;
}
tg_class_static_method_variant (void *p,
const char *physname ATTRIBUTE_UNUSED,
enum debug_visibility visibility,
- bfd_boolean constp,
- bfd_boolean volatilep)
+ bfd_boolean constp, bfd_boolean volatilep)
{
struct pr_handle *info = (struct pr_handle *) p;
char *method_type;
bfd_vma val ATTRIBUTE_UNUSED)
{
struct pr_handle *info = (struct pr_handle *) p;
- char *t;
- const char *dname, *from_class;
+ char *t, *dname, *from_class;
t = pop_type (info);
if (t == NULL)
return FALSE;
- dname = name;
+ dname = NULL;
if (info->demangler)
- {
- dname = info->demangler (info->abfd, name);
- if (strcmp (name, dname) == 0)
- {
- free ((char *) dname);
- dname = name;
- }
- }
+ dname = info->demangler (info->abfd, name, DMGL_ANSI | DMGL_PARAMS);
- if (dname != name)
+ from_class = NULL;
+ if (dname != NULL)
{
char *sep;
sep = strstr (dname, "::");
from_class = dname;
}
else
- {
- /* Obscure types as vts and type_info nodes. */
- name = dname;
- from_class = NULL;
- }
+ /* Obscure types as vts and type_info nodes. */
+ name = dname;
}
- else
- from_class = NULL;
fprintf (info->f, "%s\t%s\t0;\"\tkind:v\ttype:%s", name, info->filename, t);
}
if (from_class)
- {
- fprintf (info->f, "\tclass:%s",from_class);
- free ((char *) dname);
- }
+ fprintf (info->f, "\tclass:%s", from_class);
+
+ if (dname)
+ free (dname);
fprintf (info->f, "\n");
tg_start_function (void *p, const char *name, bfd_boolean global)
{
struct pr_handle *info = (struct pr_handle *) p;
- const char *dname;
+ char *dname;
if (! global)
info->stack->flavor = "static";
else
info->stack->flavor = NULL;
- dname = name;
+ dname = NULL;
if (info->demangler)
- {
- dname = info->demangler (info->abfd, name);
- if (strcmp (name, dname) == 0)
- {
- free ((char *) dname);
- dname = name;
- }
- }
+ dname = info->demangler (info->abfd, name, DMGL_ANSI | DMGL_PARAMS);
- if (! substitute_type (info, dname))
+ if (! substitute_type (info, dname ? dname : name))
return FALSE;
-
- if (dname != name)
+
+ info->stack->method = NULL;
+ if (dname != NULL)
{
char *sep;
sep = strstr (dname, "::");
*sep = 0;
/* Obscure functions as type_info function. */
}
- else
- info->stack->method = NULL;
info->stack->parents = strdup (name);
{
if (info->parameter != 1 && ! append_type (info, ", "))
return FALSE;
-
+
if (kind == DEBUG_PARM_REG || kind == DEBUG_PARM_REF_REG)
if (! append_type (info, "register "))
return FALSE;
-
+
if (! append_type (info, t))
return FALSE;
}
/* Write out line number information. */
static bfd_boolean
-tg_lineno (void *p ATTRIBUTE_UNUSED,
- const char *filename ATTRIBUTE_UNUSED,
+tg_lineno (void *p ATTRIBUTE_UNUSED, const char *filename ATTRIBUTE_UNUSED,
unsigned long lineno ATTRIBUTE_UNUSED,
bfd_vma addr ATTRIBUTE_UNUSED)
{
projects / external / binutils.git / blobdiff