Renamed some stuff. Write out the segment size as var, not 32 bit.

[cc65] / src / ca65 / main.c

diff --git a/src/ca65/main.c b/src/ca65/main.c
index f41ddb6834b584eb9fedbb3694bedf4ba9353696..7364891bc7208c54fac12eed9fbde5f7bd8c7678 100644 (file)
--- a/src/ca65/main.c
+++ b/src/ca65/main.c
@@ -807,12 +807,12 @@ static void CreateObjFile (void)
     /* Write the export list */
     WriteExports ();
 
-    /* Write the scopes if requested */
-    WriteScopes ();
-
     /* Write debug symbols if requested */
     WriteDbgSyms ();
 
+    /* Write the scopes if requested */
+    WriteScopes ();
+
     /* Write line infos if requested */
     WriteLineInfos ();
 
@@ -867,7 +867,7 @@ int main (int argc, char* argv [])
     InitIncludePaths ();
 
     /* Create the predefined segments */
-    InitSegments ();
+    SegInit ();
 
     /* Enter the base lexical level. We must do that here, since we may
      * define symbols using -D.
@@ -1011,9 +1011,9 @@ int main (int argc, char* argv [])
         CheckPseudo ();
     }
 
-    /* If we didn't have any errors, check the unnamed labels */
+    /* If we didn't have any errors, check and cleanup the unnamed labels */
     if (ErrorCount == 0) {
-        ULabCheck ();
+        ULabDone ();
     }
 
     /* If we didn't have any errors, check the symbol table */
@@ -1028,7 +1028,7 @@ int main (int argc, char* argv [])
 
     /* If we didn't have any errors, check and resolve the segment data */
     if (ErrorCount == 0) {
-        SegCheck ();
+        SegDone ();
     }
 
     /* If we didn't have any errors, check       the assertions */
@@ -1036,15 +1036,15 @@ int main (int argc, char* argv [])
         CheckAssertions ();
     }
 
-    /* If we didn't have an errors, index the line infos */
-    MakeLineInfoIndex ();
-
     /* Dump the data */
     if (Verbosity >= 2) {
         SymDump (stdout);
         SegDump ();
     }
 
+    /* If we didn't have an errors, finish off the line infos */
+    DoneLineInfo ();
+
     /* If we didn't have any errors, create the object, listing and
      * dependency files
      */