Merge branch 'pr_elab_sys_tasks' of https://github.com/udif/yosys into clifford/pr983
authorClifford Wolf <clifford@clifford.at>
Fri, 7 Jun 2019 10:08:42 +0000 (12:08 +0200)
committerClifford Wolf <clifford@clifford.at>
Fri, 7 Jun 2019 10:08:42 +0000 (12:08 +0200)
1  2 
frontends/ast/ast.cc
frontends/ast/ast.h
frontends/ast/genrtlil.cc
frontends/ast/simplify.cc
frontends/verilog/verilog_lexer.l
frontends/verilog/verilog_parser.y
kernel/log.cc

Simple merge
Simple merge
Simple merge
Simple merge
index 9558bbfb98b039e8bf99b6f2c81640cd7e4eb6e4,1c6810b47927f7840d71a46ab67b62683d4678d8..3c612472dbbf8472ae12d0eed95ca325dc628a23
@@@ -305,12 -301,11 +305,17 @@@ supply1 { return TOK_SUPPLY1; 
        return TOK_ID;
  }
  
 +"$"(setup|hold|setuphold|removal|recovery|recrem|skew|timeskew|fullskew|nochange) {
 +      if (!specify_mode) REJECT;
 +      frontend_verilog_yylval.string = new std::string(yytext);
 +      return TOK_ID;
 +}
 +
+ "$"(info|warning|error|fatal) {
+       frontend_verilog_yylval.string = new std::string(yytext);
+       return TOK_ELAB_TASK;
+ }
  "$signed"   { return TOK_TO_SIGNED; }
  "$unsigned" { return TOK_TO_UNSIGNED; }
  
index 6d3afed0ec1e9eab1a391aba90ca17d1dae4916b,1965f090e499c76c66254c0ee77b347d1b608a1e..a034f960155ca59728729150c59dae164650584b
@@@ -125,16 -102,11 +125,16 @@@ struct specify_rise_fall 
        std::string *string;
        struct YOSYS_NAMESPACE_PREFIX AST::AstNode *ast;
        std::map<std::string, YOSYS_NAMESPACE_PREFIX AST::AstNode*> *al;
 +      struct specify_target *specify_target_ptr;
 +      struct specify_triple *specify_triple_ptr;
 +      struct specify_rise_fall *specify_rise_fall_ptr;
        bool boolean;
 +      char ch;
  }
  
 -%token <string> TOK_STRING TOK_ID TOK_CONSTVAL TOK_REALVAL TOK_PRIMITIVE TOK_SVA_LABEL TOK_ELAB_TASK
 -%token TOK_ASSERT TOK_ASSUME TOK_RESTRICT TOK_COVER
 +%token <string> TOK_STRING TOK_ID TOK_CONSTVAL TOK_REALVAL TOK_PRIMITIVE
- %token <string> TOK_SVA_LABEL TOK_SPECIFY_OPER
++%token <string> TOK_SVA_LABEL TOK_SPECIFY_OPER TOK_ELAB_TASK
 +%token TOK_ASSERT TOK_ASSUME TOK_RESTRICT TOK_COVER TOK_FINAL
  %token ATTR_BEGIN ATTR_END DEFATTR_BEGIN DEFATTR_END
  %token TOK_MODULE TOK_ENDMODULE TOK_PARAMETER TOK_LOCALPARAM TOK_DEFPARAM
  %token TOK_PACKAGE TOK_ENDPACKAGE TOK_PACKAGESEP
diff --cc kernel/log.cc
Simple merge