New module strstack

[cc65] / src / ld65 / segments.c

diff --git a/src/ld65/segments.c b/src/ld65/segments.c
index d42320dc8881ee0fac6124a6cdbeda90b3e12ac5..1fb7fcbd792d16e58fc3e8dfcf57ff23338edb81 100644 (file)
--- a/src/ld65/segments.c
+++ b/src/ld65/segments.c
@@ -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,7 +635,7 @@ 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,
                      AddrSizeToStr (S->AddrSize),
                      S->ReadOnly? "ro" : "rw");