Changeset 25a054f

Timestamp:

Jan 19, 2016, 4:46:04 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:

e551c69

Parents:

1194734

Message:

Add OffsetofExpr? for field offsets

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (1 diff)
• CodeGen/CodeGenerator.h (modified) (1 diff)
• InitTweak/InitModel.h (modified) (1 diff)
• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• ResolvExpr/AlternativeFinder.h (modified) (1 diff)
• SymTab/Indexer.cc (modified) (1 diff)
• SymTab/Indexer.h (modified) (1 diff)
• SynTree/Expression.cc (modified) (1 diff)
• SynTree/Expression.h (modified) (1 diff)
• SynTree/Mutator.cc (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)
• SynTree/SynTree.h (modified) (1 diff)
• SynTree/Visitor.cc (modified) (1 diff)
• SynTree/Visitor.h (modified) (1 diff)
• Tuples/FlattenTuple.cc (modified) (1 diff)
• Tuples/FlattenTuple.h (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -443 +443 @@
         }
 
-        void CodeGenerator::visit( AlignofExpr *sizeofExpr ) {
+        void CodeGenerator::visit( AlignofExpr *alignofExpr ) {
                 // use GCC extension to avoid bumping std to C11
                 output << "__alignof__(";
-                if ( sizeofExpr->get_isType() ) {
-                        output << genType( sizeofExpr->get_type(), "" );
-                } else {
-                        sizeofExpr->get_expr()->accept( *this );
-                } // if
+                if ( alignofExpr->get_isType() ) {
+                        output << genType( alignofExpr->get_type(), "" );
+                } else {
+                        alignofExpr->get_expr()->accept( *this );
+                } // if
+                output << ")";
+        }
+
+        void CodeGenerator::visit( OffsetofExpr *offsetofExpr ) {
+                // use GCC builtin
+                output << "__builtin_offsetof(";
+                output << genType( offsetofExpr->get_type(), "" );
+                output << ", ";
+                offsetofExpr->get_member()->accept( *this );
                 output << ")";
         }

src/CodeGen/CodeGenerator.h

@@ -61 +61 @@
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
+                virtual void visit( OffsetofExpr *offsetofExpr );
                 virtual void visit( LogicalExpr *logicalExpr );
                 virtual void visit( ConditionalExpr *conditionalExpr );

src/InitTweak/InitModel.h

@@ -73 +73 @@
                         void visit( SizeofExpr * ) { throw 0; }
                         void visit( AlignofExpr * ) { throw 0; }
+                        void visit( OffsetofExpr * ) { throw 0; }
                         void visit( AttrExpr * ) { throw 0; }
                         void visit( LogicalExpr * ) { throw 0; }

src/ResolvExpr/AlternativeFinder.cc

@@ -811 +811 @@
         }
 
+        void AlternativeFinder::visit( OffsetofExpr *offsetofExpr ) {
+                alternatives.push_back( Alternative( offsetofExpr->clone(), env, Cost::zero ) );
+        }
+
         void AlternativeFinder::resolveAttr( DeclarationWithType *funcDecl, FunctionType *function, Type *argType, const TypeEnvironment &env ) {
                 // assume no polymorphism

src/ResolvExpr/AlternativeFinder.h

@@ -56 +56 @@
                 virtual void visit( ConstantExpr *constantExpr ); 
                 virtual void visit( SizeofExpr *sizeofExpr );
-                virtual void visit( AlignofExpr *sizeofExpr );
+                virtual void visit( AlignofExpr *alignofExpr );
+                virtual void visit( OffsetofExpr *offsetofExpr );
                 virtual void visit( AttrExpr *attrExpr );
                 virtual void visit( LogicalExpr *logicalExpr );

src/SymTab/Indexer.cc

@@ -225 +225 @@
                         maybeAccept( alignofExpr->get_expr(), *this );
                 }
+        }
+
+        void Indexer::visit( OffsetofExpr *offsetofExpr ) {
+                acceptAllNewScope( offsetofExpr->get_results(), *this );
+                maybeAccept( offsetofExpr->get_type(), *this );
+                maybeAccept( offsetofExpr->get_member(), *this );
         }
 

src/SymTab/Indexer.h

@@ -55 +55 @@
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
+                virtual void visit( OffsetofExpr *offsetofExpr );
                 virtual void visit( AttrExpr *attrExpr );
                 virtual void visit( LogicalExpr *logicalExpr );

src/SynTree/Expression.cc

@@ -163 +163 @@
 }
 
