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

More bugfixes in handling of parameters in tasks and functions

This commit is contained in:
Clifford Wolf 2015-11-12 13:02:36 +01:00
parent 34f2b84fb6
commit 7ae3d1b5a9
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontends/ast/simplify.cc
View File

@ -1773,6 +1773,7 @@ skip_dynamic_range_lvalue_expansion:;
size_t arg_count = 0; size_t arg_count = 0;
std::map<std::string, std::string> replace_rules; std::map<std::string, std::string> replace_rules;
vector<AstNode*> added_mod_children;
if (current_block == NULL) if (current_block == NULL)
{ {
@ -1873,9 +1874,13 @@ skip_dynamic_range_lvalue_expansion:;
wire->is_input = false; wire->is_input = false;
wire->is_output = false; wire->is_output = false;
current_ast_mod->children.push_back(wire); current_ast_mod->children.push_back(wire);
while (wire->simplify(true, false, false, 1, -1, false, false)) { } added_mod_children.push_back(wire);
if (child->type == AST_WIRE)
while (wire->simplify(true, false, false, 1, -1, false, false)) { }
replace_rules[child->str] = wire->str; replace_rules[child->str] = wire->str;
current_scope[wire->str] = wire;
if ((child->is_input || child->is_output) && arg_count < children.size()) if ((child->is_input || child->is_output) && arg_count < children.size())
{ {
@ -1895,6 +1900,11 @@ skip_dynamic_range_lvalue_expansion:;
} }
} }
for (auto child : added_mod_children) {
child->replace_ids(prefix, replace_rules);
while (child->simplify(true, false, false, 1, -1, false, false)) { }
}
for (auto child : decl->children) for (auto child : decl->children)
if (child->type != AST_WIRE && child->type != AST_PARAMETER && child->type != AST_LOCALPARAM) if (child->type != AST_WIRE && child->type != AST_PARAMETER && child->type != AST_LOCALPARAM)
{ {

13
tests/simple/task_func.v
View File

@ -83,8 +83,9 @@ endmodule
// ------------------------------------------------------------------- // -------------------------------------------------------------------
module task_func_test04(input [7:0] in, output [7:0] out1, out2, out3); module task_func_test04(input [7:0] in, output [7:0] out1, out2, out3, out4);
parameter p = 23; parameter p = 23;
parameter px = 42;
function [7:0] test1; function [7:0] test1;
input [7:0] i; input [7:0] i;
parameter p = 42; parameter p = 42;
@ -105,7 +106,17 @@ module task_func_test04(input [7:0] in, output [7:0] out1, out2, out3);
test3 = i + p; test3 = i + p;
end end
endfunction endfunction
function [7:0] test4;
input [7:0] i;
parameter px = p + 13;
parameter p3 = px - 37;
parameter p4 = p3 ^ px;
begin
test4 = i + p4;
end
endfunction
assign out1 = test1(in); assign out1 = test1(in);
assign out2 = test2(in); assign out2 = test2(in);
assign out3 = test3(in); assign out3 = test3(in);
assign out4 = test4(in);
endmodule endmodule