Changeset f2e40a9f for src/Concurrency/Keywords.cc

Timestamp:

Mar 15, 2017, 9:43:15 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

27fed7f1, 738e304

Parents:

bf4ac09 (diff), 9b443c7f (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.

git-author:

Peter A. Buhr <pabuhr@…> (03/15/17 21:25:49)

git-committer:

Peter A. Buhr <pabuhr@…> (03/15/17 21:43:15)

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

• src/Concurrency/Keywords.cc (modified) (7 diffs)

src/Concurrency/Keywords.cc

@@ -88 +88 @@
         //Handles mutex routines definitions :
         // void foo( A * mutex a, B * mutex b,  int i ) {                  void foo( A * a, B * b,  int i ) {
-        //                                                                       monitor_desc * __monitors[] = { a, b };
+        //                                                                       monitor_desc * __monitors[] = { get_monitor(a), get_monitor(b) };
         //                                                                       monitor_guard_t __guard = { __monitors, 2 };
         //    /*Some code*/                                       =>           /*Some code*/
@@ -98 +98 @@
                 using Visitor::visit;
                 virtual void visit( FunctionDecl *functionDecl ) override final;
+                virtual void visit(   StructDecl *functionDecl ) override final;
 
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl* );
@@ -107 +108 @@
                         acceptAll( translationUnit, impl );
                 }
+
+          private:
+                StructDecl* monitor_decl = nullptr;
         };
 
@@ -133 +137 @@
                 if( ! body ) return;
 
+                assert(monitor_decl);
                 addStatments( body, mutexArgs );
+        }
+
+        void MutexKeyword::visit(StructDecl* decl) {
+                if( decl->get_name() == "monitor_desc" ) {
+                        assert( !monitor_decl );
+                        monitor_decl = decl;
+                }
         }
 
@@ -167 +179 @@
 
         void MutexKeyword::addStatments( CompoundStmt * body, const std::list<DeclarationWithType * > & args ) {
+
+                ObjectDecl * monitors = new ObjectDecl(
+                        "__monitors",
+                        noStorage,
+                        LinkageSpec::Cforall,
+                        nullptr,
+                        new ArrayType(
+                                noQualifiers,
+                                new PointerType(
+                                        noQualifiers,
+                                        new StructInstType(
+                                                noQualifiers,
+                                                monitor_decl
+                                        )
+                                ),
+                                new ConstantExpr( Constant::from_ulong( args.size() ) ),
+                                false,
+                                false
+                        ),
+                        new ListInit(
+                                map_range < std::list<Initializer*> > ( args, [](DeclarationWithType * var ){
+                                        return new SingleInit( new UntypedExpr(
+                                                new NameExpr( "get_monitor" ),
+                                                {  new VariableExpr( var ) }
+                                        ) );
+                                })
+                        )
+                );
+
                 //in reverse order :
                 // monitor_guard_t __guard = { __monitors, # };
@@ -181 +222 @@
                                 new ListInit(
                                         {
-                                                new SingleInit( new NameExpr( "__monitors" ) ),
+                                                new SingleInit( new VariableExpr( monitors ) ),
                                                 new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
                                         }
@@ -189 +230 @@
 
                 //monitor_desc * __monitors[] = { a, b };
-                body->push_front(
-                        new DeclStmt( noLabels, new ObjectDecl(
-                                "__monitors",
-                                noStorage,
-                                LinkageSpec::Cforall,
-                                nullptr,
-                                new ArrayType(
-                                        noQualifiers,
-                                        new PointerType(
-                                                noQualifiers,
-                                                new StructInstType(
-                                                        noQualifiers,
-                                                        "monitor_desc"
-                                                )
-                                        ),
-                                        new ConstantExpr( Constant::from_ulong( args.size() ) ),
-                                        false,
-                                        false
-                                ),
-                                new ListInit(
-                                        map_range < std::list<Initializer*> > ( args, [](DeclarationWithType * var ){
-                                                return new SingleInit( new VariableExpr( var ) );
-                                        })
-                                )
-                        ))
-                );
+                body->push_front( new DeclStmt( noLabels, monitors) );
         }
 };