bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use collections instead of linked lists to simplify things.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4792 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2010-08-08 15:03:58 +00:00
parent 103af67585
commit 026724482f
2 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/ld65/config.c
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2010 Ullrich von Bassewitz */ /* (C) 1998-2010, Ullrich von Bassewitz */
/* Roemerstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -39,8 +39,9 @@
#include <errno.h> #include <errno.h>
/* common */ /* common */
#include "check.h"
#include "bitops.h" #include "bitops.h"
#include "check.h"
#include "coll.h"
#include "print.h" #include "print.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "xsprintf.h" #include "xsprintf.h"
@@ -81,15 +82,10 @@ static enum {
/* File list */ /* File list */
static File* FileList; /* Single linked list */ static Collection FileList = STATIC_COLLECTION_INITIALIZER;
static unsigned FileCount; /* Number of entries in the list */
/* Memory list */ /* Memory list */
static Memory* MemoryList; /* Single linked list */ static Collection MemoryList = STATIC_COLLECTION_INITIALIZER;
static Memory* MemoryLast; /* Last element in list */
static unsigned MemoryCount; /* Number of entries in the list */
/* Memory attributes */ /* Memory attributes */
#define MA_START 0x0001 #define MA_START 0x0001
@@ -145,12 +141,12 @@ static File* NewFile (unsigned Name);
static File* FindFile (unsigned Name) static File* FindFile (unsigned Name)
/* Find a file with a given name. */ /* Find a file with a given name. */
{ {
File* F = FileList; unsigned I;
while (F) { for (I = 0; I < CollCount (&FileList); ++I) {
if (F->Name == Name) { File* F = CollAtUnchecked (&FileList, I);
return F; if (F->Name == Name) {
} return F;
F = F->Next; }
} }
return 0; return 0;
} }
@@ -188,12 +184,12 @@ static void FileInsert (File* F, Memory* M)
static Memory* CfgFindMemory (unsigned Name) static Memory* CfgFindMemory (unsigned Name)
/* Find the memory are with the given name. Return NULL if not found */ /* Find the memory are with the given name. Return NULL if not found */
{ {
Memory* M = MemoryList; unsigned I;
while (M) { for (I = 0; I < CollCount (&MemoryList); ++I) {
Memory* M = CollAt (&MemoryList, I);
if (M->Name == Name) { if (M->Name == Name) {
return M; return M;
} }
M = M->Next;
} }
return 0; return 0;
} }
@@ -280,9 +276,7 @@ static File* NewFile (unsigned Name)
F->MemLast = 0; F->MemLast = 0;
/* Insert the struct into the list */ /* Insert the struct into the list */
F->Next = FileList; CollAppend (&FileList, F);
FileList = F;
++FileCount;
/* ...and return it */ /* ...and return it */
return F; return F;
@@ -304,7 +298,6 @@ static Memory* NewMemory (unsigned Name)
/* Initialize the fields */ /* Initialize the fields */
M->Name = Name; M->Name = Name;
M->Next = 0;
M->FNext = 0; M->FNext = 0;
M->Attr = 0; M->Attr = 0;
M->Flags = 0; M->Flags = 0;
@@ -318,14 +311,7 @@ static Memory* NewMemory (unsigned Name)
M->F = 0; M->F = 0;
/* Insert the struct into the list */ /* Insert the struct into the list */
if (MemoryLast == 0) { CollAppend (&MemoryList, M);
/* First element */
MemoryList = M;
} else {
MemoryLast->Next = M;
}
MemoryLast = M;
++MemoryCount;
/* ...and return it */ /* ...and return it */
return M; return M;
@@ -555,7 +541,7 @@ static void ParseFiles (void)
/* Search for the file, it must exist */ /* Search for the file, it must exist */
F = FindFile (GetStrBufId (&CfgSVal)); F = FindFile (GetStrBufId (&CfgSVal));
if (F == 0) { if (F == 0) {
CfgError ("File `%s' not found in MEMORY section", CfgError ("File `%s' not found in MEMORY section",
SB_GetConstBuf (&CfgSVal)); SB_GetConstBuf (&CfgSVal));
} }
@@ -911,7 +897,7 @@ static void ParseO65 (void)
CfgSValId = GetStrBufId (&CfgSVal); CfgSValId = GetStrBufId (&CfgSVal);
/* Check if the export symbol is also defined as an import. */ /* Check if the export symbol is also defined as an import. */
if (O65GetImport (O65FmtDesc, CfgSValId) != 0) { if (O65GetImport (O65FmtDesc, CfgSValId) != 0) {
CfgError ("Exported symbol `%s' cannot be an import", CfgError ("Exported symbol `%s' cannot be an import",
SB_GetConstBuf (&CfgSVal)); SB_GetConstBuf (&CfgSVal));
} }
/* Check if we have this symbol defined already. The entry /* Check if we have this symbol defined already. The entry
@@ -919,7 +905,7 @@ static void ParseO65 (void)
* error message when checking it here. * error message when checking it here.
*/ */
if (O65GetExport (O65FmtDesc, CfgSValId) != 0) { if (O65GetExport (O65FmtDesc, CfgSValId) != 0) {
CfgError ("Duplicate exported symbol: `%s'", CfgError ("Duplicate exported symbol: `%s'",
SB_GetConstBuf (&CfgSVal)); SB_GetConstBuf (&CfgSVal));
} }
/* Insert the symbol into the table */ /* Insert the symbol into the table */
@@ -937,7 +923,7 @@ static void ParseO65 (void)
CfgSValId = GetStrBufId (&CfgSVal); CfgSValId = GetStrBufId (&CfgSVal);
/* Check if the imported symbol is also defined as an export. */ /* Check if the imported symbol is also defined as an export. */
if (O65GetExport (O65FmtDesc, CfgSValId) != 0) { if (O65GetExport (O65FmtDesc, CfgSValId) != 0) {
CfgError ("Imported symbol `%s' cannot be an export", CfgError ("Imported symbol `%s' cannot be an export",
SB_GetConstBuf (&CfgSVal)); SB_GetConstBuf (&CfgSVal));
} }
/* Check if we have this symbol defined already. The entry /* Check if we have this symbol defined already. The entry
@@ -945,7 +931,7 @@ static void ParseO65 (void)
* error message when checking it here. * error message when checking it here.
*/ */
if (O65GetImport (O65FmtDesc, CfgSValId) != 0) { if (O65GetImport (O65FmtDesc, CfgSValId) != 0) {
CfgError ("Duplicate imported symbol: `%s'", CfgError ("Duplicate imported symbol: `%s'",
SB_GetConstBuf (&CfgSVal)); SB_GetConstBuf (&CfgSVal));
} }
/* Insert the symbol into the table */ /* Insert the symbol into the table */
@@ -1168,7 +1154,7 @@ static void ParseConDes (void)
CfgAssureIdent (); CfgAssureIdent ();
/* Remember the value for later */ /* Remember the value for later */
Count = GetStrBufId (&CfgSVal); Count = GetStrBufId (&CfgSVal);
break; break;
case CFGTOK_TYPE: case CFGTOK_TYPE:
/* Don't allow this twice */ /* Don't allow this twice */
@@ -1600,11 +1586,14 @@ unsigned CfgAssignSegments (void)
* for an overflow of the section. Assign the start addresses of the * for an overflow of the section. Assign the start addresses of the
* segments while doing this. * segments while doing this.
*/ */
Memory* M = MemoryList; unsigned I;
while (M) { for (I = 0; I < CollCount (&MemoryList); ++I) {
MemListNode* N; MemListNode* N;
/* Get this entry */
Memory* M = CollAtUnchecked (&MemoryList, I);
/* Get the start address of this memory area */ /* Get the start address of this memory area */
unsigned long Addr = M->Start; unsigned long Addr = M->Start;
@@ -1714,8 +1703,6 @@ unsigned CfgAssignSegments (void)
SB_Done (&Buf); SB_Done (&Buf);
} }
/* Next memory area */
M = M->Next;
} }
/* Return the number of memory area overflows */ /* Return the number of memory area overflows */
@@ -1727,12 +1714,15 @@ unsigned CfgAssignSegments (void)
void CfgWriteTarget (void) void CfgWriteTarget (void)
/* Write the target file(s) */ /* Write the target file(s) */
{ {
Memory* M; unsigned I;
/* Walk through the files list */ /* Walk through the files list */
File* F = FileList; for (I = 0; I < CollCount (&FileList); ++I) {
while (F) {
/* We don't need to look at files with no memory areas */ /* Get this entry */
File* F = CollAtUnchecked (&FileList, I);
/* We don't need to look at files with no memory areas */
if (F->MemList) { if (F->MemList) {
/* Is there an output file? */ /* Is there an output file? */
@@ -1764,7 +1754,7 @@ void CfgWriteTarget (void)
/* No output file. Walk through the list and mark all segments /* No output file. Walk through the list and mark all segments
* loading into these memory areas in this file as dumped. * loading into these memory areas in this file as dumped.
*/ */
M = F->MemList; Memory* M = F->MemList;
while (M) { while (M) {
MemListNode* N; MemListNode* N;
@@ -1788,9 +1778,6 @@ void CfgWriteTarget (void)
} }
} }
} }
/* Next file */
F = F->Next;
} }
} }

