X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fprdbg.c;h=091cefeadae0fcc838b812af68d435730097bcdf;hb=5bb3703f01dd574faebbd3a69f4c64dbfee6a701;hp=098bd58c3d4337f7acdbab59151cd7d536bb9f8d;hpb=32866df75ece22ec1fd88e99e3c5effe9238e072;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/prdbg.c b/binutils/prdbg.c index 098bd58c3d..091cefeada 100644 --- a/binutils/prdbg.c +++ b/binutils/prdbg.c @@ -1,6 +1,6 @@ /* prdbg.c -- Print out generic debugging information. - Copyright 1995, 1996, 1999, 2002, 2003, 2004, 2006, 2007 - Free Software Foundation, Inc. + Copyright 1995, 1996, 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008, + 2009, 2011 Free Software Foundation, Inc. Written by Ian Lance Taylor . Tags style generation written by Salvador E. Tropea . @@ -303,7 +303,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 +499,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 +731,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) @@ -723,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 = xmalloc (len); + s = (char *) xmalloc (len); LITSTRCPY (s, "(|) ("); if (argcount < 0) @@ -932,10 +958,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) @@ -1297,7 +1329,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; @@ -1323,7 +1355,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; @@ -1927,15 +1959,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; } @@ -1943,13 +1973,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; } @@ -2070,8 +2100,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; } @@ -2152,23 +2181,36 @@ tg_class_static_member (void *p, const char *name, 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, @@ -2183,7 +2225,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; @@ -2203,7 +2245,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; @@ -2278,12 +2320,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) @@ -2292,12 +2340,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); @@ -2343,16 +2400,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, @@ -2727,7 +2794,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) {