Changeset 8a1d95af for src/Concurrency/Keywords.cc

Timestamp:

Aug 14, 2021, 8:48:49 AM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum

Children:

f79ee0d

Parents:

c99a0d1 (diff), 6d63c14 (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

File:

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

src/Concurrency/Keywords.cc

@@ -302 +302 @@
                 void postvisit( FunctionDecl * decl );
                 void postvisit(   StructDecl * decl );
+                Statement * postmutate( MutexStmt * stmt );
 
                 std::list<DeclarationWithType*> findMutexArgs( FunctionDecl*, bool & first );
@@ -307 +308 @@
                 void addDtorStatements( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
                 void addStatements( FunctionDecl* func, CompoundStmt *, const std::list<DeclarationWithType * > &);
+                void addStatements( CompoundStmt * body, const std::list<Expression * > & args );
                 void addThreadDtorStatements( FunctionDecl* func, CompoundStmt * body, const std::list<DeclarationWithType * > & args );
 
@@ -312 +314 @@
                         PassVisitor< MutexKeyword > impl;
                         acceptAll( translationUnit, impl );
+                        mutateAll( translationUnit, impl );
                 }
 
@@ -935 +938 @@
                         thread_guard_decl = decl;
                 }
+        }
+
+        Statement * MutexKeyword::postmutate( MutexStmt * stmt ) {
+                std::list<Statement *> stmtsForCtor;
+                stmtsForCtor.push_back(stmt->stmt);
+                CompoundStmt * body = new CompoundStmt( stmtsForCtor );
+                addStatements( body, stmt->mutexObjs);
+                return body;
         }
 
@@ -1058 +1069 @@
                         ))
                 );
+        }
+
+        void MutexKeyword::addStatements( CompoundStmt * body, const std::list<Expression * > & args ) {
+                ObjectDecl * monitors = new ObjectDecl(
+                        "__monitors",
+                        noStorageClasses,
+                        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, [](Expression * var ){
+                                        return new SingleInit( new UntypedExpr(
+                                                new NameExpr( "get_monitor" ),
+                                                { var }
+                                        ) );
+                                })
+                        )
+                );
+
+                // in reverse order :
+                // monitor_guard_t __guard = { __monitors, # };
+                body->push_front(
+                        new DeclStmt( new ObjectDecl(
+                                "__guard",
+                                noStorageClasses,
+                                LinkageSpec::Cforall,
+                                nullptr,
+                                new StructInstType(
+                                        noQualifiers,
+                                        guard_decl
+                                ),
+                                new ListInit(
+                                        {
+                                                new SingleInit( new VariableExpr( monitors ) ),
+                                                new SingleInit( new ConstantExpr( Constant::from_ulong( args.size() ) ) )
+                                        },
+                                        noDesignators,
+                                        true
+                                )
+                        ))
+                );
+
+                //monitor$ * __monitors[] = { get_monitor(a), get_monitor(b) };
+                body->push_front( new DeclStmt( monitors) );
         }