riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ast: make design available to process_module()

This commit is contained in:
Zachary Snow 2021-03-23 12:49:11 -04:00 committed by Zachary Snow
parent 192601385f
commit c58bb1d2e1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontends/ast/ast.cc
View File

@ -980,8 +980,8 @@ static bool param_has_no_default(const AstNode *param) {
(children.size() == 1 && children[0]->type == AST_RANGE); (children.size() == 1 && children[0]->type == AST_RANGE);
} }
// create a new AstModule from an AST_MODULE AST node // create and add a new AstModule from an AST_MODULE AST node
static AstModule* process_module(AstNode *ast, bool defer, AstNode *original_ast = NULL, bool quiet = false) static void process_module(RTLIL::Design *design, AstNode *ast, bool defer, AstNode *original_ast = NULL, bool quiet = false)
{ {
log_assert(current_scope.empty()); log_assert(current_scope.empty());
log_assert(ast->type == AST_MODULE || ast->type == AST_INTERFACE); log_assert(ast->type == AST_MODULE || ast->type == AST_INTERFACE);
@ -1039,6 +1039,7 @@ static AstModule* process_module(AstNode *ast, bool defer, AstNode *original_ast
} }
} }
// TODO(zachjs): make design available to simplify() in the future
while (ast->simplify(!flag_noopt, false, false, 0, -1, false, false)) { } while (ast->simplify(!flag_noopt, false, false, 0, -1, false, false)) { }
if (flag_dump_ast2) { if (flag_dump_ast2) {
@ -1190,7 +1191,7 @@ static AstModule* process_module(AstNode *ast, bool defer, AstNode *original_ast
log("--- END OF RTLIL DUMP ---\n"); log("--- END OF RTLIL DUMP ---\n");
} }
return current_module; design->add(current_module);
} }
// create AstModule instances for all modules in the AST tree and add them to 'design' // create AstModule instances for all modules in the AST tree and add them to 'design'
@ -1275,7 +1276,7 @@ void AST::process(RTLIL::Design *design, AstNode *ast, bool dump_ast1, bool dump
} }
} }
design->add(process_module(*it, defer_local)); process_module(design, *it, defer_local);
current_ast_mod = nullptr; current_ast_mod = nullptr;
} }
else if ((*it)->type == AST_PACKAGE) { else if ((*it)->type == AST_PACKAGE) {
@ -1456,9 +1457,8 @@ void AstModule::reprocess_module(RTLIL::Design *design, const dict<RTLIL::IdStri
} }
// Generate RTLIL from AST for the new module and add to the design: // Generate RTLIL from AST for the new module and add to the design:
AstModule *newmod = process_module(new_ast, false, ast_before_replacing_interface_ports); process_module(design, new_ast, false, ast_before_replacing_interface_ports);
delete(new_ast); delete(new_ast);
design->add(newmod);
RTLIL::Module* mod = design->module(original_name); RTLIL::Module* mod = design->module(original_name);
if (is_top) if (is_top)
mod->set_bool_attribute(ID::top); mod->set_bool_attribute(ID::top);
@ -1514,7 +1514,7 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdStr
explode_interface_port(new_ast, intfmodule, intfname, modport); explode_interface_port(new_ast, intfmodule, intfname, modport);
} }
design->add(process_module(new_ast, false)); process_module(design, new_ast, false);
design->module(modname)->check(); design->module(modname)->check();
RTLIL::Module* mod = design->module(modname); RTLIL::Module* mod = design->module(modname);
@ -1565,7 +1565,7 @@ RTLIL::IdString AstModule::derive(RTLIL::Design *design, const dict<RTLIL::IdStr
if (!design->has(modname)) { if (!design->has(modname)) {
new_ast->str = modname; new_ast->str = modname;
design->add(process_module(new_ast, false, NULL, quiet)); process_module(design, new_ast, false, NULL, quiet);
design->module(modname)->check(); design->module(modname)->check();
} else if (!quiet) { } else if (!quiet) {
log("Found cached RTLIL representation for module `%s'.\n", modname.c_str()); log("Found cached RTLIL representation for module `%s'.\n", modname.c_str());