+OffsetofExpr::OffsetofExpr( Type *type_, DeclarationWithType *member_, Expression *_aname ) :
+                Expression( _aname ), type(type_), member(member_) {
+        add_result( new BasicType( Type::Qualifiers(), BasicType::UnsignedInt ) );
+}
+
+OffsetofExpr::OffsetofExpr( const OffsetofExpr &other ) :
+        Expression( other ), type( maybeClone( other.type ) ), member( maybeClone( other.member ) ) {}
+
+OffsetofExpr::~OffsetofExpr() {
+        delete type;
+        delete member;
+}
+
+void OffsetofExpr::print( std::ostream &os, int indent) const {
+        os << std::string( indent, ' ' ) << "Offsetof Expression on member ";
+
+        if ( member ) {
+                os << member->get_name();
+        } else {
+                os << "<NULL>";
+        }
+
+        os << " of ";
+
+        if ( type ) {
+                type->print(os, indent + 2);
+        } else {
+                os << "<NULL>";
+        }
+
+        os << std::endl;
+        Expression::print( os, indent );
+}
+
 AttrExpr::AttrExpr( Expression *attr, Expression *expr_, Expression *_aname ) :
                 Expression( _aname ), attr( attr ), expr(expr_), type(0), isType(false) {

src/SynTree/Expression.h

@@ -319 +319 @@
 };
 
+/// OffsetofExpr represents an offsetof expression
+class OffsetofExpr : public Expression {
+  public:
+        OffsetofExpr( Type *type, DeclarationWithType *member, Expression *_aname = 0 );
+        OffsetofExpr( const OffsetofExpr &other );
+        virtual ~OffsetofExpr();
+
+        Type *get_type() const { return type; }
+        void set_type( Type *newValue ) { type = newValue; }
+        DeclarationWithType *get_member() const { return member; }
+        void set_member( DeclarationWithType *newValue ) { member = newValue; }
+
+        virtual OffsetofExpr *clone() const { return new OffsetofExpr( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual Expression *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Type *type;
+        DeclarationWithType *member;
+};
+
 /// AttrExpr represents an @attribute expression (like sizeof, but user-defined)
 class AttrExpr : public Expression {

src/SynTree/Mutator.cc

@@ -261 +261 @@
 }
 
+Expression *Mutator::mutate( OffsetofExpr *offsetofExpr ) {
+        mutateAll( offsetofExpr->get_results(), *this );
+        offsetofExpr->set_type( maybeMutate( offsetofExpr->get_type(), *this ) );
+        offsetofExpr->set_member( maybeMutate( offsetofExpr->get_member(), *this ) );
+        return offsetofExpr;
+}
+
 Expression *Mutator::mutate( AttrExpr *attrExpr ) {
         mutateAll( attrExpr->get_results(), *this );

src/SynTree/Mutator.h

@@ -65 +65 @@
         virtual Expression* mutate( SizeofExpr *sizeofExpr );
         virtual Expression* mutate( AlignofExpr *alignofExpr );
+        virtual Expression* mutate( OffsetofExpr *offsetofExpr );
         virtual Expression* mutate( AttrExpr *attrExpr );
         virtual Expression* mutate( LogicalExpr *logicalExpr );

src/SynTree/SynTree.h

@@ -70 +70 @@
 class SizeofExpr;
 class AlignofExpr;
+class OffsetofExpr;
 class AttrExpr;
 class LogicalExpr;

src/SynTree/Visitor.cc

@@ -219 +219 @@
 }
 
+void Visitor::visit( OffsetofExpr *offsetofExpr ) {
+        acceptAll( offsetofExpr->get_results(), *this );
+        maybeAccept( offsetofExpr->get_type(), *this );
+        maybeAccept( offsetofExpr->get_member(), *this );
+}
+
 void Visitor::visit( AttrExpr *attrExpr ) {
         acceptAll( attrExpr->get_results(), *this );

src/SynTree/Visitor.h

@@ -65 +65 @@
         virtual void visit( SizeofExpr *sizeofExpr );
         virtual void visit( AlignofExpr *alignofExpr );
+        virtual void visit( OffsetofExpr *offsetofExpr );
         virtual void visit( AttrExpr *attrExpr );
         virtual void visit( LogicalExpr *logicalExpr );

src/Tuples/FlattenTuple.cc

@@ -47 +47 @@
         void FlattenTuple::CollectArgs::visit( SizeofExpr        *expr )  {  currentArgs.insert( currentArgs.end(), expr );  }
         void FlattenTuple::CollectArgs::visit( AlignofExpr       *expr )  {  currentArgs.insert( currentArgs.end(), expr );  }
+        void FlattenTuple::CollectArgs::visit( OffsetofExpr      *expr )  {  currentArgs.insert( currentArgs.end(), expr );  }
         void FlattenTuple::CollectArgs::visit( AttrExpr          *expr )  {  currentArgs.insert( currentArgs.end(), expr );  }
         void FlattenTuple::CollectArgs::visit( LogicalExpr       *expr )  {  currentArgs.insert( currentArgs.end(), expr );  }

src/Tuples/FlattenTuple.h

@@ -43 +43 @@
                         virtual void visit( SizeofExpr * );
                         virtual void visit( AlignofExpr * );
+                        virtual void visit( OffsetofExpr * );
                         virtual void visit( AttrExpr * );
                         virtual void visit( LogicalExpr * );