X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=binutils%2Fprdbg.c;h=fab60a6b52964e66e224ed12ab91566329c97602;hb=b6cc44453451b1ac6ca22d83875a6c3583ceec3d;hp=5b6b0479a8e74d2990543fdf9e62074751c81442;hpb=aaad4cf36a0947e445e5b9aef431430b8630e4ee;p=platform%2Fupstream%2Fbinutils.git diff --git a/binutils/prdbg.c b/binutils/prdbg.c index 5b6b047..fab60a6 100644 --- a/binutils/prdbg.c +++ b/binutils/prdbg.c @@ -1,5 +1,5 @@ /* prdbg.c -- Print out generic debugging information. - Copyright 1995, 1996, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1995-2014 Free Software Foundation, Inc. Written by Ian Lance Taylor . Tags style generation written by Salvador E. Tropea . @@ -7,7 +7,7 @@ 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, @@ -17,18 +17,17 @@ 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 +#include "sysdep.h" #include - #include "bfd.h" -#include "bucomm.h" #include "libiberty.h" +#include "demangle.h" #include "debug.h" #include "budbg.h" @@ -52,7 +51,7 @@ struct pr_handle /* 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. */ @@ -303,7 +302,7 @@ print_debugging_info (FILE *f, void *dhandle, bfd *abfd, asymbol **syms, info.filename = NULL; info.abfd = abfd; info.syms = syms; - info.demangler = demangler; + info.demangler = (char * (*)(struct bfd *, const char *, int)) demangler; if (as_tags) { @@ -499,6 +498,26 @@ print_vma (bfd_vma vma, char *buf, bfd_boolean unsignedp, bfd_boolean hexp) 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'; @@ -711,10 +730,16 @@ pr_function_type (void *p, int argcount, bfd_boolean varargs) 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) @@ -724,7 +749,7 @@ pr_function_type (void *p, int argcount, bfd_boolean varargs) /* Now the return type is on the top of the stack. */ s = (char *) xmalloc (len); - strcpy (s, "(|) ("); + LITSTRCPY (s, "(|) ("); if (argcount < 0) strcat (s, "/* unknown */"); @@ -909,11 +934,10 @@ pr_method_type (void *p, bfd_boolean domain, int argcount, bfd_boolean varargs) 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; @@ -933,10 +957,16 @@ pr_method_type (void *p, bfd_boolean domain, int argcount, bfd_boolean varargs) 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) @@ -1298,7 +1328,7 @@ pr_class_static_member (void *p, const char *name, const char *physname, /* 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; @@ -1316,7 +1346,7 @@ pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean virtual, 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 @@ -1324,7 +1354,7 @@ pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean virtual, if (! push_type (info, t)) return FALSE; - if (virtual) + if (is_virtual) { if (! prepend_type (info, "virtual ")) return FALSE; @@ -1904,7 +1934,7 @@ find_address_in_section (bfd *abfd, asection *section, void *data) if (pc < vma) return; - size = bfd_get_section_size_before_reloc (section); + size = bfd_get_section_size (section); if (pc >= vma + size) return; @@ -1928,15 +1958,13 @@ translate_addresses (bfd *abfd, char *addr_hex, FILE *f, asymbol **syms) /* 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; } @@ -1944,13 +1972,13 @@ tg_start_compilation_unit (void * p, const char *filename ATTRIBUTE_UNUSED) /* 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; } @@ -2071,8 +2099,7 @@ tg_struct_field (void *p, const char *name, bfd_vma bitpos ATTRIBUTE_UNUSED, 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; } @@ -2156,22 +2183,33 @@ tg_class_static_member (void *p, const char *name, full_name = (char *) 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; + { + 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, @@ -2186,7 +2224,7 @@ tg_class_static_member (void *p, const char *name, 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; @@ -2198,7 +2236,7 @@ tg_class_baseclass (void *p, bfd_vma bitpos ATTRIBUTE_UNUSED, 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 @@ -2206,7 +2244,7 @@ tg_class_baseclass (void *p, bfd_vma bitpos ATTRIBUTE_UNUSED, if (! push_type (info, t)) return FALSE; - if (virtual) + if (is_virtual) { if (! prepend_type (info, "virtual ")) return FALSE; @@ -2281,12 +2319,18 @@ tg_class_method_variant (void *p, const char *physname ATTRIBUTE_UNUSED, /* 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) @@ -2295,12 +2339,21 @@ tg_class_method_variant (void *p, const char *physname ATTRIBUTE_UNUSED, { 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); @@ -2346,16 +2399,26 @@ tg_class_static_method_variant (void *p, 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, @@ -2528,25 +2591,18 @@ tg_variable (void *p, const char *name, enum debug_var_kind kind, 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, "::"); @@ -2557,14 +2613,9 @@ tg_variable (void *p, const char *name, enum debug_var_kind kind, 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); @@ -2582,10 +2633,10 @@ tg_variable (void *p, const char *name, enum debug_var_kind kind, } 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"); @@ -2600,28 +2651,22 @@ static bfd_boolean 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, "::"); @@ -2641,8 +2686,6 @@ tg_start_function (void *p, const char *name, bfd_boolean global) *sep = 0; /* Obscure functions as type_info function. */ } - else - info->stack->method = NULL; info->stack->parents = strdup (name); @@ -2750,7 +2793,7 @@ tg_start_block (void *p, bfd_vma addr) /* 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) {