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

Merge pull request #2329 from antmicro/arrays-fix-multirange-size 

Rewrite multirange arrays sizes [n] as [n-1:0]
This commit is contained in:
clairexen 2020-09-17 18:27:05 +02:00 committed by GitHub
parent 9e937961dc 6e78f3a197
commit f176bd7778
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frontends/verilog/verilog_parser.y
View File

@ -210,14 +210,23 @@ static AstNode *checkRange(AstNode *type_node, AstNode *range_node)
return range_node; return range_node;
} }
static void rewriteAsMemoryNode(AstNode *node, AstNode *rangeNode) static void rewriteRange(AstNode *rangeNode)
{ {
node->type = AST_MEMORY;
if (rangeNode->type == AST_RANGE && rangeNode->children.size() == 1) { if (rangeNode->type == AST_RANGE && rangeNode->children.size() == 1) {
// SV array size [n], rewrite as [n-1:0] // SV array size [n], rewrite as [n-1:0]
rangeNode->children[0] = new AstNode(AST_SUB, rangeNode->children[0], AstNode::mkconst_int(1, true)); rangeNode->children[0] = new AstNode(AST_SUB, rangeNode->children[0], AstNode::mkconst_int(1, true));
rangeNode->children.push_back(AstNode::mkconst_int(0, false)); rangeNode->children.push_back(AstNode::mkconst_int(0, false));
} }
}
static void rewriteAsMemoryNode(AstNode *node, AstNode *rangeNode)
{
node->type = AST_MEMORY;
if (rangeNode->type == AST_MULTIRANGE) {
for (auto *itr : rangeNode->children)
rewriteRange(itr);
} else
rewriteRange(rangeNode);
node->children.push_back(rangeNode); node->children.push_back(rangeNode);
} }

16
tests/svtypes/multirange_array.sv Normal file
View File

@ -0,0 +1,16 @@
// test for multirange arrays
`define STRINGIFY(x) `"x`"
`define STATIC_ASSERT(x) if(!(x)) $error({"assert failed: ", `STRINGIFY(x)})
module top;
logic a [3];
logic b [3][5];
logic c [3][5][7];
`STATIC_ASSERT($bits(a) == 3);
`STATIC_ASSERT($bits(b) == 15);
`STATIC_ASSERT($bits(c) == 105);
endmodule