darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* prdbg.c (tg_variable): Adjust for changed demangler.

Browse source 
(tg_start_function): Likewise.
This commit is contained in:
Alan Modra 2007-04-28 06:03:36 +00:00
parent d6f7985d40
commit e74ecdb3cb
2 changed files with 22 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
binutils/ChangeLog
View file

@ -1,3 +1,8 @@
2007-04-28 Alan Modra <amodra@bigpond.net.au>
* prdbg.c (tg_variable): Adjust for changed demangler.
(tg_start_function): Likewise.
2007-04-27 Alan Modra <amodra@bigpond.net.au>
* bucumm.h: Split off host dependencies to..

54
binutils/prdbg.c
View file

@ -2525,25 +2525,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, DMGL_ANSI | DMGL_PARAMS);
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, "::");
@ -2554,14 +2547,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);
@ -2579,10 +2567,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");
@ -2597,28 +2585,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, DMGL_ANSI | DMGL_PARAMS);
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, "::");
@ -2638,8 +2620,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);