OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gensupport.c (init_include_reader): Merge into ...

Browse Source 
* gensupport.c (init_include_reader): Merge into ...
        (process_include): ... here.  Simplify composite path creation.
        Plug memory leaks.  Fix file/line number tracking.  Do not
        process_define_cond_exec.  Return void.
        (process_rtx): Don't check process_include return value.

From-SVN: r53643
This commit is contained in:
Richard Henderson 2002-05-19 18:17:14 -07:00 committed by Richard Henderson
parent 918ed612a1
commit 174cc7d127
2 changed files with 68 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gcc/ChangeLog
View File

@ -1,3 +1,11 @@
2002-05-19 Richard Henderson <rth@redhat.com>
* gensupport.c (init_include_reader): Merge into ...
(process_include): ... here. Simplify composite path creation.
Plug memory leaks. Fix file/line number tracking. Do not
process_define_cond_exec. Return void.
(process_rtx): Don't check process_include return value.
2002-05-20 Zdenek Dvorak <rakdver@atrey.karlin.mff.cuni.cz> 2002-05-20 Zdenek Dvorak <rakdver@atrey.karlin.mff.cuni.cz>
* basic_block.h (struct basic_block_def): Added prev_bb and next_bb * basic_block.h (struct basic_block_def): Added prev_bb and next_bb

187
gcc/gensupport.c
View File

@ -97,9 +97,8 @@ static const char *alter_output_for_insn PARAMS ((struct queue_elem *,
int, int)); int, int));
static void process_one_cond_exec PARAMS ((struct queue_elem *)); static void process_one_cond_exec PARAMS ((struct queue_elem *));
static void process_define_cond_exec PARAMS ((void)); static void process_define_cond_exec PARAMS ((void));
static int process_include PARAMS ((rtx, int)); static void process_include PARAMS ((rtx, int));
static char *save_string PARAMS ((const char *, int)); static char *save_string PARAMS ((const char *, int));
static int init_include_reader PARAMS ((FILE *));
void void
message_with_line VPARAMS ((int lineno, const char *msg, ...)) message_with_line VPARAMS ((int lineno, const char *msg, ...))
@ -179,142 +178,81 @@ remove_constraints (part)
} }
} }
/* The entry point for initializing the reader. */
static int
init_include_reader (inf)
FILE *inf;
{
int c;
errors = 0;
/* Read the entire file. */
while (1)
{
rtx desc;
int lineno;
c = read_skip_spaces (inf);
if (c == EOF)
break;
ungetc (c, inf);
lineno = read_rtx_lineno;
desc = read_rtx (inf);
process_rtx (desc, lineno);
}
fclose (inf);
/* Process define_cond_exec patterns. */
if (define_cond_exec_queue != NULL)
process_define_cond_exec ();
return errors ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE;
}
/* Process an include file assuming that it lives in gcc/config/{target}/ /* Process an include file assuming that it lives in gcc/config/{target}/
if the include looks line (include "file" ) */ if the include looks line (include "file"). */
static int
static void
process_include (desc, lineno) process_include (desc, lineno)
rtx desc; rtx desc;
int lineno; int lineno;
{ {
const char *filename = XSTR (desc, 0); const char *filename = XSTR (desc, 0);
char *pathname = NULL; const char *old_filename;
int old_lineno;
char *pathname;
FILE *input_file; FILE *input_file;
char *fname = NULL;
struct file_name_list *stackp;
int flen;
stackp = first_dir_md_include; /* If specified file name is absolute, skip the include stack. */
if (! IS_ABSOLUTE_PATHNAME (filename))
/* If specified file name is absolute, just open it. */
if (IS_ABSOLUTE_PATHNAME (filename) || !stackp)
{ {
if (base_dir) struct file_name_list *stackp;
{
pathname = xmalloc (strlen (base_dir) + strlen (filename) + 1);
pathname = strcpy (pathname, base_dir);
strcat (pathname, filename);
strcat (pathname, "\0");
}
else
{
pathname = xstrdup (filename);
}
read_rtx_filename = pathname;
input_file = fopen (pathname, "r");
if (input_file == 0) /* Search directory path, trying to open the file. */
for (stackp = first_dir_md_include; stackp; stackp = stackp->next)
{ {
perror (pathname); static const char sep[2] = { DIR_SEPARATOR, '\0' };
return FATAL_EXIT_CODE;
}
}
else if (stackp)
{
flen = strlen (filename); pathname = concat (stackp->fname, sep, filename, NULL);
fname = (char *) xmalloc (max_include_len + flen + 2);
/* + 2 above for slash and terminating null. */
/* Search directory path, trying to open the file.
Copy each filename tried into FNAME. */
for (; stackp; stackp = stackp->next)
{
if (stackp->fname)
{
strcpy (fname, stackp->fname);
strcat (fname, "/");
fname[strlen (fname) + flen] = 0;
}
else
{
fname[0] = 0;
}
strncat (fname, (const char *) filename, flen);
read_rtx_filename = fname;
input_file = fopen (fname, "r");
if (input_file != NULL)
break;
}
if (stackp == NULL)
{
if (strchr (fname, '/') == NULL || strchr (fname, '\\' ) || base_dir)
{
if (base_dir)
{
pathname =
xmalloc (strlen (base_dir) + strlen (filename) + 1);
pathname = strcpy (pathname, base_dir);
strcat (pathname, filename);
strcat (pathname, "\0");
}
else
pathname = xstrdup (filename);
}
read_rtx_filename = pathname;
input_file = fopen (pathname, "r"); input_file = fopen (pathname, "r");
if (input_file != NULL)
if (input_file == 0) goto success;
{ free (pathname);
perror (filename);
return FATAL_EXIT_CODE;
}
} }
} }
if (init_include_reader (input_file) == FATAL_EXIT_CODE) if (base_dir)
message_with_line (lineno, "read errors found in include file %s\n", pathname); pathname = concat (base_dir, filename, NULL);
else
pathname = xstrdup (filename);
input_file = fopen (pathname, "r");
if (input_file == NULL)
{
free (pathname);
message_with_line (lineno, "include file `%s' not found", filename);
errors = 1;
return;
}
success:
if (fname) /* Save old cursor; setup new for the new file. Note that "lineno" the
free (fname); argument to this function is the beginning of the include statement,
return SUCCESS_EXIT_CODE; while read_rtx_lineno has already been advanced. */
old_filename = read_rtx_filename;
old_lineno = read_rtx_lineno;
read_rtx_filename = pathname;
read_rtx_lineno = 1;
/* Read the entire file. */
while (1)
{
rtx desc;
int c;
c = read_skip_spaces (input_file);
if (c == EOF)
break;
ungetc (c, input_file);
lineno = read_rtx_lineno;
desc = read_rtx (input_file);
process_rtx (desc, lineno);
}
read_rtx_filename = old_filename;
read_rtx_lineno = old_lineno;
fclose (input_file);
free (pathname);
} }
/* Process a top level rtx in some way, queueing as appropriate. */ /* Process a top level rtx in some way, queueing as appropriate. */
@ -339,12 +277,7 @@ process_rtx (desc, lineno)
break; break;
case INCLUDE: case INCLUDE:
if (process_include (desc, lineno) == FATAL_EXIT_CODE) process_include (desc, lineno);
{
const char *filename = XSTR (desc, 0);
message_with_line (lineno, "include file at %s not found\n",
filename);
}
break; break;
case DEFINE_INSN_AND_SPLIT: case DEFINE_INSN_AND_SPLIT: