diff options
| author | Clifford Wolf <clifford@clifford.at> | 2014-01-30 14:52:46 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-01-30 15:01:28 +0100 |
| commit | 4df7e03ec9eafb01e2237f307075ad8dd7b1da5a (patch) | |
| tree | 197473eb2bad85ba11f6d28540c77570604cb275 | |
| parent | 672229eda5ba9768a0d67223a514d54dfef5534c (diff) | |
| download | yosys-4df7e03ec9eafb01e2237f307075ad8dd7b1da5a.tar.gz yosys-4df7e03ec9eafb01e2237f307075ad8dd7b1da5a.tar.bz2 yosys-4df7e03ec9eafb01e2237f307075ad8dd7b1da5a.zip | |
Bugfix in name resolution with generate blocks
| -rw-r--r-- | frontends/ast/simplify.cc | 2 | ||||
| -rw-r--r-- | tests/simple/carryadd.v | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index bd5da14e3..5a2d1ae6c 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -1478,7 +1478,7 @@ void AstNode::expand_genblock(std::string index_var, std::string prefix, std::ma for (size_t i = 0; i < children.size(); i++) { AstNode *child = children[i]; - if (child->type != AST_FUNCTION && child->type != AST_TASK) + if (child->type != AST_FUNCTION && child->type != AST_TASK && child->type != AST_PREFIX) child->expand_genblock(index_var, prefix, name_map); } diff --git a/tests/simple/carryadd.v b/tests/simple/carryadd.v new file mode 100644 index 000000000..4f777f790 --- /dev/null +++ b/tests/simple/carryadd.v @@ -0,0 +1,24 @@ +module carryadd(a, b, y); + +parameter WIDTH = 8; + +input [WIDTH-1:0] a, b; +output [WIDTH-1:0] y; + +genvar i; +generate + for (i = 0; i < WIDTH; i = i+1) begin:STAGE + wire IN1 = a[i], IN2 = b[i]; + wire C, Y; + if (i == 0) + assign C = IN1 & IN2, Y = IN1 ^ IN2; + else + assign C = (IN1 & IN2) | ((IN1 | IN2) & STAGE[i-1].C), + Y = IN1 ^ IN2 ^ STAGE[i-1].C; + assign y[i] = Y; + end +endgenerate + +// assert property (y == a + b); + +endmodule |