+2000-02-24 Mark Mitchell <mark@codesourcery.com>
+
+ * input.h (push_srcloc): New function.
+ (pop_srcloc): Likewise.
+ * toplev.c (push_srcloc): Define it.
+ (pop_srcloc): Likewise.
+
2000-02-24 Richard Henderson <rth@cygnus.com>
* flow.c (life_analysis): When collecting reg info, clear
/* Declarations for variables relating to reading the source file.
Used by parsers, lexical analyzers, and error message routines.
- Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc.
+ Copyright (C) 1993, 1997, 1998, 2000 Free Software Foundation, Inc.
This file is part of GNU CC.
/* Incremented on each change to input_file_stack. */
extern int input_file_stack_tick;
+
+extern void push_srcloc PARAMS ((char *name, int line));
+extern void pop_srcloc PARAMS ((void));
}
}
+/* Save the current INPUT_FILENAME and LINENO on the top entry in the
+ INPUT_FILE_STACK. Push a new entry for FILE and LINE, and set the
+ INPUT_FILENAME and LINENO accordingly. */
+
+void
+push_srcloc (file, line)
+ char *file;
+ int line;
+{
+ struct file_stack *fs;
+
+ if (input_file_stack)
+ {
+ input_file_stack->name = input_filename;
+ input_file_stack->line = lineno;
+ }
+
+ fs = (struct file_stack *) xmalloc (sizeof (struct file_stack));
+ fs->name = input_filename = file;
+ fs->line = lineno = line;
+ fs->indent_level = 0;
+ fs->next = input_file_stack;
+ input_file_stack = fs;
+ input_file_stack_tick++;
+}
+
+/* Pop the top entry off the stack of presently open source files.
+ Restore the INPUT_FILENAME and LINENO from the new topmost entry on
+ the stack. */
+
+void
+pop_srcloc ()
+{
+ struct file_stack *fs;
+
+ fs = input_file_stack;
+ input_file_stack = fs->next;
+ free (fs);
+ input_file_stack_tick++;
+ /* The initial souce file is never popped. */
+ if (!input_file_stack)
+ abort ();
+ input_filename = input_file_stack->name;
+ lineno = input_file_stack->line;
+}
+
/* Compile an entire file of output from cpp, named NAME.
Write a file of assembly output and various debugging dumps. */
input_filename = name;
/* Put an entry on the input file stack for the main input file. */
- input_file_stack
- = (struct file_stack *) xmalloc (sizeof (struct file_stack));
- input_file_stack->next = 0;
- input_file_stack->name = input_filename;
+ push_srcloc (input_filename, 0);
/* Perform language-specific initialization.
This may set main_input_filename. */