From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Fri, 19 Aug 2011 20:56:44 +0000 (+0000)
Subject: Read the segment size as var, not as 32 bit value.
X-Git-Tag: V2.13.3~228
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6a01a3407a92a7a0348d54ffb8f6069650824cb4;p=cc65

Read the segment size as var, not as 32 bit value.


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

diff --git a/src/ld65/segments.c b/src/ld65/segments.c
index ca563606e..d643c3f46 100644
--- a/src/ld65/segments.c
+++ b/src/ld65/segments.c
@@ -204,7 +204,7 @@ Section* ReadSection (FILE* F, ObjData* O)
     /* Read the segment data */
     (void) Read32 (F);            /* File size of data */
     Name      = MakeGlobalStringId (O, ReadVar (F));    /* Segment name */
-    Size      = Read32 (F);       /* Size of data */
+    Size      = ReadVar (F);      /* Size of data */
     Align     = Read8 (F);        /* Alignment */
     Type      = Read8 (F);        /* Segment type */
     FragCount = ReadVar (F);      /* Number of fragments */
@@ -258,7 +258,7 @@ Section* ReadSection (FILE* F, ObjData* O)
 
 	    case FRAG_FILL:
 	  	/* Will allocate memory, but we don't care... */
-	  	Frag = NewFragment (Type, ReadVar (F), Sec);
+     	  	Frag = NewFragment (Type, ReadVar (F), Sec);
 	  	break;
 
 	    default:
@@ -356,7 +356,7 @@ void SegDump (void)
 		       	printf ("    Literal (%u bytes):", F->Size);
 		       	Count = F->Size;
 		       	Data  = F->LitBuf;
-		       	J = 100;
+     		       	J = 100;
 		       	while (Count--) {
 		       	    if (J > 75) {
 			     	printf ("\n   ");
@@ -503,7 +503,7 @@ void SegWrite (const char* TgtName, FILE* Tgt, Segment* S, SegWriteFunc F, void*
 		   	 	   GetFragmentSourceLine (Frag));
 			    break;
 
-			case SEG_EXPR_INVALID:
+     			case SEG_EXPR_INVALID:
 			    Error ("Invalid expression in module `%s', line %u",
 		   	    	   GetFragmentSourceName (Frag),
 		   	 	   GetFragmentSourceLine (Frag));
@@ -552,7 +552,7 @@ static int CmpSegStart (const void* K1, const void* K2)
 
     /* Compare the start addresses */
     if (S1->PC > S2->PC) {
-	return 1;
+     	return 1;
     } else if (S1->PC < S2->PC) {
 	return -1;
     } else {