Changeset 2174191 for src/main.cc

Timestamp:

Nov 11, 2023, 7:43:14 AM (7 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

fc12f05

Parents:

2da12ae (diff), 61efa42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/main.cc (modified) (3 diffs)

src/main.cc

@@ -250 +250 @@
 
         parse_cmdline( argc, argv );                                            // process command-line arguments
-        CodeGen::FixMain::setReplaceMain( !nomainp );
 
         if ( waiting_for_gdb ) {
@@ -394 +393 @@
                 PASS( "Translate Tries", ControlStruct::translateTries, transUnit );
                 PASS( "Gen Waitfor", Concurrency::generateWaitFor, transUnit );
+                PASS( "Fix Main Linkage", CodeGen::fixMainLinkage, transUnit, !nomainp );
 
                 // Needs to happen before tuple types are expanded.
@@ -421 +421 @@
 
                 PASS( "Code Gen", CodeGen::generate, transUnit, *output, !genproto, prettycodegenp, true, linemarks, false );
-
-                CodeGen::FixMain::fix( transUnit, *output, (PreludeDirector + "/bootloader.c").c_str() );
+                CodeGen::fixMainInvoke( transUnit, *output, (PreludeDirector + "/bootloader.c").c_str() );
+
                 if ( output != &cout ) {
                         delete output;