projects
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use scoped_value_mark in dwarf2_evaluate_loc_desc_full
[binutils-gdb.git]
/
binutils
/
prdbg.c
diff --git
a/binutils/prdbg.c
b/binutils/prdbg.c
index 14e371c2bc39d190d22a9076d03c228d0c9d10d9..9bd01bc071a8704e0c0662708d4eae8338e3b6f6 100644
(file)
--- a/
binutils/prdbg.c
+++ b/
binutils/prdbg.c
@@
-1,6
+1,5
@@
/* prdbg.c -- Print out generic debugging information.
/* prdbg.c -- Print out generic debugging information.
- Copyright 1995, 1996, 1999, 2002, 2003, 2004, 2006, 2007, 2008
- Free Software Foundation, Inc.
+ Copyright (C) 1995-2017 Free Software Foundation, Inc.
Written by Ian Lance Taylor <ian@cygnus.com>.
Tags style generation written by Salvador E. Tropea <set@computer.org>.
Written by Ian Lance Taylor <ian@cygnus.com>.
Tags style generation written by Salvador E. Tropea <set@computer.org>.
@@
-292,7
+291,8
@@
static const struct debug_write_fns tg_fns =
bfd_boolean
print_debugging_info (FILE *f, void *dhandle, bfd *abfd, asymbol **syms,
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;
{
struct pr_handle info;
@@
-502,12
+502,21
@@
print_vma (bfd_vma vma, char *buf, bfd_boolean unsignedp, bfd_boolean hexp)
#if BFD_HOST_64BIT_LONG_LONG
else if (sizeof (vma) <= sizeof (unsigned long long))
{
#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);
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
}
#endif
else
@@
-663,7
+672,7
@@
pr_enum_type (void *p, const char *tag, const char **names,
if (values[i] != val)
{
if (values[i] != val)
{
- char ab[2
0
];
+ char ab[2
2
];
print_vma (values[i], ab, FALSE, FALSE);
if (! append_type (info, " = ")
print_vma (values[i], ab, FALSE, FALSE);
if (! append_type (info, " = ")
@@
-722,10
+731,16
@@
pr_function_type (void *p, int argcount, bfd_boolean varargs)
for (i = argcount - 1; i >= 0; i--)
{
if (! substitute_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)
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)
len += strlen (arg_types[i]) + 2;
}
if (varargs)
@@
-734,7
+749,7
@@
pr_function_type (void *p, int argcount, bfd_boolean varargs)
/* Now the return type is on the top of the stack. */
/* Now the return type is on the top of the stack. */
- s = xmalloc (len);
+ s =
(char *)
xmalloc (len);
LITSTRCPY (s, "(|) (");
if (argcount < 0)
LITSTRCPY (s, "(|) (");
if (argcount < 0)
@@
-787,7
+802,7
@@
static bfd_boolean
pr_range_type (void *p, bfd_signed_vma lower, bfd_signed_vma upper)
{
struct pr_handle *info = (struct pr_handle *) p;
pr_range_type (void *p, bfd_signed_vma lower, bfd_signed_vma upper)
{
struct pr_handle *info = (struct pr_handle *) p;
- char abl[2
0], abu[20
];
+ char abl[2
2], abu[22
];
assert (info->stack != NULL);
assert (info->stack != NULL);
@@
-812,7
+827,7
@@
pr_array_type (void *p, bfd_signed_vma lower, bfd_signed_vma upper,
{
struct pr_handle *info = (struct pr_handle *) p;
char *range_type;
{
struct pr_handle *info = (struct pr_handle *) p;
char *range_type;
- char abl[2
0], abu[20
], ab[50];
+ char abl[2
2], abu[22
], ab[50];
range_type = pop_type (info);
if (range_type == NULL)
range_type = pop_type (info);
if (range_type == NULL)
@@
-943,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, ""))
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)
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)
len += strlen (arg_types[i]) + 2;
}
if (varargs)
@@
-1130,7
+1151,7
@@
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;
enum debug_visibility visibility)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[2
0
];
+ char ab[2
2
];
char *t;
if (! substitute_type (info, name))
char *t;
if (! substitute_type (info, name))
@@
-1308,13
+1329,13
@@
pr_class_static_member (void *p, const char *name, const char *physname,
/* Add a base class to a class. */
static bfd_boolean
/* 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;
enum debug_visibility visibility)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
const char *prefix;
- char ab[2
0
];
+ char ab[2
2
];
char *s, *l, *n;
assert (info->stack != NULL && info->stack->next != NULL);
char *s, *l, *n;
assert (info->stack != NULL && info->stack->next != NULL);
@@
-1334,7
+1355,7
@@
pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean virtual,
if (! push_type (info, t))
return FALSE;
if (! push_type (info, t))
return FALSE;
- if (virtual)
+ if (
is_
virtual)
{
if (! prepend_type (info, "virtual "))
return FALSE;
{
if (! prepend_type (info, "virtual "))
return FALSE;
@@
-1474,7
+1495,7
@@
pr_class_method_variant (void *p, const char *physname,
return FALSE;
if (context || voffset != 0)
{
return FALSE;
if (context || voffset != 0)
{
- char ab[2
0
];
+ char ab[2
2
];
if (context)
{
if (context)
{
@@
-1581,7
+1602,7
@@
pr_tag_type (void *p, const char *name, unsigned int id,
{
struct pr_handle *info = (struct pr_handle *) p;
const char *t, *tag;
{
struct pr_handle *info = (struct pr_handle *) p;
const char *t, *tag;
- char idbuf[2
0
];
+ char idbuf[2
2
];
switch (kind)
{
switch (kind)
{
@@
-1677,7
+1698,7
@@
static bfd_boolean
pr_int_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
pr_int_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[2
0
];
+ char ab[2
2
];
indent (info);
print_vma (val, ab, FALSE, FALSE);
indent (info);
print_vma (val, ab, FALSE, FALSE);
@@
-1704,7
+1725,7
@@
pr_typed_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
- char ab[2
0
];
+ char ab[2
2
];
t = pop_type (info);
if (t == NULL)
t = pop_type (info);
if (t == NULL)
@@
-1727,7
+1748,7
@@
pr_variable (void *p, const char *name, enum debug_var_kind kind,
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
- char ab[2
0
];
+ char ab[2
2
];
if (! substitute_type (info, name))
return FALSE;
if (! substitute_type (info, name))
return FALSE;
@@
-1790,7
+1811,7
@@
pr_function_parameter (void *p, const char *name,
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
- char ab[2
0
];
+ char ab[2
2
];
if (kind == DEBUG_PARM_REFERENCE
|| kind == DEBUG_PARM_REF_REG)
if (kind == DEBUG_PARM_REFERENCE
|| kind == DEBUG_PARM_REF_REG)
@@
-1828,7
+1849,7
@@
static bfd_boolean
pr_start_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
pr_start_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[2
0
];
+ char ab[2
2
];
if (info->parameter > 0)
{
if (info->parameter > 0)
{
@@
-1851,7
+1872,7
@@
static bfd_boolean
pr_lineno (void *p, const char *filename, unsigned long lineno, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
pr_lineno (void *p, const char *filename, unsigned long lineno, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[2
0
];
+ char ab[2
2
];
indent (info);
print_vma (addr, ab, TRUE, TRUE);
indent (info);
print_vma (addr, ab, TRUE, TRUE);
@@
-1866,7
+1887,7
@@
static bfd_boolean
pr_end_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
pr_end_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[2
0
];
+ char ab[2
2
];
info->indent -= 2;
info->indent -= 2;
@@
-1938,15
+1959,13
@@
translate_addresses (bfd *abfd, char *addr_hex, FILE *f, asymbol **syms)
/* Start a new compilation unit. */
static bfd_boolean
/* Start a new compilation unit. */
static bfd_boolean
-tg_start_compilation_unit (void * p, const char *f
ile
name ATTRIBUTE_UNUSED)
+tg_start_compilation_unit (void * p, const char *fname ATTRIBUTE_UNUSED)
{
struct pr_handle *info = (struct pr_handle *) p;
{
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?. */
free (info->filename);
/* Should it be relative? best way to do it here?. */
- info->filename = strdup (f
ile
name);
+ info->filename = strdup (fname);
return TRUE;
}
return TRUE;
}
@@
-1954,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
/* Start a source file within a compilation unit. */
static bfd_boolean
-tg_start_source (void *p, const char *f
ile
name)
+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?. */
{
struct pr_handle *info = (struct pr_handle *) p;
free (info->filename);
/* Should it be relative? best way to do it here?. */
- info->filename = strdup (f
ile
name);
+ info->filename = strdup (fname);
return TRUE;
}
return TRUE;
}
@@
-1974,7
+1993,7
@@
tg_enum_type (void *p, const char *tag, const char **names,
struct pr_handle *info = (struct pr_handle *) p;
unsigned int i;
const char *name;
struct pr_handle *info = (struct pr_handle *) p;
unsigned int i;
const char *name;
- char ab[2
0
];
+ char ab[2
2
];
if (! pr_enum_type (p, tag, names, values))
return FALSE;
if (! pr_enum_type (p, tag, names, values))
return FALSE;
@@
-2081,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)
{
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;
}
return TRUE;
}
@@
-2163,23
+2181,36
@@
tg_class_static_member (void *p, const char *name,
len_var = strlen (name);
len_class = strlen (info->stack->next->type);
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))
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 "))
if (! prepend_type (info, "static "))
- return FALSE;
+ {
+ free (full_name);
+ return FALSE;
+ }
t = pop_type (info);
if (t == NULL)
t = pop_type (info);
if (t == NULL)
- return FALSE;
+ {
+ free (full_name);
+ return FALSE;
+ }
if (! tg_fix_visibility (info, visibility))
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,
fprintf (info->f, "%s\t%s\t0;\"\tkind:x\ttype:%s\tclass:%s\taccess:%s\n",
name, info->filename, t, info->stack->type,
@@
-2194,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,
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;
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
@@
-2214,7
+2245,7
@@
tg_class_baseclass (void *p, bfd_vma bitpos ATTRIBUTE_UNUSED,
if (! push_type (info, t))
return FALSE;
if (! push_type (info, t))
return FALSE;
- if (virtual)
+ if (
is_
virtual)
{
if (! prepend_type (info, "virtual "))
return FALSE;
{
if (! prepend_type (info, "virtual "))
return FALSE;
@@
-2289,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))
/* 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)
/* 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)
/* Pull off the context type if there is one. */
if (! context)
@@
-2303,12
+2340,21
@@
tg_class_method_variant (void *p, const char *physname ATTRIBUTE_UNUSED,
{
context_type = pop_type (info);
if (context_type == NULL)
{
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))
}
/* 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);
fprintf (info->f, "%s\t%s\t0;\"\tkind:p\ttype:%s\tclass:%s\n",
method_name, info->filename, method_type, info->stack->type);
@@
-2354,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))
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)
/* 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))
/* 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,
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,
@@
-2484,7
+2540,7
@@
static bfd_boolean
tg_int_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
tg_int_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[2
0
];
+ char ab[2
2
];
indent (info);
print_vma (val, ab, FALSE, FALSE);
indent (info);
print_vma (val, ab, FALSE, FALSE);
@@
-2513,7
+2569,7
@@
tg_typed_constant (void *p, const char *name, bfd_vma val)
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
{
struct pr_handle *info = (struct pr_handle *) p;
char *t;
- char ab[2
0
];
+ char ab[2
2
];
t = pop_type (info);
if (t == NULL)
t = pop_type (info);
if (t == NULL)
@@
-2691,7
+2747,7
@@
static bfd_boolean
tg_start_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
tg_start_block (void *p, bfd_vma addr)
{
struct pr_handle *info = (struct pr_handle *) p;
- char ab[2
0
], kind, *partof;
+ char ab[2
2
], kind, *partof;
char *t;
bfd_boolean local;
char *t;
bfd_boolean local;
@@
-2738,7
+2794,7
@@
tg_start_block (void *p, bfd_vma addr)
/* Write out line number information. */
static bfd_boolean
/* Write out line number information. */
static bfd_boolean
-tg_lineno (void *p ATTRIBUTE_UNUSED, const char *f
ile
name ATTRIBUTE_UNUSED,
+tg_lineno (void *p ATTRIBUTE_UNUSED, const char *fname ATTRIBUTE_UNUSED,
unsigned long lineno ATTRIBUTE_UNUSED,
bfd_vma addr ATTRIBUTE_UNUSED)
{
unsigned long lineno ATTRIBUTE_UNUSED,
bfd_vma addr ATTRIBUTE_UNUSED)
{