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

Check for all cases of currently unsupported array dimensions in packed structs

This commit is contained in:
Dag Lem 2022-11-30 20:04:45 +01:00
parent a460e0b31c
commit 15c8e74329
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
frontends/ast/simplify.cc
View File

@ -273,9 +273,9 @@ static int range_width(AstNode *node, AstNode *rnode)
return rnode->range_left - rnode->range_right + 1; return rnode->range_left - rnode->range_right + 1;
} }
[[noreturn]] static void struct_array_packing_error(AstNode *node) [[noreturn]] static void struct_array_dimension_error(AstNode *node)
{ {
log_file_error(node->filename, node->location.first_line, "Unpacked array in packed struct/union member %s\n", node->str.c_str()); log_file_error(node->filename, node->location.first_line, "Currently limited to two dimensions in packed struct/union member %s\n", node->str.c_str());
} }
static void save_struct_array_width(AstNode *node, int width) static void save_struct_array_width(AstNode *node, int width)
@ -324,10 +324,12 @@ static int size_packed_struct(AstNode *snode, int base_offset)
// member width e.g. bit [7:0] a // member width e.g. bit [7:0] a
width = range_width(node, node->children[0]); width = range_width(node, node->children[0]);
if (node->children.size() == 2) { if (node->children.size() == 2) {
// Unpacked array. Note that this is a Yosys extension; only packed data types
// and integer data types are allowed in packed structs / unions in SystemVerilog.
if (node->children[1]->type == AST_RANGE) { if (node->children[1]->type == AST_RANGE) {
// unpacked array e.g. bit [63:0] a [0:3] // Unpacked array, e.g. bit [63:0] a [0:3]
auto rnode = node->children[1]; auto rnode = node->children[1];
// C-type array size e.g. bit [63:0] a [4] // C-style array size, e.g. bit [63:0] a [4]
bool c_type = rnode->children.size() == 1; bool c_type = rnode->children.size() == 1;
int array_count = c_type ? rnode->range_left : range_width(node, rnode); int array_count = c_type ? rnode->range_left : range_width(node, rnode);
save_struct_array_width(node, array_count); save_struct_array_width(node, array_count);
@ -337,10 +339,11 @@ static int size_packed_struct(AstNode *snode, int base_offset)
width *= array_count; width *= array_count;
} }
else { else {
// array element must be single bit for a packed array // Currently limited to at most two dimensions.
struct_array_packing_error(node); struct_array_dimension_error(node);
} }
} else { } else {
// Vector.
save_struct_array_width(node, width); save_struct_array_width(node, width);
save_struct_range_swapped(node, node->children[0]->range_swapped); save_struct_range_swapped(node, node->children[0]->range_swapped);
} }
@ -349,12 +352,12 @@ static int size_packed_struct(AstNode *snode, int base_offset)
delete child; delete child;
node->children.clear(); node->children.clear();
} }
else if (node->children.size() == 1 && node->children[0]->type == AST_MULTIRANGE) { else if (node->children.size() > 0 && node->children[0]->type == AST_MULTIRANGE) {
// packed 2D array, e.g. bit [3:0][63:0] a // packed 2D array, e.g. bit [3:0][63:0] a
auto rnode = node->children[0]; auto rnode = node->children[0];
if (rnode->children.size() != 2) { if (node->children.size() != 1 || rnode->children.size() != 2) {
// packed arrays can only be 2D // Currently limited to at most two dimensions.
struct_array_packing_error(node); struct_array_dimension_error(node);
} }
int array_count = range_width(node, rnode->children[0]); int array_count = range_width(node, rnode->children[0]);
save_struct_array_width(node, array_count); save_struct_array_width(node, array_count);