Changeset 5ebb2fbc for src/CodeGen

Timestamp:

Jan 18, 2017, 12:47:15 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc

Children:

e9e4e9ee

Parents:

f3b0a07 (diff), c49bf54 (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:/u/cforall/software/cfa/cfa-cc

Location:

src/CodeGen

Files:

• FixMain.cc (added)
• FixMain.h (added)
• FixNames.cc (modified) (2 diffs)
• module.mk (modified) (2 diffs)

src/CodeGen/FixNames.cc

@@ -22 +22 @@
 #include "SymTab/Mangler.h"
 #include "OperatorTable.h"
-
-extern std::unique_ptr<FunctionDecl> translation_unit_main_signature;
+#include "FixMain.h"
 
 namespace CodeGen {
@@ -119 +118 @@
 
                 if(is_main( SymTab::Mangler::mangle(functionDecl, true, true) )) {
-                        if(translation_unit_main_signature) { 
-                                throw SemanticError("Multiple definition of main routine\n", functionDecl); 
+                        int nargs = functionDecl->get_functionType()->get_parameters().size();
+                        if( !(nargs == 0 || nargs == 2 || nargs == 3) ) {
+                                throw SemanticError("Main expected to have 0, 2 or 3 arguments\n", functionDecl); 
                         }
-
                         functionDecl->get_statements()->get_kids().push_back( new ReturnStmt( noLabels, new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), "0") ) ) );
-                        translation_unit_main_signature.reset( functionDecl->clone() );
+                        CodeGen::FixMain::registerMain( functionDecl );
                 }
         }

src/CodeGen/module.mk

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## module.mk -- 
+## module.mk --
 ##
 ## Author           : Richard C. Bilson
@@ -22 +22 @@
         CodeGen/GenType.cc \
         CodeGen/FixNames.cc \
+        CodeGen/FixMain.cc \
         CodeGen/OperatorTable.cc