10
src/ld65/config.h
View File

@@ -6,10 +6,10 @@
/* */ /* */
/* */ /* */
/* */ /* */
/* (C) 1998-2005 Ullrich von Bassewitz */ /* (C) 1998-2010, Ullrich von Bassewitz */
/* R<EFBFBD>merstrasse 52 */ /* Roemerstrasse 52 */
/* D-70794 Filderstadt */ /* D-70794 Filderstadt */
/* EMail: uz@cc65.org */ /* EMail: uz@cc65.org */
/* */ /* */
/* */ /* */
/* This software is provided 'as-is', without any expressed or implied */ /* This software is provided 'as-is', without any expressed or implied */
@@ -53,7 +53,6 @@
typedef struct File File; typedef struct File File;
struct File { struct File {
unsigned Name; /* Name index of the file */ unsigned Name; /* Name index of the file */
File* Next; /* Pointer to next entry in list */
unsigned Flags; unsigned Flags;
unsigned Format; /* Output format */ unsigned Format; /* Output format */
struct Memory* MemList; /* List of memory areas in this file */ struct Memory* MemList; /* List of memory areas in this file */
@@ -71,7 +70,6 @@ struct MemListNode {
typedef struct Memory Memory; typedef struct Memory Memory;
struct Memory { struct Memory {
unsigned Name; /* Name index of the memory section */ unsigned Name; /* Name index of the memory section */
Memory* Next; /* Pointer to next entry in list */
Memory* FNext; /* Next in file list */ Memory* FNext; /* Next in file list */
unsigned Attr; /* Which values are valid? */ unsigned Attr; /* Which values are valid? */
unsigned Flags; /* Set of bitmapped flags */ unsigned Flags; /* Set of bitmapped flags */