/* prdbg.c -- Print out generic debugging information.
- Copyright 1995, 1996, 1999, 2002, 2003, 2004, 2006, 2007, 2008
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2020 Free Software Foundation, Inc.
Written by Ian Lance Taylor <ian@cygnus.com>.
Tags style generation written by Salvador E. Tropea <set@computer.org>.
pr_end_function, /* Same, does nothing. */
tg_lineno
};
+
+static int demangle_flags = DMGL_ANSI | DMGL_PARAMS;
\f
/* Print out the generic debugging information recorded in dhandle. */
bfd_boolean
print_debugging_info (FILE *f, void *dhandle, bfd *abfd, asymbol **syms,
- void *demangler, bfd_boolean as_tags)
+ char * (*demangler) (struct bfd *, const char *, int),
+ bfd_boolean as_tags)
{
struct pr_handle info;
#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
pr_int_type (void *p, unsigned int size, bfd_boolean unsignedp)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[10];
+ char ab[40];
sprintf (ab, "%sint%d", unsignedp ? "u" : "", size * 8);
return push_type (info, ab);
pr_float_type (void *p, unsigned int size)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[10];
+ char ab[40];
if (size == 4)
return push_type (info, "float");
pr_bool_type (void *p, unsigned int size)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[10];
+ char ab[40];
sprintf (ab, "bool%d", size * 8);
if (values[i] != val)
{
- char ab[20];
+ char ab[22];
print_vma (values[i], ab, FALSE, FALSE);
if (! append_type (info, " = ")
for (i = argcount - 1; i >= 0; i--)
{
if (! substitute_type (info, ""))
- return FALSE;
+ {
+ free (arg_types);
+ return FALSE;
+ }
arg_types[i] = pop_type (info);
if (arg_types[i] == NULL)
- return FALSE;
+ {
+ free (arg_types);
+ return FALSE;
+ }
len += strlen (arg_types[i]) + 2;
}
if (varargs)
/* Now the return type is on the top of the stack. */
- s = xmalloc (len);
+ s = (char *) xmalloc (len);
LITSTRCPY (s, "(|) (");
if (argcount < 0)
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];
+ char abl[22], abu[22];
assert (info->stack != NULL);
{
struct pr_handle *info = (struct pr_handle *) p;
char *range_type;
- char abl[20], abu[20], ab[50];
+ char abl[22], abu[22], ab[50];
range_type = pop_type (info);
if (range_type == NULL)
for (i = argcount - 1; i >= 0; i--)
{
if (! substitute_type (info, ""))
- return FALSE;
+ {
+ free (arg_types);
+ return FALSE;
+ }
arg_types[i] = pop_type (info);
if (arg_types[i] == NULL)
- return FALSE;
+ {
+ free (arg_types);
+ return FALSE;
+ }
len += strlen (arg_types[i]) + 2;
}
if (varargs)
enum debug_visibility visibility)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[20];
+ char ab[22];
char *t;
if (! substitute_type (info, name))
/* Add a base class to a class. */
static bfd_boolean
-pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean virtual,
+pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean is_virtual,
enum debug_visibility visibility)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
const char *prefix;
- char ab[20];
+ char ab[22];
char *s, *l, *n;
assert (info->stack != NULL && info->stack->next != NULL);
if (! push_type (info, t))
return FALSE;
- if (virtual)
+ if (is_virtual)
{
if (! prepend_type (info, "virtual "))
return FALSE;
return FALSE;
if (context || voffset != 0)
{
- char ab[20];
+ char ab[22];
if (context)
{
{
struct pr_handle *info = (struct pr_handle *) p;
const char *t, *tag;
- char idbuf[20];
+ char idbuf[22];
switch (kind)
{
pr_int_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[20];
+ char ab[22];
indent (info);
print_vma (val, ab, FALSE, FALSE);
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
- char ab[20];
+ char ab[22];
t = pop_type (info);
if (t == NULL)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
- char ab[20];
+ char ab[22];
if (! substitute_type (info, name))
return FALSE;
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
- char ab[20];
+ char ab[22];
if (kind == DEBUG_PARM_REFERENCE
|| kind == DEBUG_PARM_REF_REG)
pr_start_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[20];
+ char ab[22];
if (info->parameter > 0)
{
pr_lineno (void *p, const char *filename, unsigned long lineno, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[20];
+ char ab[22];
indent (info);
print_vma (addr, ab, TRUE, TRUE);
pr_end_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[20];
+ char ab[22];
info->indent -= 2;
if (found)
return;
- if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0)
+ if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
return;
- vma = bfd_get_section_vma (abfd, section);
+ vma = bfd_section_vma (section);
if (pc < vma)
return;
- size = bfd_get_section_size (section);
+ size = bfd_section_size (section);
if (pc >= vma + size)
return;
/* Start a new compilation unit. */
static bfd_boolean
-tg_start_compilation_unit (void * p, const char *filename ATTRIBUTE_UNUSED)
+tg_start_compilation_unit (void * p, const char *fname ATTRIBUTE_UNUSED)
{
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);
+ info->filename = strdup (fname);
return TRUE;
}
/* Start a source file within a compilation unit. */
static bfd_boolean
-tg_start_source (void *p, const char *filename)
+tg_start_source (void *p, const char *fname)
{
struct pr_handle *info = (struct pr_handle *) p;
free (info->filename);
/* Should it be relative? best way to do it here?. */
- info->filename = strdup (filename);
+ info->filename = strdup (fname);
return TRUE;
}
struct pr_handle *info = (struct pr_handle *) p;
unsigned int i;
const char *name;
- char ab[20];
+ char ab[22];
if (! pr_enum_type (p, tag, names, values))
return FALSE;
static bfd_boolean
tg_end_struct_type (void *p ATTRIBUTE_UNUSED)
{
- struct pr_handle *info = (struct pr_handle *) p;
- assert (info->stack != NULL);
+ assert (((struct pr_handle *) p)->stack != NULL);
return TRUE;
}
struct pr_handle *info = (struct pr_handle *) p;
char *tv = NULL;
const char *name;
+ char idbuf[20];
info->indent += 2;
name = tag;
else
{
- char idbuf[20];
-
sprintf (idbuf, "%%anon%u", id);
name = idbuf;
}
len_var = strlen (name);
len_class = strlen (info->stack->next->type);
- full_name = xmalloc (len_var + len_class + 3);
+ full_name = (char *) xmalloc (len_var + len_class + 3);
if (! full_name)
return FALSE;
sprintf (full_name, "%s::%s", info->stack->next->type, name);
if (! substitute_type (info, full_name))
- return FALSE;
+ {
+ free (full_name);
+ return FALSE;
+ }
if (! prepend_type (info, "static "))
- return FALSE;
+ {
+ free (full_name);
+ return FALSE;
+ }
t = pop_type (info);
if (t == NULL)
- return FALSE;
+ {
+ free (full_name);
+ return FALSE;
+ }
if (! tg_fix_visibility (info, visibility))
- return FALSE;
+ {
+ free (t);
+ free (full_name);
+ return FALSE;
+ }
fprintf (info->f, "%s\t%s\t0;\"\tkind:x\ttype:%s\tclass:%s\taccess:%s\n",
name, info->filename, t, info->stack->type,
static bfd_boolean
tg_class_baseclass (void *p, bfd_vma bitpos ATTRIBUTE_UNUSED,
- bfd_boolean virtual, enum debug_visibility visibility)
+ bfd_boolean is_virtual, enum debug_visibility visibility)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
if (! push_type (info, t))
return FALSE;
- if (virtual)
+ if (is_virtual)
{
if (! prepend_type (info, "virtual "))
return FALSE;
/* Stick the name of the method into its type. */
if (! substitute_type (info, method_name))
- return FALSE;
+ {
+ free (method_name);
+ return FALSE;
+ }
/* Get the type. */
method_type = pop_type (info);
if (method_type == NULL)
- return FALSE;
+ {
+ free (method_name);
+ return FALSE;
+ }
/* Pull off the context type if there is one. */
if (! context)
{
context_type = pop_type (info);
if (context_type == NULL)
- return FALSE;
+ {
+ free (method_type);
+ free (method_name);
+ return FALSE;
+ }
}
/* Now the top of the stack is the class. */
if (! tg_fix_visibility (info, visibility))
- return FALSE;
+ {
+ free (method_type);
+ free (method_name);
+ free (context_type);
+ return FALSE;
+ }
fprintf (info->f, "%s\t%s\t0;\"\tkind:p\ttype:%s\tclass:%s\n",
method_name, info->filename, method_type, info->stack->type);
method_name = strdup (info->stack->next->method);
/* Stick the name of the method into its type. */
if (! substitute_type (info, info->stack->next->method))
- return FALSE;
+ {
+ free (method_name);
+ return FALSE;
+ }
/* Get the type. */
method_type = pop_type (info);
if (method_type == NULL)
- return FALSE;
+ {
+ free (method_name);
+ return FALSE;
+ }
/* Now the top of the stack is the class. */
if (! tg_fix_visibility (info, visibility))
- return FALSE;
+ {
+ free (method_type);
+ free (method_name);
+ return FALSE;
+ }
fprintf (info->f, "%s\t%s\t0;\"\tkind:p\ttype:%s\tclass:%s\taccess:%s\n",
method_name, info->filename, method_type, info->stack->type,
tg_int_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[20];
+ char ab[22];
indent (info);
print_vma (val, ab, FALSE, FALSE);
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
- char ab[20];
+ char ab[22];
t = pop_type (info);
if (t == NULL)
dname = NULL;
if (info->demangler)
- dname = info->demangler (info->abfd, name, DMGL_ANSI | DMGL_PARAMS);
+ dname = info->demangler (info->abfd, name, demangle_flags);
from_class = NULL;
if (dname != NULL)
dname = NULL;
if (info->demangler)
- dname = info->demangler (info->abfd, name, DMGL_ANSI | DMGL_PARAMS);
+ dname = info->demangler (info->abfd, name, demangle_flags);
if (! substitute_type (info, dname ? dname : name))
return FALSE;
tg_start_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[20], kind, *partof;
+ char ab[22], kind, *partof;
char *t;
bfd_boolean local;
/* 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 *fname ATTRIBUTE_UNUSED,
unsigned long lineno ATTRIBUTE_UNUSED,
bfd_vma addr ATTRIBUTE_UNUSED)
{