Changeset e5d9274 for src/CodeGen

Timestamp:

Jun 2, 2022, 3:11:21 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

ced5e2a

Parents:

015925a (diff), fc134a48 (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

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (1 diff)
• FixMain.cc (modified) (1 diff)
• FixMain2.cc (added)
• GenType.cc (modified) (4 diffs)
• LinkOnce.cc (modified) (1 diff)
• module.mk (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -1238 +1238 @@
 } // namespace CodeGen
 
-
-unsigned Indenter::tabsize = 2;
-
-std::ostream & operator<<( std::ostream & out, const BaseSyntaxNode * node ) {
-        if ( node ) {
-                node->print( out );
-        } else {
-                out << "nullptr";
-        }
-        return out;
-}
-
 // Local Variables: //
 // tab-width: 4 //

src/CodeGen/FixMain.cc

@@ -49 +49 @@
 
 }
-
-        bool FixMain::replace_main = false;
 
         template<typename container>

src/CodeGen/GenType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May  1 15:24:00 2019
-// Update Count     : 23
+// Last Modified On : Fri May 20 11:18:00 2022
+// Update Count     : 24
 //
 #include "GenType.h"
@@ -50 +50 @@
                 void postvisit( TraitInstType * inst );
                 void postvisit( TypeofType * typeof );
+                void postvisit( VTableType * vtable );
                 void postvisit( QualifiedType * qualType );
 
@@ -259 +260 @@
                         if ( options.genC ) {
                                 typeString = "enum " + typeString;
-                        } 
-                } 
+                        }
+                }
                 handleQualifiers( enumInst );
         }
 
         void GenType::postvisit( TypeInstType * typeInst ) {
+                assertf( ! options.genC, "Type instance types should not reach code generation." );
                 typeString = typeInst->name + " " + typeString;
                 handleQualifiers( typeInst );
@@ -320 +322 @@
         }
 
+        void GenType::postvisit( VTableType * vtable ) {
+                assertf( ! options.genC, "Virtual table types should not reach code generation." );
+                std::ostringstream os;
+                os << "vtable(" << genType( vtable->base, "", options ) << ") " << typeString;
+                typeString = os.str();
+                handleQualifiers( vtable );
+        }
+
         void GenType::postvisit( QualifiedType * qualType ) {
                 assertf( ! options.genC, "Qualified types should not reach code generation." );

src/CodeGen/LinkOnce.cc

@@ -53 +53 @@
                                 new ConstantExpr( Constant::from_string( section_name ) )
                         );
+
+                        // Unconditionnaly add "visibility(default)" to anything with gnu.linkonce
+                        // visibility is a mess otherwise
+                        attributes.push_back(new Attribute("visibility", {new ConstantExpr( Constant::from_string( "default" ) )}));
+
                 }
                 visit_children = false;

src/CodeGen/module.mk

@@ -10 +10 @@
 ## Author           : Richard C. Bilson
 ## Created On       : Mon Jun  1 17:49:17 2015
-## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Dec 14 07:29:42 2019
-## Update Count     : 4
+## Last Modified By : Andrew Beach
+## Last Modified On : Tue May 17 14:26:00 2022
+## Update Count     : 5
 ###############################################################################
 
-#SRC +=  ArgTweak/Rewriter.cc \
-#       ArgTweak/Mutate.cc
+SRC_CODEGEN = \
+        CodeGen/FixMain2.cc \
+        CodeGen/FixMain.h \
+        CodeGen/OperatorTable.cc \
+        CodeGen/OperatorTable.h
 
-SRC_CODEGEN = \
+SRC += $(SRC_CODEGEN) \
         CodeGen/CodeGenerator.cc \
         CodeGen/CodeGenerator.h \
+        CodeGen/Generate.cc \
+        CodeGen/Generate.h \
         CodeGen/FixMain.cc \
-        CodeGen/FixMain.h \
+        CodeGen/FixNames.cc \
+        CodeGen/FixNames.h \
         CodeGen/GenType.cc \
         CodeGen/GenType.h \
         CodeGen/LinkOnce.cc \
         CodeGen/LinkOnce.h \
-        CodeGen/OperatorTable.cc \
-        CodeGen/OperatorTable.h \
         CodeGen/Options.h
 
-SRC += $(SRC_CODEGEN) CodeGen/Generate.cc CodeGen/Generate.h CodeGen/FixNames.cc CodeGen/FixNames.h
 SRCDEMANGLE += $(SRC_CODEGEN)