Changeset 6e2b04e for src

Timestamp:

Jun 8, 2022, 4:23:41 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

7f0ac12, db7a3ad

Parents:

55422cf (diff), 720f2fe2 (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

Files:

• Concurrency/Waitfor.cc (modified) (1 diff)
• Concurrency/Waitfor.h (modified) (1 diff)
• Concurrency/WaitforNew.cpp (added)
• Concurrency/module.mk (modified) (1 diff)
• InitTweak/FixGlobalInit.cc (modified) (1 diff)
• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/InitTweak.cc (modified) (4 diffs)
• InitTweak/InitTweak.h (modified) (1 diff)
• main.cc (modified) (3 diffs)

src/Concurrency/Waitfor.cc

@@ -56 +56 @@
                       |  |
                       |  |
-                            |  |
+                      |  |
                       |  |
                       |  |

src/Concurrency/Waitfor.h

@@ -19 +19 @@
 
 class Declaration;
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace Concurrency {
         void generateWaitFor( std::list< Declaration * > & translationUnit );
+
+void generateWaitFor( ast::TranslationUnit & translationUnit );
 };
 

src/Concurrency/module.mk

@@ -19 +19 @@
         Concurrency/Keywords.cc \
         Concurrency/Keywords.h \
+        Concurrency/WaitforNew.cpp \
         Concurrency/Waitfor.cc \
         Concurrency/Waitfor.h

src/InitTweak/FixGlobalInit.cc

@@ -162 +162 @@
                         } // if
                         if ( Statement * ctor = ctorInit->ctor ) {
-                                addDataSectonAttribute( objDecl );
+                                addDataSectionAttribute( objDecl );
                                 initStatements.push_back( ctor );
                                 objDecl->init = nullptr;

src/InitTweak/FixInit.cc

@@ -806 +806 @@
                                                 // The attribute works, and is meant to apply, both for leaving the static local alone,
                                                 // and for hoisting it out as a static global.
-                                                addDataSectonAttribute( objDecl );
+                                                addDataSectionAttribute( objDecl );
 
                                                 // originally wanted to take advantage of gcc nested functions, but

src/InitTweak/InitTweak.cc

@@ -587 +587 @@
 
         bool isConstructable( const ast::Type * type ) {
-                return ! dynamic_cast< const ast::VarArgsType * >( type ) && ! dynamic_cast< const ast::ReferenceType * >( type ) 
+                return ! dynamic_cast< const ast::VarArgsType * >( type ) && ! dynamic_cast< const ast::ReferenceType * >( type )
                 && ! dynamic_cast< const ast::FunctionType * >( type ) && ! Tuples::isTtype( type );
         }
@@ -1025 +1025 @@
                 if (!assign) {
                         auto td = new ast::TypeDecl({}, "T", {}, nullptr, ast::TypeDecl::Dtype, true);
-                        assign = new ast::FunctionDecl({}, "?=?", {}, 
+                        assign = new ast::FunctionDecl({}, "?=?", {},
                         { new ast::ObjectDecl({}, "_dst", new ast::ReferenceType(new ast::TypeInstType("T", td))),
                           new ast::ObjectDecl({}, "_src", new ast::TypeInstType("T", td))},
@@ -1095 +1095 @@
 
                         // address of a variable or member expression is constexpr
-                        if ( ! dynamic_cast< const ast::NameExpr * >( arg ) 
-                        && ! dynamic_cast< const ast::VariableExpr * >( arg ) 
-                        && ! dynamic_cast< const ast::MemberExpr * >( arg ) 
+                        if ( ! dynamic_cast< const ast::NameExpr * >( arg )
+                        && ! dynamic_cast< const ast::VariableExpr * >( arg )
+                        && ! dynamic_cast< const ast::MemberExpr * >( arg )
                         && ! dynamic_cast< const ast::UntypedMemberExpr * >( arg ) ) result = false;
                 }
@@ -1241 +1241 @@
         }
 
-        void addDataSectonAttribute( ObjectDecl * objDecl ) {
+        #if defined( __x86_64 ) || defined( __i386 ) // assembler comment to prevent assembler warning message
+                #define ASM_COMMENT "#"
+        #else // defined( __ARM_ARCH )
+                #define ASM_COMMENT "//"
+        #endif
+        static const char * const data_section =  ".data" ASM_COMMENT;
+        static const char * const tlsd_section = ".tdata" ASM_COMMENT;
+        void addDataSectionAttribute( ObjectDecl * objDecl ) {
+                const bool is_tls = objDecl->get_storageClasses().is_threadlocal;
+                const char * section = is_tls ? tlsd_section : data_section;
                 objDecl->attributes.push_back(new Attribute("section", {
-                        new ConstantExpr( Constant::from_string(".data"
-#if defined( __x86_64 ) || defined( __i386 ) // assembler comment to prevent assembler warning message
-                                        "#"
-#else // defined( __ARM_ARCH )
-                                        "//"
-#endif
-                                ))}));
+                        new ConstantExpr( Constant::from_string( section ) )
+                }));
         }
 
         void addDataSectionAttribute( ast::ObjectDecl * objDecl ) {
+                const bool is_tls = objDecl->storage.is_threadlocal;
+                const char * section = is_tls ? tlsd_section : data_section;
                 objDecl->attributes.push_back(new ast::Attribute("section", {
-                        ast::ConstantExpr::from_string(objDecl->location, ".data"
-#if defined( __x86_64 ) || defined( __i386 ) // assembler comment to prevent assembler warning message
-                                        "#"
-#else // defined( __ARM_ARCH )
-                                        "//"
-#endif
-                                )}));
+                        ast::ConstantExpr::from_string(objDecl->location, section)
+                }));
         }
 

src/InitTweak/InitTweak.h

@@ -127 +127 @@
         ///    .section .data#,"a"
         /// to avoid assembler warning "ignoring changed section attributes for .data"
-        void addDataSectonAttribute( ObjectDecl * objDecl );
+        void addDataSectionAttribute( ObjectDecl * objDecl );
 
         void addDataSectionAttribute( ast::ObjectDecl * objDecl );

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Apr 29  9:52:00 2022
-// Update Count     : 673
+// Last Modified On : Tue Jun  7 13:29:00 2022
+// Update Count     : 674
 //
 
@@ -447 +447 @@
                         PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
 
-                        PASS( "Translate Tries" , ControlStruct::translateTries( transUnit ) );
+                        PASS( "Translate Tries", ControlStruct::translateTries( transUnit ) );
+                        PASS( "Gen Waitfor", Concurrency::generateWaitFor( transUnit ) );
 
                         translationUnit = convert( move( transUnit ) );
@@ -517 +518 @@
 
                         PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
-
-                        PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );
+                        PASS( "Translate Tries", ControlStruct::translateTries( translationUnit ) );
+                        PASS( "Gen Waitfor", Concurrency::generateWaitFor( translationUnit ) );
                 }
-
-                PASS( "Gen Waitfor" , Concurrency::generateWaitFor( translationUnit ) );
 
                 PASS( "Convert Specializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded