/* prdbg.c -- Print out generic debugging information.
- Copyright 1995, 1996, 1999, 2002, 2003, 2004, 2006, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2014 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,
info.filename = NULL;
info.abfd = abfd;
info.syms = syms;
- info.demangler = demangler;
+ info.demangler = (char * (*)(struct bfd *, const char *, int)) demangler;
if (as_tags)
{
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';
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)
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)
/* 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;
if (! push_type (info, t))
return FALSE;
- if (virtual)
+ if (is_virtual)
{
if (! prepend_type (info, "virtual "))
return FALSE;
/* 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;
}
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;
}
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,
/* 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)
{
projects / platform / upstream / binutils.git / blobdiff