projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New port: National Semiconductor's CR16
[deliverable/binutils-gdb.git]
/
binutils
/
prdbg.c
diff --git
a/binutils/prdbg.c
b/binutils/prdbg.c
index 87a49341b016ab965470dda5cb1b7efa171ca052..529903d790c04438b6f5b5ebdcc1b1ed6a930149 100644
(file)
--- a/
binutils/prdbg.c
+++ b/
binutils/prdbg.c
@@
-1,5
+1,5
@@
/* prdbg.c -- Print out generic debugging information.
/* prdbg.c -- Print out generic debugging information.
- Copyright 1995, 1996, 1999, 2002, 2003, 2004
+ Copyright 1995, 1996, 1999, 2002, 2003, 2004
, 2006, 2007
Free Software Foundation, Inc.
Written by Ian Lance Taylor <ian@cygnus.com>.
Tags style generation written by Salvador E. Tropea <set@computer.org>.
Free Software Foundation, Inc.
Written by Ian Lance Taylor <ian@cygnus.com>.
Tags style generation written by Salvador E. Tropea <set@computer.org>.
@@
-24,12
+24,11
@@
/* This file prints out the generic debugging information, by
supplying a set of routines to debug_write. */
/* This file prints out the generic debugging information, by
supplying a set of routines to debug_write. */
-#include
<stdio.h>
+#include
"sysdep.h"
#include <assert.h>
#include <assert.h>
-
#include "bfd.h"
#include "bfd.h"
-#include "bucomm.h"
#include "libiberty.h"
#include "libiberty.h"
+#include "demangle.h"
#include "debug.h"
#include "budbg.h"
#include "debug.h"
#include "budbg.h"
@@
-53,7
+52,7
@@
struct pr_handle
/* The symbols table for this BFD. */
asymbol **syms;
/* Pointer to a function to demangle symbols. */
/* 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. */
};
/* The type stack. */
@@
-724,8
+723,8
@@
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 =
(char *)
xmalloc (len);
-
strcpy
(s, "(|) (");
+ s = xmalloc (len);
+
LITSTRCPY
(s, "(|) (");
if (argcount < 0)
strcat (s, "/* unknown */");
if (argcount < 0)
strcat (s, "/* unknown */");
@@
-910,11
+909,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;
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;
&& 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;
&& (strchr (domain_type + sizeof "union class " - 1, ' ')
== NULL))
domain_type += sizeof "union class " - 1;
@@
-1317,7
+1315,7
@@
pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean virtual,
if (t == NULL)
return FALSE;
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
t += sizeof "class " - 1;
/* Push it back on to take advantage of the prepend_type and
@@
-2154,12
+2152,10
@@
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 =
(char *)
xmalloc (len_var + len_class + 3);
+ full_name = xmalloc (len_var + len_class + 3);
if (! full_name)
return FALSE;
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;
if (! substitute_type (info, full_name))
return FALSE;
@@
-2199,7
+2195,7
@@
tg_class_baseclass (void *p, bfd_vma bitpos ATTRIBUTE_UNUSED,
if (t == NULL)
return FALSE;
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
t += sizeof "class " - 1;
/* Push it back on to take advantage of the prepend_type and
@@
-2529,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;
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;
t = pop_type (info);
if (t == NULL)
return FALSE;
- dname =
name
;
+ dname =
NULL
;
if (info->demangler)
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, "::");
{
char *sep;
sep = strstr (dname, "::");
@@
-2558,14
+2547,9
@@
tg_variable (void *p, const char *name, enum debug_var_kind kind,
from_class = dname;
}
else
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);
fprintf (info->f, "%s\t%s\t0;\"\tkind:v\ttype:%s", name, info->filename, t);
@@
-2583,10
+2567,10
@@
tg_variable (void *p, const char *name, enum debug_var_kind kind,
}
if (from_class)
}
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");
fprintf (info->f, "\n");
@@
-2601,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;
tg_start_function (void *p, const char *name, bfd_boolean global)
{
struct pr_handle *info = (struct pr_handle *) p;
- c
onst c
har *dname;
+ char *dname;
if (! global)
info->stack->flavor = "static";
else
info->stack->flavor = NULL;
if (! global)
info->stack->flavor = "static";
else
info->stack->flavor = NULL;
- dname =
name
;
+ dname =
NULL
;
if (info->demangler)
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;
return FALSE;
- if (dname != name)
+ info->stack->method = NULL;
+ if (dname != NULL)
{
char *sep;
sep = strstr (dname, "::");
{
char *sep;
sep = strstr (dname, "::");
@@
-2642,8
+2620,6
@@
tg_start_function (void *p, const char *name, bfd_boolean global)
*sep = 0;
/* Obscure functions as type_info function. */
}
*sep = 0;
/* Obscure functions as type_info function. */
}
- else
- info->stack->method = NULL;
info->stack->parents = strdup (name);
info->stack->parents = strdup (name);
This page took
0.026086 seconds
and
4
git commands to generate.