Fix handling of read_verilog config in AstModule::reprocess_module(), fixes #1360

Signed-off-by: Clifford Wolf <clifford@clifford.at>

diff --git a/frontends/ast/ast.cc b/frontends/ast/ast.cc
index a3a78e414a468984dc7b73784918454699996aad..21279cbfa583996ffca5aeba227dfef240d2fb10 100644 (file)
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@ -158,6 +158,11 @@ std::string AST::type2str(AstNodeType type)
        X(AST_POSEDGE)
        X(AST_NEGEDGE)
        X(AST_EDGE)
+       X(AST_INTERFACE)
+       X(AST_INTERFACEPORT)
+       X(AST_INTERFACEPORTTYPE)
+       X(AST_MODPORT)
+       X(AST_MODPORTMEMBER)
        X(AST_PACKAGE)
 #undef X
        default:
@@ -1291,6 +1296,8 @@ void AST::explode_interface_port(AstNode *module_ast, RTLIL::Module * intfmodule
 // from AST. The interface members are copied into the AST module with the prefix of the interface.
 void AstModule::reprocess_module(RTLIL::Design *design, dict<RTLIL::IdString, RTLIL::Module*> local_interfaces)
 {
+       loadconfig();
+
        bool is_top = false;
        AstNode *new_ast = ast->clone();
        for (auto &intf : local_interfaces) {
@@ -1474,24 +1481,7 @@ std::string AstModule::derive_common(RTLIL::Design *design, dict<RTLIL::IdString
                stripped_name = stripped_name.substr(9);
 
        log_header(design, "Executing AST frontend in derive mode using pre-parsed AST for module `%s'.\n", stripped_name.c_str());
-
-       current_ast = NULL;
-       flag_dump_ast1 = false;
-       flag_dump_ast2 = false;
-       flag_dump_vlog1 = false;
-       flag_dump_vlog2 = false;
-       flag_nolatches = nolatches;
-       flag_nomeminit = nomeminit;
-       flag_nomem2reg = nomem2reg;
-       flag_mem2reg = mem2reg;
-       flag_noblackbox = noblackbox;
-       flag_lib = lib;
-       flag_nowb = nowb;
-       flag_noopt = noopt;
-       flag_icells = icells;
-       flag_pwires = pwires;
-       flag_autowire = autowire;
-       use_internal_line_num();
+       loadconfig();
 
        std::string para_info;
        AstNode *new_ast = ast->clone();
@@ -1572,6 +1562,27 @@ RTLIL::Module *AstModule::clone() const
        return new_mod;
 }
 
+void AstModule::loadconfig() const
+{
+       current_ast = NULL;
+       flag_dump_ast1 = false;
+       flag_dump_ast2 = false;
+       flag_dump_vlog1 = false;
+       flag_dump_vlog2 = false;
+       flag_nolatches = nolatches;
+       flag_nomeminit = nomeminit;
+       flag_nomem2reg = nomem2reg;
+       flag_mem2reg = mem2reg;
+       flag_noblackbox = noblackbox;
+       flag_lib = lib;
+       flag_nowb = nowb;
+       flag_noopt = noopt;
+       flag_icells = icells;
+       flag_pwires = pwires;
+       flag_autowire = autowire;
+       use_internal_line_num();
+}
+
 // internal dummy line number callbacks
 namespace {
        int internal_line_num;

diff --git a/frontends/ast/ast.h b/frontends/ast/ast.h
index 54b2fb31920bbfcda56938e00aee951a5945a35a..93fee913edeb4708973952ed222c17e99cdb67c8 100644 (file)
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@ -299,6 +299,7 @@ namespace AST
                std::string derive_common(RTLIL::Design *design, dict<RTLIL::IdString, RTLIL::Const> parameters, AstNode **new_ast_out, bool mayfail);
                void reprocess_module(RTLIL::Design *design, dict<RTLIL::IdString, RTLIL::Module *> local_interfaces) YS_OVERRIDE;
                RTLIL::Module *clone() const YS_OVERRIDE;
+               void loadconfig() const;
        };
 
        // this must be set by the language frontend before parsing the sources