Manage the segments in a collection.

git-svn-id: svn://svn.cc65.org/cc65/trunk@5125 b7a2c559-68d2-44c3-8de9-860c34a00d81

src/ld65/segments.c

@@ -38,6 +38,7 @@
 
 /* common */
 #include "check.h"
+#include "coll.h"
 #include "exprdefs.h"
 #include "fragdefs.h"
 #include "hashstr.h"
@@ -67,10 +68,10 @@
 /* Hash table */
 #define HASHTAB_MASK    0x3FU
 #define HASHTAB_SIZE 	(HASHTAB_MASK + 1)
-static Segment*        	HashTab [HASHTAB_SIZE];
+static Segment*        	HashTab[HASHTAB_SIZE];
 
-static unsigned	       	SegCount = 0; 	/* Segment count */
+/* List of all segments */
-static Segment*	     	SegRoot = 0;  	/* List of all segments */
+static Collection       SegmentList = STATIC_COLLECTION_INITIALIZER;
 
 
 
@@ -107,14 +108,8 @@ static Segment* NewSegment (unsigned Name, unsigned char AddrSize)
     S->Dumped      = 0;
 
     /* Insert the segment into the segment list and assign the segment id */
-    if (SegRoot == 0) {
+    S->Id = CollCount (&SegmentList);
-        S->Id = 0;
+    CollAppend (&SegmentList, S);
-    } else {
-        S->Id = SegRoot->Id + 1;
-    }
-    S->List = SegRoot;
-    SegRoot = S;
-    ++SegCount;
 
     /* Insert the segment into the segment hash list */
     Hash = (S->Name & HASHTAB_MASK);
@@ -353,11 +348,12 @@ void SegDump (void)
     unsigned long Count;
     unsigned char* Data;
                              
-    Segment* Seg = SegRoot;
+    for (I = 0; I < CollCount (&SegmentList); ++I) {
-    while (Seg) {
+        const Segment* Seg = CollConstAt (&SegmentList, I);
 	Section* S = Seg->SecRoot;
        	printf ("Segment: %s (%lu)\n", GetString (Seg->Name), Seg->Size);
 	while (S) {
+            unsigned J;
 	    Fragment* F = S->FragRoot;
 	    printf ("  Section:\n");
 	    while (F) {
@@ -367,14 +363,14 @@ void SegDump (void)
 		       	printf ("    Literal (%u bytes):", F->Size);
 		       	Count = F->Size;
 		       	Data  = F->LitBuf;
-			I = 100;
+		       	J = 100;
 		       	while (Count--) {
-			    if (I > 75) {
+		       	    if (J > 75) {
 			     	printf ("\n   ");
-		     		I = 3;
+		     	     	J = 3;
 			    }
 			    printf (" %02X", *Data++);
-			    I += 3;
+			    J += 3;
 			}
 			printf ("\n");
 			break;
@@ -402,7 +398,6 @@ void SegDump (void)
 	    }
 	    S = S->Next;
     	}
-	Seg = Seg->List;
     }
 }
 
@@ -574,44 +569,28 @@ static int CmpSegStart (const void* K1, const void* K2)
 void PrintSegmentMap (FILE* F)
 /* Print a segment map to the given file */
 {
-    unsigned I;
-    Segment* S;
-    Segment** SegPool;
 
     /* Allocate memory for the segment pool */
-    SegPool = xmalloc (SegCount * sizeof (Segment*));
+    Segment** SegPool = xmalloc (CollCount (&SegmentList) * sizeof (Segment*));
 
-    /* Collect pointers to the segments */
+    /* Copy the segment pointers */
-    I = 0;
+    unsigned I;
-    S = SegRoot;
+    for (I = 0; I < CollCount (&SegmentList); ++I) {
-    while (S) {
+        SegPool[I] = CollAtUnchecked (&SegmentList, I);
-
-     	/* Check the count for safety */
-     	CHECK (I < SegCount);
-
-     	/* Remember the pointer */
-     	SegPool [I] = S;
-
-     	/* Follow the linked list */
-     	S = S->List;
-
-     	/* Next array index */
-     	++I;
     }
-    CHECK (I == SegCount);
 
     /* Sort the array by increasing start addresses */
-    qsort (SegPool, SegCount, sizeof (Segment*), CmpSegStart);
+    qsort (SegPool, CollCount (&SegmentList), sizeof (Segment*), CmpSegStart);
 
     /* Print a header */
     fprintf (F, "Name                  Start   End     Size\n"
      	       	"--------------------------------------------\n");
 
     /* Print the segments */
-    for (I = 0; I < SegCount; ++I) {
+    for (I = 0; I < CollCount (&SegmentList); ++I) {
 
      	/* Get a pointer to the segment */
-     	S = SegPool [I];
+       	Segment* S = SegPool[I];
 
      	/* Print empty segments only if explicitly requested */
      	if (VerboseMap || S->Size > 0) {
@@ -636,8 +615,11 @@ void PrintDbgSegments (FILE* F)
 /* Output the segments to the debug file */
 {                                           
     /* Walk over all segments */
-    Segment* S = SegRoot;
+    unsigned I;
-    while (S) {
+    for (I = 0; I < CollCount (&SegmentList); ++I) {
+
+        /* Get the next segment */
+        const Segment* S = CollAtUnchecked (&SegmentList, I);
 
         /* Print the segment data */
         fprintf (F,
@@ -650,9 +632,6 @@ void PrintDbgSegments (FILE* F)
                      S->OutputName, S->OutputOffs);
         }
         fputc ('\n', F);
-
-     	/* Follow the linked list */
-     	S = S->List;
     }
 }
 
@@ -663,13 +642,17 @@ void CheckSegments (void)
  * not written to the output file. Output an error if this is the case.
  */
 {
-    Segment* S = SegRoot;
+    unsigned I;
-    while (S) {
+    for (I = 0; I < CollCount (&SegmentList); ++I) {
+
+        /* Get the next segment */
+        const Segment* S = CollAtUnchecked (&SegmentList, I);
+
+        /* Check it */
      	if (S->Size > 0 && S->Dumped == 0) {
        	    Error ("Missing memory area assignment for segment `%s'",
                    GetString (S->Name));
 	}
-	S = S->List;
     }
 }
 

src/ld65/segments.h

@@ -57,7 +57,6 @@ struct Segment {
     unsigned            Name;           /* Name index of the segment */
     unsigned            Id;             /* Segment id for debug info */
     Segment*	      	Next;		/* Hash list */
-    Segment*  	      	List;		/* List of all segments */
     struct Section*	SecRoot;	/* Section list */
     struct Section*  	SecLast;	/* Pointer to last section */
     unsigned long     	PC;    		/* PC were this segment is located */