/*****************************************************************************/
/* */
-/* input.c */
+/* input.c */
/* */
-/* Input file handling */
+/* Input file handling */
/* */
/* */
/* */
-/* (C) 2000 Ullrich von Bassewitz */
-/* Wacholderweg 14 */
-/* D-70597 Stuttgart */
-/* EMail: uz@musoftware.de */
+/* (C) 2000-2012, Ullrich von Bassewitz */
+/* Roemerstrasse 52 */
+/* D-70794 Filderstadt */
+/* EMail: uz@cc65.org */
/* */
/* */
/* This software is provided 'as-is', without any expressed or implied */
/* common */
#include "check.h"
#include "coll.h"
+#include "filestat.h"
+#include "fname.h"
+#include "print.h"
+#include "strbuf.h"
#include "xmalloc.h"
/* cc65 */
-#include "asmcode.h"
+#include "codegen.h"
#include "error.h"
+#include "global.h"
#include "incpath.h"
-#include "lineinfo.h"
#include "input.h"
+#include "lineinfo.h"
+#include "output.h"
/*****************************************************************************/
-/* Data */
+/* Data */
/*****************************************************************************/
-/* Input line stuff */
-static char LineBuf [LINESIZE];
-char* line = LineBuf;
-const char* lptr = LineBuf;
+/* The current input line */
+StrBuf* Line;
/* Current and next input character */
char CurC = '\0';
char NextC = '\0';
/* Maximum count of nested includes */
-#define MAX_INC_NESTING 16
+#define MAX_INC_NESTING 16
+
+/* Struct that describes an input file */
+typedef struct IFile IFile;
+struct IFile {
+ unsigned Index; /* File index */
+ unsigned Usage; /* Usage counter */
+ unsigned long Size; /* File size */
+ unsigned long MTime; /* Time of last modification */
+ InputType Type; /* Type of input file */
+ char Name[1]; /* Name of file (dynamically allocated) */
+};
/* Struct that describes an active input file */
typedef struct AFile AFile;
struct AFile {
- unsigned Line; /* Line number for this file */
- FILE* F; /* Input file stream */
- IFile* Input; /* Points to corresponding IFile */
+ unsigned Line; /* Line number for this file */
+ FILE* F; /* Input file stream */
+ IFile* Input; /* Points to corresponding IFile */
+ int SearchPath; /* True if we've added a path for this file */
};
/* List of all input files */
/* List of all active files */
static Collection AFiles = STATIC_COLLECTION_INITIALIZER;
+/* Input stack used when preprocessing. */
+static Collection InputStack = STATIC_COLLECTION_INITIALIZER;
+
/*****************************************************************************/
-/* struct IFile */
+/* struct IFile */
/*****************************************************************************/
-static IFile* NewIFile (const char* Name)
+static IFile* NewIFile (const char* Name, InputType Type)
/* Create and return a new IFile */
{
/* Get the length of the name */
/* Initialize the fields */
IF->Index = CollCount (&IFiles) + 1;
IF->Usage = 0;
+ IF->Size = 0;
+ IF->MTime = 0;
+ IF->Type = Type;
memcpy (IF->Name, Name, Len+1);
/* Insert the new structure into the IFile collection */
/*****************************************************************************/
-/* struct AFile */
+/* struct AFile */
/*****************************************************************************/
static AFile* NewAFile (IFile* IF, FILE* F)
-/* Create and return a new AFile */
+/* Create a new AFile, push it onto the stack, add the path of the file to
+ * the path search list, and finally return a pointer to the new AFile struct.
+ */
{
+ StrBuf Path = AUTO_STRBUF_INITIALIZER;
+
/* Allocate a AFile structure */
AFile* AF = (AFile*) xmalloc (sizeof (AFile));
AF->F = F;
AF->Input = IF;
- /* Increment the usage counter of the corresponding IFile */
- ++IF->Usage;
+ /* Increment the usage counter of the corresponding IFile. If this
+ * is the first use, set the file data and output debug info if
+ * requested.
+ */
+ if (IF->Usage++ == 0) {
+
+ /* Get file size and modification time. There a race condition here,
+ * since we cannot use fileno() (non standard identifier in standard
+ * header file), and therefore not fstat. When using stat with the
+ * file name, there's a risk that the file was deleted and recreated
+ * while it was open. Since mtime and size are only used to check
+ * if a file has changed in the debugger, we will ignore this problem
+ * here.
+ */
+ struct stat Buf;
+ if (FileStat (IF->Name, &Buf) != 0) {
+ /* Error */
+ Fatal ("Cannot stat `%s': %s", IF->Name, strerror (errno));
+ }
+ IF->Size = (unsigned long) Buf.st_size;
+ IF->MTime = (unsigned long) Buf.st_mtime;
+
+ /* Set the debug data */
+ g_fileinfo (IF->Name, IF->Size, IF->MTime);
+ }
/* Insert the new structure into the AFile collection */
CollAppend (&AFiles, AF);
+ /* Get the path of this file and add it as an extra search path.
+ * To avoid file search overhead, we will add one path only once.
+ * This is checked by the PushSearchPath function.
+ */
+ SB_CopyBuf (&Path, IF->Name, FindName (IF->Name) - IF->Name);
+ SB_Terminate (&Path);
+ AF->SearchPath = PushSearchPath (UsrIncSearchPath, SB_GetConstBuf (&Path));
+ SB_Done (&Path);
+
/* Return the new struct */
return AF;
}
/*****************************************************************************/
-/* Code */
+/* Code */
/*****************************************************************************/
{
unsigned I;
for (I = 0; I < CollCount (&IFiles); ++I) {
- /* Get the file struct */
- IFile* IF = (IFile*) CollAt (&IFiles, I);
- /* Check the name */
- if (strcmp (Name, IF->Name) == 0) {
- /* Found, return the struct */
- return IF;
- }
+ /* Get the file struct */
+ IFile* IF = (IFile*) CollAt (&IFiles, I);
+ /* Check the name */
+ if (strcmp (Name, IF->Name) == 0) {
+ /* Found, return the struct */
+ return IF;
+ }
}
/* Not found */
void OpenMainFile (const char* Name)
/* Open the main file. Will call Fatal() in case of failures. */
{
+ AFile* MainFile;
+
+
/* Setup a new IFile structure for the main file */
- IFile* IF = NewIFile (Name);
+ IFile* IF = NewIFile (Name, IT_MAIN);
/* Open the file for reading */
FILE* F = fopen (Name, "r");
if (F == 0) {
- /* Cannot open */
- Fatal ("Cannot open input file `%s': %s", Name, strerror (errno));
+ /* Cannot open */
+ Fatal ("Cannot open input file `%s': %s", Name, strerror (errno));
}
/* Allocate a new AFile structure for the file */
- (void) NewAFile (IF, F);
+ MainFile = NewAFile (IF, F);
+
+ /* Allocate the input line buffer */
+ Line = NewStrBuf ();
+
+ /* Update the line infos, so we have a valid line info even at start of
+ * the main file before the first line is read.
+ */
+ UpdateLineInfo (MainFile->Input, MainFile->Line, Line);
}
-void OpenIncludeFile (const char* Name, unsigned DirSpec)
+void OpenIncludeFile (const char* Name, InputType IT)
/* Open an include file and insert it into the tables. */
{
char* N;
/* Check for the maximum include nesting */
if (CollCount (&AFiles) > MAX_INC_NESTING) {
- PPError ("Include nesting too deep");
- return;
+ PPError ("Include nesting too deep");
+ return;
}
/* Search for the file */
- N = FindInclude (Name, DirSpec);
+ N = SearchFile ((IT == IT_SYSINC)? SysIncSearchPath : UsrIncSearchPath, Name);
if (N == 0) {
- PPError ("Include file `%s' not found", Name);
- return;
+ PPError ("Include file `%s' not found", Name);
+ return;
}
/* Search the list of all input files for this file. If we don't find
*/
IF = FindFile (N);
if (IF == 0) {
- IF = NewIFile (N);
+ IF = NewIFile (N, IT);
}
/* We don't need N any longer, since we may now use IF->Name */
/* Open the file */
F = fopen (IF->Name, "r");
if (F == 0) {
- /* Error opening the file */
- PPError ("Cannot open include file `%s': %s", IF->Name, strerror (errno));
- return;
+ /* Error opening the file */
+ PPError ("Cannot open include file `%s': %s", IF->Name, strerror (errno));
+ return;
}
+ /* Debugging output */
+ Print (stdout, 1, "Opened include file `%s'\n", IF->Name);
+
/* Allocate a new AFile structure */
(void) NewAFile (IF, F);
}
/* Delete the last active file from the active file collection */
CollDelete (&AFiles, AFileCount-1);
+ /* If we had added an extra search path for this AFile, remove it */
+ if (Input->SearchPath) {
+ PopSearchPath (UsrIncSearchPath);
+ }
+
/* Delete the active file structure */
FreeAFile (Input);
}
-void ClearLine (void)
-/* Clear the current input line */
+static void GetInputChar (void)
+/* Read the next character from the input stream and make CurC and NextC
+ * valid. If end of line is reached, both are set to NUL, no more lines
+ * are read by this function.
+ */
{
- line[0] = '\0';
- lptr = line;
- CurC = '\0';
- NextC = '\0';
+ /* Drop all pushed fragments that don't have data left */
+ while (SB_GetIndex (Line) >= SB_GetLen (Line)) {
+ /* Cannot read more from this line, check next line on stack if any */
+ if (CollCount (&InputStack) == 0) {
+ /* This is THE line */
+ break;
+ }
+ FreeStrBuf (Line);
+ Line = CollPop (&InputStack);
+ }
+
+ /* Now get the next characters from the line */
+ if (SB_GetIndex (Line) >= SB_GetLen (Line)) {
+ CurC = NextC = '\0';
+ } else {
+ CurC = SB_AtUnchecked (Line, SB_GetIndex (Line));
+ if (SB_GetIndex (Line) + 1 < SB_GetLen (Line)) {
+ /* NextC comes from this fragment */
+ NextC = SB_AtUnchecked (Line, SB_GetIndex (Line) + 1);
+ } else {
+ /* NextC comes from next fragment */
+ if (CollCount (&InputStack) > 0) {
+ NextC = ' ';
+ } else {
+ NextC = '\0';
+ }
+ }
+ }
}
-void InitLine (const char* Buf)
-/* Initialize lptr from Buf and read CurC and NextC from the new input line */
+void NextChar (void)
+/* Skip the current input character and read the next one from the input
+ * stream. CurC and NextC are valid after the call. If end of line is
+ * reached, both are set to NUL, no more lines are read by this function.
+ */
{
- lptr = Buf;
- CurC = lptr[0];
- if (CurC != '\0') {
- NextC = lptr[1];
- } else {
- NextC = '\0';
+ /* Skip the last character read */
+ SB_Skip (Line);
+
+ /* Read the next one */
+ GetInputChar ();
+}
+
+
+
+void ClearLine (void)
+/* Clear the current input line */
+{
+ unsigned I;
+
+ /* Remove all pushed fragments from the input stack */
+ for (I = 0; I < CollCount (&InputStack); ++I) {
+ FreeStrBuf (CollAtUnchecked (&InputStack, I));
}
+ CollDeleteAll (&InputStack);
+
+ /* Clear the contents of Line */
+ SB_Clear (Line);
+ CurC = '\0';
+ NextC = '\0';
}
-void NextChar (void)
-/* Read the next character from the input stream and make CurC and NextC
- * valid. If end of line is reached, both are set to NUL, no more lines
- * are read by this function.
+StrBuf* InitLine (StrBuf* Buf)
+/* Initialize Line from Buf and read CurC and NextC from the new input line.
+ * The function returns the old input line.
*/
{
- if (lptr[0] != '\0') {
- ++lptr;
- CurC = lptr[0];
- if (CurC != '\0') {
- NextC = lptr[1];
- } else {
- NextC = '\0';
- }
- } else {
- CurC = NextC = '\0';
- }
+ StrBuf* OldLine = Line;
+ Line = Buf;
+ CurC = SB_LookAt (Buf, SB_GetIndex (Buf));
+ NextC = SB_LookAt (Buf, SB_GetIndex (Buf) + 1);
+ return OldLine;
}
int NextLine (void)
/* Get a line from the current input. Returns 0 on end of file. */
{
- AFile* Input;
- unsigned Len;
- unsigned Part;
- unsigned Start;
- int Done;
+ AFile* Input;
- /* Setup the line */
+ /* Clear the current line */
ClearLine ();
/* If there is no file open, bail out, otherwise get the current input file */
if (CollCount (&AFiles) == 0) {
- return 0;
+ return 0;
}
- Input = (AFile*) CollLast (&AFiles);
-
- /* Read lines until we get one with real contents */
- Len = 0;
- Done = 0;
- while (!Done && Len < LINESIZE) {
-
- while (fgets (line + Len, LINESIZE - Len, Input->F) == 0) {
-
- /* Assume EOF */
- ClearLine ();
-
- /* Leave the current file */
- CloseIncludeFile ();
-
- /* If there is no file open, bail out, otherwise get the
- * current input file
- */
- if (CollCount (&AFiles) == 0) {
- return 0;
- }
- Input = (AFile*) CollLast (&AFiles);
-
- }
-
- /* We got a new line */
- ++Input->Line;
-
- /* Remove the trailing newline if we have one */
- Part = strlen (line + Len);
- Start = Len;
- Len += Part;
- while (Len > 0 && line [Len-1] == '\n') {
- --Len;
- }
- line [Len] = '\0';
-
- /* Check if we have a line continuation character at the end. If not,
- * we're done.
- */
- if (Len > 0 && line[Len-1] == '\\') {
- line[Len-1] = '\n'; /* Replace by newline */
- } else {
- Done = 1;
- }
+ Input = CollLast (&AFiles);
+
+ /* Read characters until we have one complete line */
+ while (1) {
+
+ /* Read the next character */
+ int C = fgetc (Input->F);
+
+ /* Check for EOF */
+ if (C == EOF) {
+
+ /* Accept files without a newline at the end */
+ if (SB_NotEmpty (Line)) {
+ ++Input->Line;
+ break;
+ }
+
+ /* Leave the current file */
+ CloseIncludeFile ();
+
+ /* If there is no file open, bail out, otherwise get the
+ * previous input file and start over.
+ */
+ if (CollCount (&AFiles) == 0) {
+ return 0;
+ }
+ Input = CollLast (&AFiles);
+ continue;
+ }
+
+ /* Check for end of line */
+ if (C == '\n') {
+
+ /* We got a new line */
+ ++Input->Line;
+
+ /* If the \n is preceeded by a \r, remove the \r, so we can read
+ * DOS/Windows files under *nix.
+ */
+ if (SB_LookAtLast (Line) == '\r') {
+ SB_Drop (Line, 1);
+ }
+
+ /* If we don't have a line continuation character at the end,
+ * we're done with this line. Otherwise replace the character
+ * by a newline and continue reading.
+ */
+ if (SB_LookAtLast (Line) == '\\') {
+ Line->Buf[Line->Len-1] = '\n';
+ } else {
+ break;
+ }
+
+ } else if (C != '\0') { /* Ignore embedded NULs */
+
+ /* Just some character, add it to the line */
+ SB_AppendChar (Line, C);
+
+ }
}
- /* Got a line. Initialize the current and next characters. */
- InitLine (line);
+ /* Add a termination character to the string buffer */
+ SB_Terminate (Line);
+
+ /* Initialize the current and next characters. */
+ InitLine (Line);
/* Create line information for this line */
- UpdateLineInfo (Input->Input, Input->Line, line);
+ UpdateLineInfo (Input->Input, Input->Line, Line);
/* Done */
return 1;
+const char* GetInputFile (const struct IFile* IF)
+/* Return a filename from an IFile struct */
+{
+ return IF->Name;
+}
+
+
+
const char* GetCurrentFile (void)
/* Return the name of the current input file */
{
unsigned AFileCount = CollCount (&AFiles);
if (AFileCount > 0) {
- const AFile* AF = (const AFile*) CollAt (&AFiles, AFileCount-1);
- return AF->Input->Name;
+ const AFile* AF = (const AFile*) CollAt (&AFiles, AFileCount-1);
+ return AF->Input->Name;
} else {
- /* No open file. Use the main file if we have one. */
- unsigned IFileCount = CollCount (&IFiles);
- if (IFileCount > 0) {
- const IFile* IF = (const IFile*) CollAt (&IFiles, 0);
- return IF->Name;
- } else {
- return "(outside file scope)";
- }
+ /* No open file. Use the main file if we have one. */
+ unsigned IFileCount = CollCount (&IFiles);
+ if (IFileCount > 0) {
+ const IFile* IF = (const IFile*) CollAt (&IFiles, 0);
+ return IF->Name;
+ } else {
+ return "(outside file scope)";
+ }
}
}
{
unsigned AFileCount = CollCount (&AFiles);
if (AFileCount > 0) {
- const AFile* AF = (const AFile*) CollAt (&AFiles, AFileCount-1);
- return AF->Line;
+ const AFile* AF = (const AFile*) CollAt (&AFiles, AFileCount-1);
+ return AF->Line;
} else {
- /* No open file */
- return 0;
+ /* No open file */
+ return 0;
}
}
-void WriteDependencies (FILE* F, const char* OutputFile)
-/* Write a makefile dependency list to the given file */
+static void WriteEscaped (FILE* F, const char* Name)
+/* Write a file name to a dependency file escaping spaces */
{
- unsigned I;
+ while (*Name) {
+ if (*Name == ' ') {
+ /* Escape spaces */
+ fputc ('\\', F);
+ }
+ fputc (*Name, F);
+ ++Name;
+ }
+}
- /* Get the number of input files */
- unsigned IFileCount = CollCount (&IFiles);
- /* Print the output file followed by a tab char */
- fprintf (F, "%s:\t", OutputFile);
+
+static void WriteDep (FILE* F, InputType Types)
+/* Helper function. Writes all file names that match Types to the output */
+{
+ unsigned I;
/* Loop over all files */
- for (I = 0; I < IFileCount; ++I) {
- /* Get the next input file */
- const IFile* IF = (const IFile*) CollAt (&IFiles, I);
- /* If this is not the first file, add a space */
- const char* Format = (I == 0)? "%s" : " %s";
- /* Print the dependency */
- fprintf (F, Format, IF->Name);
+ unsigned FileCount = CollCount (&IFiles);
+ for (I = 0; I < FileCount; ++I) {
+
+ /* Get the next input file */
+ const IFile* IF = (const IFile*) CollAt (&IFiles, I);
+
+ /* Ignore it if it is not of the correct type */
+ if ((IF->Type & Types) == 0) {
+ continue;
+ }
+
+ /* If this is not the first file, add a space */
+ if (I > 0) {
+ fputc (' ', F);
+ }
+
+ /* Print the dependency escaping spaces */
+ WriteEscaped (F, IF->Name);
+ }
+}
+
+
+
+static void CreateDepFile (const char* Name, InputType Types)
+/* Create a dependency file with the given name and place dependencies for
+ * all files with the given types there.
+ */
+{
+ /* Open the file */
+ FILE* F = fopen (Name, "w");
+ if (F == 0) {
+ Fatal ("Cannot open dependency file `%s': %s", Name, strerror (errno));
}
- /* End the line */
- fprintf (F, "\n\n");
+ /* If a dependency target was given, use it, otherwise use the output
+ * file name as target, followed by a tab character.
+ */
+ if (SB_IsEmpty (&DepTarget)) {
+ WriteEscaped (F, OutputFilename);
+ } else {
+ WriteEscaped (F, SB_GetConstBuf (&DepTarget));
+ }
+ fputs (":\t", F);
+
+ /* Write out the dependencies for the output file */
+ WriteDep (F, Types);
+ fputs ("\n\n", F);
+
+ /* Write out a phony dependency for the included files */
+ WriteDep (F, Types);
+ fputs (":\n\n", F);
+
+ /* Close the file, check for errors */
+ if (fclose (F) != 0) {
+ remove (Name);
+ Fatal ("Cannot write to dependeny file (disk full?)");
+ }
}
+void CreateDependencies (void)
+/* Create dependency files requested by the user */
+{
+ if (SB_NotEmpty (&DepName)) {
+ CreateDepFile (SB_GetConstBuf (&DepName),
+ IT_MAIN | IT_USRINC);
+ }
+ if (SB_NotEmpty (&FullDepName)) {
+ CreateDepFile (SB_GetConstBuf (&FullDepName),
+ IT_MAIN | IT_SYSINC | IT_USRINC);
+ }
+}
+
+
projects / cc65 / blobdiff