Changeset a488783

Timestamp:

Jan 26, 2022, 2:42:52 PM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

bbfe226

Parents:

97fed44

Message:

Translated the first half of validate-D. HoistControlStruct? is pretty much the same, Autogen has changed a lot due to the changes in the AST.

Location:

src

Files:

• AST/Copy.hpp (modified) (2 diffs)
• AST/Node.hpp (modified) (1 diff)
• ControlStruct/HoistControlDecls.cpp (added)
• ControlStruct/HoistControlDecls.hpp (added)
• ControlStruct/module.mk (modified) (1 diff)
• SymTab/Validate.cc (modified) (2 diffs)
• SymTab/Validate.h (modified) (1 diff)
• Validate/Autogen.cpp (added)
• Validate/Autogen.hpp (added)
• Validate/module.mk (modified) (1 diff)
• main.cc (modified) (7 diffs)

src/AST/Copy.hpp ¶

@@ -10 +10 @@
 // Created On       : Wed Jul 10 16:13:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Nov 11  9:22:00 2021
-// Update Count     : 2
+// Last Modified On : Wed Dec 15 11:07:00 2021
+// Update Count     : 3
 //
 
@@ -52 +52 @@
 Node * deepCopy<Node>( const Node * localRoot );
 
+template<typename node_t, enum Node::ref_type ref_t>
+node_t * shallowCopy( const ptr_base<node_t, ref_t> & localRoot ) {
+        return shallowCopy( localRoot.get() );
+}
+
+template<typename node_t, enum Node::ref_type ref_t>
+node_t * deepCopy( const ptr_base<node_t, ref_t> & localRoot ) {
+        return deepCopy( localRoot.get() );
+}
+
 }
 

src/AST/Node.hpp ¶

@@ -188 +188 @@
         }
 
+        ptr_base & operator=( const node_t * node ) {
+                assign( node );
+                return *this;
+        }
+
         template<typename o_node_t>
         ptr_base & operator=( const o_node_t * node ) {

src/ControlStruct/module.mk ¶

@@ -22 +22 @@
         ControlStruct/ForExprMutator.cc \
         ControlStruct/ForExprMutator.h \
+        ControlStruct/HoistControlDecls.cpp \
+        ControlStruct/HoistControlDecls.hpp \
         ControlStruct/LabelFixer.cc \
         ControlStruct/LabelFixer.h \

src/SymTab/Validate.cc ¶

@@ -453 +453 @@
         }
 
+        void decayForallPointers( std::list< Declaration * > & translationUnit ) {
+                PassVisitor<ForallPointerDecay_old> fpd;
+                acceptAll( translationUnit, fpd );
+        }
+
         void validate( std::list< Declaration * > &translationUnit, __attribute__((unused)) bool doDebug ) {
                 validate_A( translationUnit );
@@ -470 +475 @@
                 type->accept( fpd );
         }
-
 
         void HoistTypeDecls::handleType( Type * type ) {

src/SymTab/Validate.h ¶

@@ -42 +42 @@
         void validate_E( std::list< Declaration * > &translationUnit );
         void validate_F( std::list< Declaration * > &translationUnit );
+        void decayForallPointers( std::list< Declaration * > & translationUnit );
 
         const ast::Type * validateType(

src/Validate/module.mk ¶

@@ -16 +16 @@
 
 SRC_VALIDATE = \
+        Validate/Autogen.cpp \
+        Validate/Autogen.hpp \
         Validate/CompoundLiteral.cpp \
         Validate/CompoundLiteral.hpp \

src/main.cc ¶

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tue Nov 30 10:25:00 2021
-// Update Count     : 659
+// Last Modified On : Wed Jan 26 14:09:00 2022
+// Update Count     : 670
 //
 
@@ -55 +55 @@
 #include "ControlStruct/ExceptTranslate.h"  // for translateEHM
 #include "ControlStruct/FixLabels.hpp"      // for fixLabels
+#include "ControlStruct/HoistControlDecls.hpp" //  hoistControlDecls
 #include "ControlStruct/Mutate.h"           // for mutate
 #include "GenPoly/Box.h"                    // for box
@@ -73 +74 @@
 #include "SynTree/Visitor.h"                // for acceptAll
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
+#include "Validate/Autogen.hpp"             // for autogenerateRoutines
 #include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
 #include "Validate/CompoundLiteral.hpp"     // for handleCompoundLiterals
@@ -78 +80 @@
 #include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
 #include "Virtual/ExpandCasts.h"            // for expandCasts
-
 
 static void NewPass( const char * const name ) {
@@ -326 +327 @@
                 PASS( "Validate-B", SymTab::validate_B( translationUnit ) );
                 PASS( "Validate-C", SymTab::validate_C( translationUnit ) );
-                PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
 
                 CodeTools::fillLocations( translationUnit );
 
                 if( useNewAST ) {
+                        PASS( "Apply Concurrent Keywords", Concurrency::applyKeywords( translationUnit ) );
+                        PASS( "Forall Pointer Decay", SymTab::decayForallPointers( translationUnit ) );
+                        CodeTools::fillLocations( translationUnit );
+
                         if (Stats::Counters::enabled) {
                                 ast::pass_visitor_stats.avg = Stats::Counters::build<Stats::Counters::AverageCounter<double>>("Average Depth - New");
@@ -338 +342 @@
 
                         forceFillCodeLocations( transUnit );
+
+                        // Must happen before autogen routines are added.
+                        PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls( transUnit ) );
+
+                        // Must be after enum and pointer decay.
+                        // Must be before compound literals.
+                        PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) );
 
                         PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) );
@@ -406 +417 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
                         PASS( "Validate-E", SymTab::validate_E( translationUnit ) );
                         PASS( "Validate-F", SymTab::validate_F( translationUnit ) );