/* */
/* */
/* */
-/* (C) 2000-2003 Ullrich von Bassewitz */
-/* Römerstrasse 52 */
+/* (C) 2000-2008 Ullrich von Bassewitz */
+/* Roemerstrasse 52 */
/* D-70794 Filderstadt */
/* EMail: uz@cc65.org */
/* */
+#include <stdio.h>
#include <string.h>
+#include <errno.h>
/* common */
#include "check.h"
#include "coll.h"
-#include "hashstr.h"
+#include "hashtab.h"
#include "xmalloc.h"
/* ca65 */
#include "error.h"
#include "filetab.h"
+#include "global.h"
#include "objfile.h"
#include "spool.h"
+/*****************************************************************************/
+/* Forwards */
+/*****************************************************************************/
+
+
+
+static unsigned HT_GenHash (const void* Key);
+/* Generate the hash over a key. */
+
+static const void* HT_GetKey (const void* Entry);
+/* Given a pointer to the user entry data, return a pointer to the key. */
+
+static int HT_Compare (const void* Key1, const void* Key2);
+/* Compare two keys. The function must return a value less than zero if
+ * Key1 is smaller than Key2, zero if both are equal, and a value greater
+ * than zero if Key1 is greater then Key2.
+ */
+
+
+
/*****************************************************************************/
/* Data */
/*****************************************************************************/
+/* Number of entries in the table and the mask to generate the hash */
+#define HASHTAB_MASK 0x1F
+#define HASHTAB_COUNT (HASHTAB_MASK + 1)
+
/* An entry in the file table */
typedef struct FileEntry FileEntry;
struct FileEntry {
+ HashNode Node;
unsigned Name; /* File name */
- FileEntry* Next; /* Next in hash list */
- unsigned Index; /* Index of entry */
+ unsigned Index; /* Index of entry */
+ FileType Type; /* Type of file */
unsigned long Size; /* Size of file */
unsigned long MTime; /* Time of last modification */
};
/* Array of all entries, listed by index */
static Collection FileTab = STATIC_COLLECTION_INITIALIZER;
+/* Hash table functions */
+static const HashFunctions HashFunc = {
+ HT_GenHash,
+ HT_GetKey,
+ HT_Compare
+};
+
/* Hash table, hashed by name */
-#define HASHTAB_MASK 0x1FU
-#define HASHTAB_SIZE (HASHTAB_MASK + 1)
-static FileEntry* HashTab[HASHTAB_SIZE];
+static HashTable HashTab = STATIC_HASHTABLE_INITIALIZER (HASHTAB_COUNT, &HashFunc);
+
+
+
+/*****************************************************************************/
+/* Hash table functions */
+/*****************************************************************************/
+
+
+
+static unsigned HT_GenHash (const void* Key)
+/* Generate the hash over a key. */
+{
+ return (*(const unsigned*)Key & HASHTAB_MASK);
+}
+
+
+
+static const void* HT_GetKey (const void* Entry)
+/* Given a pointer to the user entry data, return a pointer to the index */
+{
+ return &((FileEntry*) Entry)->Name;
+}
+
+
+
+static int HT_Compare (const void* Key1, const void* Key2)
+/* Compare two keys. The function must return a value less than zero if
+ * Key1 is smaller than Key2, zero if both are equal, and a value greater
+ * than zero if Key1 is greater then Key2.
+ */
+{
+ return (int)*(const unsigned*)Key1 - (int)*(const unsigned*)Key2;
+}
-static FileEntry* NewFileEntry (unsigned Name, unsigned long Size, unsigned long MTime)
+static FileEntry* NewFileEntry (unsigned Name, FileType Type,
+ unsigned long Size, unsigned long MTime)
/* Create a new FileEntry, insert it into the tables and return it */
{
- /* Get the hash over the name */
- unsigned Hash = (Name & HASHTAB_MASK);
-
/* Allocate memory for the entry */
FileEntry* F = xmalloc (sizeof (FileEntry));
/* Initialize the fields */
+ InitHashNode (&F->Node);
F->Name = Name;
F->Index = CollCount (&FileTab) + 1; /* First file has index #1 */
+ F->Type = Type;
F->Size = Size;
F->MTime = MTime;
CollAppend (&FileTab, F);
/* Insert the entry into the hash table */
- F->Next = HashTab[Hash];
- HashTab[Hash] = F;
+ HT_Insert (&HashTab, F);
/* Return the new entry */
return F;
-const char* GetFileName (unsigned Name)
+const StrBuf* GetFileName (unsigned Name)
/* Get the name of a file where the name index is known */
{
+ static const StrBuf ErrorMsg = LIT_STRBUF_INITIALIZER ("(outside file scope)");
+
const FileEntry* F;
if (Name == 0) {
*/
if (CollCount (&FileTab) == 0) {
/* No files defined until now */
- return "(outside file scope)";
+ return &ErrorMsg;
} else {
F = CollConstAt (&FileTab, 0);
}
} else {
F = CollConstAt (&FileTab, Name-1);
}
- return GetString (F->Name);
+ return GetStrBuf (F->Name);
}
-unsigned GetFileIndex (const char* Name)
+unsigned GetFileIndex (const StrBuf* Name)
/* Return the file index for the given file name. */
{
/* Get the string pool index from the name */
- unsigned NameIdx = GetStringId (Name);
-
- /* Get the hash over the name */
- unsigned Hash = (NameIdx & HASHTAB_MASK);
-
- /* Search the linear hash list */
- FileEntry* F = HashTab[Hash];
- while (F) {
- /* Is it this one? */
- if (NameIdx == F->Name) {
- /* Found, return the index */
- return F->Index;
- }
- /* No, check next */
- F = F->Next;
- }
+ unsigned NameIdx = GetStrBufId (Name);
+
+ /* Search in the hash table for the name */
+ const FileEntry* F = HT_Find (&HashTab, &NameIdx);
- /* Not found, use main file */
- Error (ERR_FILENAME_NOT_FOUND, Name);
- return 0;
+ /* If we don't have this index, print a diagnostic and use the main file */
+ if (F == 0) {
+ Error ("File name `%m%p' not found in file table", Name);
+ return 0;
+ } else {
+ return F->Index;
+ }
}
-unsigned AddFile (const char* Name, unsigned long Size, unsigned long MTime)
+unsigned AddFile (const StrBuf* Name, FileType Type,
+ unsigned long Size, unsigned long MTime)
/* Add a new file to the list of input files. Return the index of the file in
* the table.
*/
{
/* Create a new file entry and insert it into the tables */
- FileEntry* F = NewFileEntry (GetStringId (Name), Size, MTime);
+ FileEntry* F = NewFileEntry (GetStrBufId (Name), Type, Size, MTime);
/* Return the index */
return F->Index;
/* Write the fields */
ObjWriteVar (F->Name);
ObjWrite32 (F->MTime);
- ObjWrite32 (F->Size);
+ ObjWriteVar (F->Size);
}
/* Done writing files */
+static void WriteDep (FILE* F, FileType Types)
+/* Helper function. Writes all file names that match Types to the output */
+{
+ unsigned I;
+
+ /* Loop over all files */
+ for (I = 0; I < CollCount (&FileTab); ++I) {
+
+ const StrBuf* Filename;
+
+ /* Get the next input file */
+ const FileEntry* E = (const FileEntry*) CollAt (&FileTab, I);
+
+ /* Ignore it if it is not of the correct type */
+ if ((E->Type & Types) == 0) {
+ continue;
+ }
+
+ /* If this is not the first file, add a space */
+ if (I > 0) {
+ fputc (' ', F);
+ }
+
+ /* Print the dependency */
+ Filename = GetStrBuf (E->Name);
+ fprintf (F, "%*s", SB_GetLen (Filename), SB_GetConstBuf (Filename));
+ }
+}
+
+
+
+static void CreateDepFile (const char* Name, FileType 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));
+ }
+
+ /* Print the output file followed by a tab char */
+ fprintf (F, "%s:\t", OutFile);
+
+ /* 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),
+ FT_MAIN | FT_INCLUDE | FT_BINARY);
+ }
+ if (SB_NotEmpty (&FullDepName)) {
+ CreateDepFile (SB_GetConstBuf (&FullDepName),
+ FT_MAIN | FT_INCLUDE | FT_BINARY | FT_DBGINFO);
+ }
+}
+
+
projects / cc65 / blobdiff