Changeset cdec5af

Timestamp:

Dec 14, 2015, 1:54:46 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

56fcd77

Parents:

63db3d76

Message:

Added LayoutStructDecls? to box pass

File:

• src/GenPoly/Box.cc (modified) (13 diffs)

src/GenPoly/Box.cc

@@ -14 +14 @@
 //
 
+#include <map>
 #include <set>
+#include <sstream>
 #include <stack>
 #include <string>
@@ -20 +22 @@
 #include <algorithm>
 #include <cassert>
+#include <utility>
 
 #include "Box.h"
@@ -28 +31 @@
 #include "Parser/ParseNode.h"
 
+#include "SynTree/Constant.h"
 #include "SynTree/Type.h"
 #include "SynTree/Expression.h"
@@ -50 +54 @@
                 FunctionType *makeAdapterType( FunctionType *adaptee, const TyVarMap &tyVars );
 
+                /// Cache for layout struct decls
+                class LayoutStructDecls {
+                public:
+                        /// Gets the layout struct declaration for a given number of members (0 for non-generic); creates declarations as needed.
+                        /// Declarations are allocated with "new", not freed on LayoutStructDecls destruction
+                        StructDecl* get( int members );
+                        /// adds all struct declarations to the translation unit
+                        void addToTranslationUnit( std::list< Declaration* >& translationUnit );
+                private:
+                        /// Layout struct declarations, indexed by number of members in the generic struct (0 for non-generic)
+                        std::map< int, StructDecl* > decls;
+                };
+
                 /// Replaces polymorphic return types with out-parameters, replaces calls to polymorphic functions with adapter calls as needed, and adds appropriate type variables to the function call
                 class Pass1 : public PolyMutator {
                   public:
-                        Pass1();
+                        Pass1( LayoutStructDecls &layoutDecls );
                         virtual Expression *mutate( ApplicationExpr *appExpr );
                         virtual Expression *mutate( AddressExpr *addrExpr );
@@ -87 +104 @@
                         bool useRetval;
                         UniqueName tempNamer;
+                        LayoutStructDecls &layoutDecls;
                 };
 
@@ -92 +110 @@
                 class Pass2 : public PolyMutator {
                   public:
-                        Pass2();
+                        Pass2( LayoutStructDecls &layoutDecls );
                         template< typename DeclClass >
                         DeclClass *handleDecl( DeclClass *decl, Type *type );
@@ -105 +123 @@
   
                         std::map< UniqueId, std::string > adapterName;
+                        LayoutStructDecls &layoutDecls;
                 };
 
@@ -110 +129 @@
                 class Pass3 : public PolyMutator {
                   public:
+                        Pass3( LayoutStructDecls &layoutDecls );
                         template< typename DeclClass >
                         DeclClass *handleDecl( DeclClass *decl, Type *type );
@@ -120 +140 @@
                         virtual Type *mutate( FunctionType *funcType );
                   private:
+                        LayoutStructDecls &layoutDecls;
                 };
 
@@ -134 +155 @@
 
         void box( std::list< Declaration *>& translationUnit ) {
-                Pass1 pass1;
-                Pass2 pass2;
-                Pass3 pass3;
+                LayoutStructDecls layoutStructs;
+                Pass1 pass1( layoutStructs );
+                Pass2 pass2( layoutStructs );
+                Pass3 pass3( layoutStructs );
                 mutateAll( translationUnit, pass1 );
                 mutateAll( translationUnit, pass2 );
                 mutateAll( translationUnit, pass3 );
+                layoutStructs.addToTranslationUnit( translationUnit );
+        }
+
+        //////////////////////////////////// LayoutStructDecls //////////////////////////////////////////////
+
+        namespace {
+                StructDecl* LayoutStructDecls::get( int members ) {
+                        // Attempt to read declaration already in map
+                        std::map< int, StructDecl* >::iterator decl = decls.find( members );
+                        if ( decl != decls.end() ) return decl->second;
+
+                        // Insert if not found
+                        std::string member_str;
+                        if ( members > 0 ) {
+                                std::stringstream ss;
+                                ss << members;
+                                member_str = ss.str();
+                        }
+                        StructDecl *newDecl = new StructDecl( std::string("_layout") + member_str );
+
+                        newDecl->get_members().push_back(
+                                        new ObjectDecl( "size", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0 ) );
+                        newDecl->get_members().push_back(
+                                        new ObjectDecl( "align", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), 0 ) );
+                        if ( members > 0 ) {
+                                ArrayType *aType =
+                                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ),
+                                                                           new ConstantExpr( Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), member_str ) ), false, false );
+                                newDecl->get_members().push_back(
+                                        new ObjectDecl( "offsets", DeclarationNode::NoStorageClass, LinkageSpec::Cforall, 0, aType, 0 ) );
+                        }
+
+                        decls.insert( std::make_pair( members, newDecl ) );
+
+                        return newDecl;
+                }
+
+                void LayoutStructDecls::addToTranslationUnit( std::list< Declaration* >& translationUnit ) {
+                        for ( std::map< int, StructDecl* >::reverse_iterator decl = decls.rbegin(); decl != decls.rend(); ++decl ) {
+                                translationUnit.push_front( decl->second );
+                        }
+                }
         }
 
@@ -181 +245 @@
                 }
 
-                Pass1::Pass1()
-                        : useRetval( false ), tempNamer( "_temp" ) {
+                Pass1::Pass1( LayoutStructDecls &layoutDecls )
+                        : useRetval( false ), tempNamer( "_temp" ), layoutDecls( layoutDecls ) {
                         adapters.push(AdapterMap());
                 }
@@ -936 +1000 @@
 ////////////////////////////////////////// Pass2 ////////////////////////////////////////////////////
 
-                Pass2::Pass2() {}
+                Pass2::Pass2( LayoutStructDecls &layoutDecls ) : layoutDecls(layoutDecls) {}
 
                 void Pass2::addAdapters( FunctionType *functionType ) {
@@ -1040 +1104 @@
 ////////////////////////////////////////// Pass3 ////////////////////////////////////////////////////
 
+                Pass3::Pass3( LayoutStructDecls &layoutDecls ) : layoutDecls(layoutDecls) {}
+
                 template< typename DeclClass >
                 DeclClass * Pass3::handleDecl( DeclClass *decl, Type *type ) {