OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* xcoffread.c (process_linenos): Make sure filename we pass to 

start_subfile will cause deduce_language_from_filename to return
	the correct thing.  Reindent function to GNU standards.
This commit is contained in:
Jim Kingdon 1995-03-17 00:41:40 +00:00
parent 3c727f7293
commit 5cba5d2608
1 changed files with 108 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
gdb/xcoffread.c
View File

@ -529,17 +529,16 @@ process_linenos (start, end)
char *pp; char *pp;
int offset, ii; int offset, ii;
struct subfile main_subfile; /* subfile structure for the main /* subfile structure for the main compilation unit. */
compilation unit. */ struct subfile main_subfile;
/* in the main source file, any time we see a function entry, we reset /* In the main source file, any time we see a function entry, we
this variable to function's absolute starting line number. All the reset this variable to function's absolute starting line number.
following line numbers in the function are relative to this, and All the following line numbers in the function are relative to
we record absolute line numbers in record_line(). */ this, and we record absolute line numbers in record_line(). */
int main_source_baseline = 0; int main_source_baseline = 0;
unsigned *firstLine; unsigned *firstLine;
CORE_ADDR addr; CORE_ADDR addr;
@ -555,46 +554,49 @@ process_linenos (start, end)
enter_line_range (&main_subfile, offset, 0, start, end, enter_line_range (&main_subfile, offset, 0, start, end,
&main_source_baseline); &main_source_baseline);
/* else, there was source with line numbers in include files */ else
else { {
/* There was source with line numbers in include files. */
main_source_baseline = 0; main_source_baseline = 0;
for (ii=0; ii < inclIndx; ++ii) { for (ii=0; ii < inclIndx; ++ii)
{
struct subfile *tmpSubfile; struct subfile *tmpSubfile;
/* if there is main file source before include file, enter it. */ /* If there is main file source before include file, enter it. */
if (offset < inclTable[ii].begin) { if (offset < inclTable[ii].begin)
{
enter_line_range enter_line_range
(&main_subfile, offset, inclTable[ii].begin - LINESZ, start, 0, (&main_subfile, offset, inclTable[ii].begin - LINESZ,
&main_source_baseline); start, 0, &main_source_baseline);
} }
/* Have a new subfile for the include file */ /* Have a new subfile for the include file. */
tmpSubfile = inclTable[ii].subfile = (struct subfile*) tmpSubfile = inclTable[ii].subfile =
xmalloc (sizeof (struct subfile)); (struct subfile *) xmalloc (sizeof (struct subfile));
memset (tmpSubfile, '\0', sizeof (struct subfile)); memset (tmpSubfile, '\0', sizeof (struct subfile));
firstLine = &(inclTable[ii].funStartLine); firstLine = &(inclTable[ii].funStartLine);
/* enter include file's lines now. */ /* Enter include file's lines now. */
enter_line_range (tmpSubfile, inclTable[ii].begin, enter_line_range (tmpSubfile, inclTable[ii].begin,
inclTable[ii].end, start, 0, firstLine); inclTable[ii].end, start, 0, firstLine);
offset = inclTable[ii].end + LINESZ; offset = inclTable[ii].end + LINESZ;
} }
/* all the include files' line have been processed at this point. Now, /* All the include files' line have been processed at this point. Now,
enter remaining lines of the main file, if any left. */ enter remaining lines of the main file, if any left. */
if (offset < (linetab_offset + linetab_size + 1 - LINESZ)) { if (offset < (linetab_offset + linetab_size + 1 - LINESZ))
{
enter_line_range (&main_subfile, offset, 0, start, end, enter_line_range (&main_subfile, offset, 0, start, end,
&main_source_baseline); &main_source_baseline);
} }
} }
/* Process main file's line numbers. */ /* Process main file's line numbers. */
if (main_subfile.line_vector) { if (main_subfile.line_vector)
{
struct linetable *lineTb, *lv; struct linetable *lineTb, *lv;
lv = main_subfile.line_vector; lv = main_subfile.line_vector;
@ -603,13 +605,14 @@ process_linenos (start, end)
put static function to the end. */ put static function to the end. */
lineTb = arrange_linetable (lv); lineTb = arrange_linetable (lv);
if (lv == lineTb) { if (lv == lineTb)
{
current_subfile->line_vector = (struct linetable *) current_subfile->line_vector = (struct linetable *)
xrealloc (lv, (sizeof (struct linetable) xrealloc (lv, (sizeof (struct linetable)
+ lv->nitems * sizeof (struct linetable_entry))); + lv->nitems * sizeof (struct linetable_entry)));
} }
else { else
{
free (lv); free (lv);
current_subfile->line_vector = lineTb; current_subfile->line_vector = lineTb;
} }
@ -620,9 +623,10 @@ process_linenos (start, end)
/* Now, process included files' line numbers. */ /* Now, process included files' line numbers. */
for (ii=0; ii < inclIndx; ++ii) { for (ii=0; ii < inclIndx; ++ii)
{
if ( (inclTable[ii].subfile)->line_vector) { /* Useless if!!! FIXMEmgo */ if ((inclTable[ii].subfile)->line_vector) /* Useless if!!! FIXMEmgo */
{
struct linetable *lineTb, *lv; struct linetable *lineTb, *lv;
lv = (inclTable[ii].subfile)->line_vector; lv = (inclTable[ii].subfile)->line_vector;
@ -634,8 +638,8 @@ process_linenos (start, end)
push_subfile (); push_subfile ();
/* For the same include file, we might want to have more than one subfile. /* For the same include file, we might want to have more than one
This happens if we have something like: subfile. This happens if we have something like:
...... ......
#include "foo.h" #include "foo.h"
@ -644,21 +648,36 @@ process_linenos (start, end)
...... ......
while foo.h including code in it. (stupid but possible) while foo.h including code in it. (stupid but possible)
Since start_subfile() looks at the name and uses an existing one if finds, Since start_subfile() looks at the name and uses an
we need to provide a fake name and fool it. */ existing one if finds, we need to provide a fake name and
fool it. */
/* start_subfile (inclTable[ii].name, (char*)0); */ #if 0
start_subfile (" ?", (char*)0); start_subfile (inclTable[ii].name, (char*)0);
#else
{
/* Pick a fake name that will produce the same results as this
one when passed to deduce_language_from_filename. Kludge on
top of kludge. */
char *fakename = strrchr (inclTable[ii].name, '.');
if (fakename == NULL)
fakename = " ?";
start_subfile (fakename, (char*)0);
free (current_subfile->name); free (current_subfile->name);
}
current_subfile->name = strdup (inclTable[ii].name); current_subfile->name = strdup (inclTable[ii].name);
#endif
if (lv == lineTb) { if (lv == lineTb)
current_subfile->line_vector = (struct linetable *) {
xrealloc (lv, (sizeof (struct linetable) current_subfile->line_vector =
(struct linetable *) xrealloc
(lv, (sizeof (struct linetable)
+ lv->nitems * sizeof (struct linetable_entry))); + lv->nitems * sizeof (struct linetable_entry)));
} }
else { else
{
free (lv); free (lv);
current_subfile->line_vector = lineTb; current_subfile->line_vector = lineTb;
} }
@ -669,12 +688,12 @@ process_linenos (start, end)
} }
} }
return_after_cleanup: return_after_cleanup:
/* We don't want to keep alloc/free'ing the global include file table. */ /* We don't want to keep alloc/free'ing the global include file table. */
inclIndx = 0; inclIndx = 0;
/* start with a fresh subfile structure for the next file. */ /* Start with a fresh subfile structure for the next file. */
memset (&main_subfile, '\0', sizeof (struct subfile)); memset (&main_subfile, '\0', sizeof (struct subfile));
} }