Changeset 665f432 for src

Timestamp:

Nov 20, 2019, 6:55:39 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

1a69a90, 9802f4c

Parents:

57c764c

Message:

Fixed trac #149 where operand names in asm statements where incorrectly resolved (i.e., should not have been resolved)

Location:

src

Files:

• AST/Convert.cpp (modified) (2 diffs)
• AST/Expr.hpp (modified) (1 diff)
• AST/Pass.impl.hpp (modified) (1 diff)
• AST/Print.cpp (modified) (1 diff)
• CodeGen/CodeGenerator.cc (modified) (1 diff)
• Common/PassVisitor.impl.h (modified) (3 diffs)
• Parser/parser.yy (modified) (1 diff)
• ResolvExpr/Resolver.cc (modified) (2 diffs)
• SynTree/Expression.cc (modified) (1 diff)
• SynTree/Expression.h (modified) (1 diff)

src/AST/Convert.cpp

@@ -887 +887 @@
                 auto expr = visitBaseExpr( node,
                         new AsmExpr(
-                                get<Expression>().accept1(node->inout),
+                                new std::string(node->inout),
                                 get<Expression>().accept1(node->constraint),
                                 get<Expression>().accept1(node->operand)
@@ -2258 +2258 @@
                         new ast::AsmExpr(
                                 old->location,
-                                GET_ACCEPT_1(inout, Expr),
+                                old->inout,
                                 GET_ACCEPT_1(constraint, Expr),
                                 GET_ACCEPT_1(operand, Expr)

src/AST/Expr.hpp

@@ -556 +556 @@
 class AsmExpr final : public Expr {
 public:
-        ptr<Expr> inout;
+        std::string inout;
         ptr<Expr> constraint;
         ptr<Expr> operand;
 
-        AsmExpr( const CodeLocation & loc, const Expr * io, const Expr * con, const Expr * op )
+        AsmExpr( const CodeLocation & loc, const std::string & io, const Expr * con, const Expr * op )
         : Expr( loc ), inout( io ), constraint( con ), operand( op ) {}
 

src/AST/Pass.impl.hpp

@@ -1300 +1300 @@
                         maybe_accept( node, &AsmExpr::result );
                 }
-                maybe_accept( node, &AsmExpr::inout      );
                 maybe_accept( node, &AsmExpr::constraint );
                 maybe_accept( node, &AsmExpr::operand    );

src/AST/Print.cpp

@@ -1011 +1011 @@
                 os << "Asm Expression:" << endl;
                 ++indent;
-                if ( node->inout ) node->inout->accept( *this );
+                if ( !node->inout.empty() ) os << "[" << node->inout << "] ";
                 if ( node->constraint ) node->constraint->accept( *this );
                 if ( node->operand ) node->operand->accept( *this );

src/CodeGen/CodeGenerator.cc

@@ -786 +786 @@
 
         void CodeGenerator::postvisit( AsmExpr * asmExpr ) {
-                if ( asmExpr->get_inout() ) {
+                if ( !asmExpr->inout.empty() ) {
                         output << "[ ";
-                        asmExpr->get_inout()->accept( *visitor );
+                        output << asmExpr->inout;
                         output << " ] ";
                 } // if
-                asmExpr->get_constraint()->accept( *visitor );
+                asmExpr->constraint->accept( *visitor );
                 output << " ( ";
-                asmExpr->get_operand()->accept( *visitor );
+                asmExpr->operand->accept( *visitor );
                 output << " )";
         }

src/Common/PassVisitor.impl.h

@@ -2452 +2452 @@
 
         indexerScopedAccept( node->result    , *this );
-        maybeAccept_impl   ( node->inout     , *this );
         maybeAccept_impl   ( node->constraint, *this );
         maybeAccept_impl   ( node->operand   , *this );
@@ -2464 +2463 @@
 
         indexerScopedAccept( node->result    , *this );
-        maybeAccept_impl   ( node->inout     , *this );
         maybeAccept_impl   ( node->constraint, *this );
         maybeAccept_impl   ( node->operand   , *this );
@@ -2477 +2475 @@
         indexerScopedMutate( node->env       , *this );
         indexerScopedMutate( node->result    , *this );
-        maybeMutate_impl   ( node->inout     , *this );
         maybeMutate_impl   ( node->constraint, *this );
         maybeMutate_impl   ( node->operand   , *this );

src/Parser/parser.yy

@@ -1423 +1423 @@
 asm_operand:                                                                                    // GCC
         string_literal '(' constant_expression ')'
-                { $$ = new ExpressionNode( new AsmExpr( maybeMoveBuild< Expression >( (ExpressionNode *)nullptr ), $1, maybeMoveBuild< Expression >( $3 ) ) ); }
-        | '[' constant_expression ']' string_literal '(' constant_expression ')'
-                { $$ = new ExpressionNode( new AsmExpr( maybeMoveBuild< Expression >( $2 ), $4, maybeMoveBuild< Expression >( $6 ) ) ); }
+                { $$ = new ExpressionNode( new AsmExpr( nullptr, $1, maybeMoveBuild< Expression >( $3 ) ) ); }
+        | '[' IDENTIFIER ']' string_literal '(' constant_expression ')'
+                { $$ = new ExpressionNode( new AsmExpr( $2, $4, maybeMoveBuild< Expression >( $6 ) ) ); }
         ;
 

src/ResolvExpr/Resolver.cc

@@ -485 +485 @@
                 visit_children = false;
                 findVoidExpression( asmExpr->operand, indexer );
-                if ( asmExpr->get_inout() ) {
-                        findVoidExpression( asmExpr->inout, indexer );
-                } // if
         }
 
@@ -1365 +1362 @@
                 asmExpr = ast::mutate_field(
                         asmExpr, &ast::AsmExpr::operand, findVoidExpression( asmExpr->operand, symtab ) );
-
-                if ( asmExpr->inout ) {
-                        asmExpr = ast::mutate_field(
-                                asmExpr, &ast::AsmExpr::inout, findVoidExpression( asmExpr->inout, symtab ) );
-                }
 
                 return asmExpr;

src/SynTree/Expression.cc

@@ -527 +527 @@
 }
 
-AsmExpr::AsmExpr( const AsmExpr & other ) : Expression( other ), inout( maybeClone( other.inout ) ), constraint( maybeClone( other.constraint ) ), operand( maybeClone( other.operand ) ) {}
+AsmExpr::AsmExpr( const AsmExpr & other ) : Expression( other ), inout( other.inout ), constraint( maybeClone( other.constraint ) ), operand( maybeClone( other.operand ) ) {}
 
 
 void AsmExpr::print( std::ostream & os, Indenter indent ) const {
         os << "Asm Expression: " << std::endl;
-        if ( inout ) inout->print( os, indent+1 );
+        if ( !inout.empty() ) os <<  "[" << inout << "] ";
         if ( constraint ) constraint->print( os, indent+1 );
         if ( operand ) operand->print( os, indent+1 );

src/SynTree/Expression.h

@@ -575 +575 @@
 class AsmExpr : public Expression {
   public:
-        Expression * inout;
+        std::string inout;
         Expression * constraint;
         Expression * operand;
 
-        AsmExpr( Expression * inout, Expression * constraint, Expression * operand ) : inout( inout ), constraint( constraint ), operand( operand ) {}
+        AsmExpr( const std::string * _inout, Expression * constraint, Expression * operand ) : inout( _inout ? *_inout : "" ), constraint( constraint ), operand( operand ) { delete _inout; }
         AsmExpr( const AsmExpr & other );
-        virtual ~AsmExpr() { delete inout; delete constraint; delete operand; };
-
-        Expression * get_inout() const { return inout; }
-        void set_inout( Expression * newValue ) { inout = newValue; }
-
-        Expression * get_constraint() const { return constraint; }
-        void set_constraint( Expression * newValue ) { constraint = newValue; }
-
-        Expression * get_operand() const { return operand; }
-        void set_operand( Expression * newValue ) { operand = newValue; }
+        virtual ~AsmExpr() { delete constraint; delete operand; };
 
         virtual AsmExpr * clone() const override { return new AsmExpr( * this ); }