Changeset ce36b55

Timestamp:

Nov 15, 2021, 2:51:44 PM (23 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

1387ea0

Parents:

5dcb881

Message:

Translation of Validate F; and some improvements in some helpers.

Location:

src

Files:

• AST/Copy.cpp (modified) (1 diff)
• AST/Copy.hpp (modified) (1 diff)
• AST/Init.hpp (modified) (1 diff)
• AST/Pass.hpp (modified) (2 diffs)
• InitTweak/FixInitNew.cpp (modified) (2 diffs)
• Validate/FindSpecialDecls.h (modified) (3 diffs)
• Validate/FindSpecialDeclsNew.cpp (added)
• Validate/InitializerLength.cpp (added)
• Validate/InitializerLength.hpp (added)
• Validate/LabelAddressFixer.cpp (added)
• Validate/LabelAddressFixer.hpp (added)
• Validate/module.mk (modified) (1 diff)
• main.cc (modified) (4 diffs)

src/AST/Copy.cpp

@@ -105 +105 @@
 }
 
-Node * deepCopyNode( const Node * localRoot ) {
+template<>
+Node * deepCopy<Node>( const Node * localRoot ) {
         Pass< DeepCopyCore > dc;
         Node const * newRoot = localRoot->accept( dc );

src/AST/Copy.hpp

@@ -44 +44 @@
 }
 
-Node * deepCopyNode( const Node * node );
-
 template<typename node_t>
 node_t * deepCopy( const node_t * localRoot ) {
-        return strict_dynamic_cast<node_t *>( deepCopyNode( localRoot ) );
+        return strict_dynamic_cast<node_t *>( deepCopy<Node>( localRoot ) );
 }
+
+template<>
+Node * deepCopy<Node>( const Node * localRoot );
 
 }

src/AST/Init.hpp

@@ -98 +98 @@
         const_iterator begin() const { return initializers.begin(); }
         const_iterator end() const { return initializers.end(); }
+        size_t size() const { return initializers.size(); }
 
         const Init * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Pass.hpp

@@ -109 +109 @@
         static auto read( node_type const * node, Args&&... args ) {
                 Pass<core_t> visitor( std::forward<Args>( args )... );
-                node_type const * temp = node->accept( visitor );
+                auto const * temp = node->accept( visitor );
                 assert( temp == node );
                 return visitor.get_result();
@@ -124 +124 @@
         static auto read( node_type const * node ) {
                 Pass<core_t> visitor;
-                node_type const * temp = node->accept( visitor );
+                auto const * temp = node->accept( visitor );
                 assert( temp == node );
                 return visitor.get_result();

src/InitTweak/FixInitNew.cpp

@@ -591 +591 @@
                 // need to add __Destructor for _tmp_cp variables as well
 
-                assertf( ast::dtorStruct && ast::dtorStruct->members.size() == 2, "Destructor generation requires __Destructor definition." );
+                assertf( ast::dtorStruct, "Destructor generation requires __Destructor definition." );
+                assertf( ast::dtorStruct->members.size() == 2, "__Destructor definition does not have expected fields." );
                 assertf( ast::dtorStructDestroy, "Destructor generation requires __destroy_Destructor." );
 
@@ -1216 +1217 @@
 
                                                         static UniqueName memberDtorNamer = { "__memberDtor" };
-                                                        assertf( Validate::dtorStruct, "builtin __Destructor not found." );
-                                                        assertf( Validate::dtorStructDestroy, "builtin __destroy_Destructor not found." );
+                                                        assertf( ast::dtorStruct, "builtin __Destructor not found." );
+                                                        assertf( ast::dtorStructDestroy, "builtin __destroy_Destructor not found." );
 
                                                         ast::Expr * thisExpr = new ast::CastExpr( new ast::AddressExpr( new ast::VariableExpr(loc, thisParam ) ), new ast::PointerType( new ast::VoidType(), ast::CV::Qualifiers() ) );

src/Validate/FindSpecialDecls.h

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Thu Aug 30 09:49:02 2018
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Aug 30 09:51:12 2018
-// Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Nov 10 15:16:00 2021
+// Update Count     : 3
 //
 
@@ -22 +22 @@
 class StructDecl;
 class Type;
+
+namespace ast {
+        class TranslationUnit;
+}
 
 namespace Validate {
@@ -38 +42 @@
         /// find and remember some of the special declarations that are useful for generating code, so that they do not have to be discovered multiple times.
         void findSpecialDecls( std::list< Declaration * > & translationUnit );
+
+/// find and remember some of the special declarations that are useful for
+/// generating code, so that they do not have to be discovered multiple times.
+void findGlobalDecls( ast::TranslationUnit & translationUnit );
+
 } // namespace Validate
 

src/Validate/module.mk

@@ -15 +15 @@
 ###############################################################################
 
-SRC += Validate/HandleAttributes.cc Validate/HandleAttributes.h Validate/FindSpecialDecls.cc Validate/FindSpecialDecls.h
-SRCDEMANGLE += Validate/HandleAttributes.cc Validate/HandleAttributes.h Validate/FindSpecialDecls.cc Validate/FindSpecialDecls.h
+SRC_VALIDATE = \
+        Validate/HandleAttributes.cc \
+        Validate/HandleAttributes.h \
+        Validate/InitializerLength.cpp \
+        Validate/InitializerLength.hpp \
+        Validate/LabelAddressFixer.cpp \
+        Validate/LabelAddressFixer.hpp \
+        Validate/FindSpecialDeclsNew.cpp \
+        Validate/FindSpecialDecls.cc \
+        Validate/FindSpecialDecls.h
+
+SRC += $(SRC_VALIDATE)
+SRCDEMANGLE += $(SRC_VALIDATE)

src/main.cc

@@ -72 +72 @@
 #include "SynTree/Visitor.h"                // for acceptAll
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
+#include "Validate/FindSpecialDecls.h"      // for findGlobalDecls
+#include "Validate/InitializerLength.hpp"   // for setLengthFromInitializer
+#include "Validate/LabelAddressFixer.hpp"   // for fixLabelAddresses
 #include "Virtual/ExpandCasts.h"            // for expandCasts
 
@@ -323 +326 @@
                 PASS( "Validate-D", SymTab::validate_D( translationUnit ) );
                 PASS( "Validate-E", SymTab::validate_E( translationUnit ) );
-                PASS( "Validate-F", SymTab::validate_F( translationUnit ) );
 
                 CodeTools::fillLocations( translationUnit );
@@ -336 +338 @@
                         forceFillCodeLocations( transUnit );
 
+                        PASS( "Set Length From Initializer", Validate::setLengthFromInitializer( transUnit ) );
+                        PASS( "Find Global Decls", Validate::findGlobalDecls( transUnit ) );
+                        PASS( "Fix Label Address", Validate::fixLabelAddresses( transUnit ) );
+
                         if ( symtabp ) {
                                 return EXIT_SUCCESS;
@@ -396 +402 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Validate-F", SymTab::validate_F( translationUnit ) );
+
                         if ( symtabp ) {
                                 deleteAll( translationUnit );