espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tweak the new handling of function names.

Browse Source
This commit is contained in:
Ian Lance Taylor
1994-09-14 18:29:06 +00:00
parent cc23cc69c5
commit 31c271643b
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ld/ldmisc.c
View File

@ -214,6 +214,8 @@ vfinfo(fp, fmt, arg)
or section name as a last resort. The arguments are a BFD, or section name as a last resort. The arguments are a BFD,
a section, and an offset. */ a section, and an offset. */
{ {
static char *last_file = NULL;
static char *last_function = NULL;
bfd *abfd; bfd *abfd;
asection *section; asection *section;
bfd_vma offset; bfd_vma offset;
@ -222,6 +224,7 @@ vfinfo(fp, fmt, arg)
const char *filename; const char *filename;
const char *functionname; const char *functionname;
unsigned int linenumber; unsigned int linenumber;
boolean discard_last;
abfd = va_arg (arg, bfd *); abfd = va_arg (arg, bfd *);
section = va_arg (arg, asection *); section = va_arg (arg, asection *);
@ -250,6 +253,7 @@ vfinfo(fp, fmt, arg)
} }
} }
discard_last = true;
if (bfd_find_nearest_line (abfd, section, asymbols, offset, if (bfd_find_nearest_line (abfd, section, asymbols, offset,
&filename, &functionname, &linenumber)) &filename, &functionname, &linenumber))
{ {
@ -257,19 +261,45 @@ vfinfo(fp, fmt, arg)
filename = abfd->filename; filename = abfd->filename;
if (functionname != NULL && fmt[-1] == 'C') if (functionname != NULL && fmt[-1] == 'C')
{
if (last_file == NULL
|| last_function == NULL
|| strcmp (last_file, filename) != 0
|| strcmp (last_function, functionname) != 0)
{ {
fprintf (fp, "%s: In function `%s':\n", filename, fprintf (fp, "%s: In function `%s':\n", filename,
demangle (functionname, 1)); demangle (functionname, 1));
if (last_file != NULL)
free (last_file);
last_file = buystring (filename);
if (last_function != NULL)
free (last_function);
last_function = buystring (functionname);
}
discard_last = false;
fprintf (fp, "%s:%u", filename, linenumber); fprintf (fp, "%s:%u", filename, linenumber);
} }
else if (linenumber != 0) else if (linenumber != 0)
fprintf (fp, "%s:%u", filename, linenumber); fprintf (fp, "%s:%u", filename, linenumber);
else else
finfo (fp, "%s(%s+0x%v)", filename, section->name, offset); finfo (fp, "%s(%s+0x%v)", filename, section->name, offset);
} }
else else
finfo (fp, "%s(%s+0x%v)", abfd->filename, section->name, offset); finfo (fp, "%s(%s+0x%v)", abfd->filename, section->name, offset);
if (discard_last)
{
if (last_file != NULL)
{
free (last_file);
last_file = NULL;
}
if (last_function != NULL)
{
free (last_function);
last_function = NULL;
}
}
} }
break; break;