New module strstack

[cc65] / src / ld65 / segments.c

diff --git a/src/ld65/segments.c b/src/ld65/segments.c
index 4a518702de31e20154420338fbe53d63ba9b9232..1fb7fcbd792d16e58fc3e8dfcf57ff23338edb81 100644 (file)
--- a/src/ld65/segments.c
+++ b/src/ld65/segments.c
@@ -7,7 +7,7 @@
 /*                                                                           */
 /*                                                                           */
 /* (C) 1998-2003 Ullrich von Bassewitz                                       */
-/*               Römerstrasse 52                                             */
+/*               Römerstraße 52                                              */
 /*               D-70794 Filderstadt                                         */
 /* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
@@ -70,7 +70,7 @@
 static Segment*                HashTab [HASHTAB_SIZE];
 
 static unsigned                SegCount = 0;   /* Segment count */
-static Segment*                SegRoot = 0;    /* List of all segments */
+static Segment*                SegRoot = 0;    /* List of all segments */
 
 
 
@@ -80,7 +80,7 @@ static Segment*               SegRoot = 0;    /* List of all segments */
 
 
 
-static Segment* NewSegment (unsigned Name, unsigned char Type)
+static Segment* NewSegment (unsigned Name, unsigned char AddrSize)
 /* Create a new segment and initialize it */
 {
     unsigned Hash;
@@ -98,7 +98,7 @@ static Segment* NewSegment (unsigned Name, unsigned char Type)
     S->AlignObj           = 0;
     S->Align       = 0;
     S->FillVal    = 0;
-    S->Type        = Type;
+    S->AddrSize    = AddrSize;
     S->ReadOnly    = 0;
     S->Relocatable = 0;
     S->Dumped      = 0;
@@ -119,7 +119,7 @@ static Segment* NewSegment (unsigned Name, unsigned char Type)
 
 
 
-Segment* GetSegment (unsigned Name, unsigned char Type, const char* ObjName)
+Segment* GetSegment (unsigned Name, unsigned char AddrSize, const char* ObjName)
 /* Search for a segment and return an existing one. If the segment does not
  * exist, create a new one and return that. ObjName is only used for the error
  * message and may be NULL if the segment is linker generated.
@@ -133,10 +133,10 @@ Segment* GetSegment (unsigned Name, unsigned char Type, const char* ObjName)
      */
     if (S == 0) {
        /* Create a new segment */
-       S = NewSegment (Name, Type);
+       S = NewSegment (Name, AddrSize);
     } else {
-               /* Check if the existing segment has the requested type */
-               if (S->Type != Type) {
+               /* Check if the existing segment has the requested address size */
+               if (S->AddrSize != AddrSize) {
            /* Allow an empty object name */
            if (ObjName == 0) {
                ObjName = "[linker generated]";
@@ -152,7 +152,7 @@ Segment* GetSegment (unsigned Name, unsigned char Type, const char* ObjName)
 
 
 
-Section* NewSection (Segment* Seg, unsigned char Align, unsigned char Type)
+Section* NewSection (Segment* Seg, unsigned char Align, unsigned char AddrSize)
 /* Create a new section for the given segment */
 {
     unsigned long V;
@@ -168,7 +168,7 @@ Section* NewSection (Segment* Seg, unsigned char Align, unsigned char Type)
     S->FragLast = 0;
     S->Size    = 0;
     S->Align    = Align;
-    S->Type     = Type;
+    S->AddrSize = AddrSize;
 
     /* Calculate the alignment bytes needed for the section */
     V = (0x01UL << S->Align) - 1;
@@ -385,13 +385,13 @@ void SegDump (void)
                    case FRAG_EXPR:
                        printf ("    Expression (%u bytes):\n", F->Size);
                        printf ("    ");
-                       DumpExpr (F->Expr);
+                       DumpExpr (F->Expr, 0);
                        break;
 
                    case FRAG_SEXPR:
                        printf ("    Signed expression (%u bytes):\n", F->Size);
                        printf ("      ");
-                       DumpExpr (F->Expr);
+                       DumpExpr (F->Expr, 0);
                        break;
 
                    case FRAG_FILL:
@@ -493,18 +493,18 @@ void SegWrite (FILE* Tgt, Segment* S, SegWriteFunc F, void* Data)
                    /* Call the users function and evaluate the result */
                    switch (F (Frag->Expr, Sign, Frag->Size, Offs, Data)) {
 
-                       case SEG_EXPR_OK:
-                           break;
+                       case SEG_EXPR_OK:
+                           break;
 
-                       case SEG_EXPR_RANGE_ERROR:
-                           Error ("Range error in module `%s', line %lu",
-                                  GetSourceFileName (Frag->Obj, Frag->Pos.Name),
-                                  Frag->Pos.Line);
-                           break;
+                       case SEG_EXPR_RANGE_ERROR:
+                           Error ("Range error in module `%s', line %lu",
+                                  GetSourceFileName (Frag->Obj, Frag->Pos.Name),
+                                  Frag->Pos.Line);
+                           break;
 
-                       case SEG_EXPR_TOO_COMPLEX:
-                           Error ("Expression too complex in module `%s', line %lu",
-                                  GetSourceFileName (Frag->Obj, Frag->Pos.Name),
+                       case SEG_EXPR_TOO_COMPLEX:
+                           Error ("Expression too complex in module `%s', line %lu",
+                                  GetSourceFileName (Frag->Obj, Frag->Pos.Name),
                                   Frag->Pos.Line);
                            break;
 
@@ -635,9 +635,9 @@ void PrintDbgSegments (FILE* F)
         if (S->Size > 0) {
 
            /* Print the segment data */
-                   fprintf (F, "segment\t\"%s\", 0x%06lX, 0x%04lX, %s, %s\n",
+                   fprintf (F, "segment\t\"%s\",start=0x%06lX,size=0x%04lX,addrsize=%s,type=%s\n",
                             GetString (S->Name), S->PC, S->Size,
-                     SegTypeToStr (S->Type),
+                     AddrSizeToStr (S->AddrSize),
                      S->ReadOnly? "ro" : "rw");
        }