Changeset 720f2fe2

Timestamp:

Jun 7, 2022, 1:51:24 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6e2b04e

Parents:

b6e0b61

Message:

Changed 'addDataSectionAttribute' to correctly handle tls.
Fixed Typo.

Location:

src/InitTweak

Files:

• FixGlobalInit.cc (modified) (1 diff)
• FixInit.cc (modified) (1 diff)
• InitTweak.cc (modified) (4 diffs)
• InitTweak.h (modified) (1 diff)

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 );