mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-13 04:28:18 +00:00
Code Activity

verilog: check entire user type stack for type definition

Browse source
This commit is contained in:
Xiretza 2021-03-18 21:53:02 +01:00 committed by Zachary Snow
parent 4f4e70876f
commit 92d5550a90
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frontends/verilog/verilog_parser.y
View file

@ -163,12 +163,18 @@ static bool isInLocalScope(const std::string *name)
static AstNode *getTypeDefinitionNode(std::string type_name) static AstNode *getTypeDefinitionNode(std::string type_name)
{ {
// return the definition nodes from the typedef statement // check current scope then outer scopes for a name
auto user_types = user_type_stack.back(); for (auto it = user_type_stack.rbegin(); it != user_type_stack.rend(); ++it) {
log_assert(user_types->count(type_name) > 0); if ((*it)->count(type_name) > 0) {
auto typedef_node = (*user_types)[type_name]; // return the definition nodes from the typedef statement
log_assert(typedef_node->type == AST_TYPEDEF); auto typedef_node = (**it)[type_name];
return typedef_node->children[0]; log_assert(typedef_node->type == AST_TYPEDEF);
return typedef_node->children[0];
}
}
// The lexer recognized the name as a TOK_USER_TYPE, but now we can't find it anymore?
log_error("typedef for user type `%s' not found", type_name.c_str());
} }
static AstNode *copyTypeDefinition(std::string type_name) static AstNode *copyTypeDefinition(std::string type_name)

10
tests/svtypes/typedef_scopes.sv
View file

@ -4,6 +4,7 @@ typedef enum logic {s0, s1} outer_enum_t;
module top; module top;
// globals are inherited
outer_uint4_t u4_i = 8'hA5; outer_uint4_t u4_i = 8'hA5;
outer_enum_t enum4_i = s0; outer_enum_t enum4_i = s0;
always @(*) assert(u4_i == 4'h5); always @(*) assert(u4_i == 4'h5);
@ -17,13 +18,22 @@ module top;
always @(*) assert(inner_enum1 == 3'h3); always @(*) assert(inner_enum1 == 3'h3);
if (1) begin: genblock if (1) begin: genblock
// type declarations in child scopes shadow their parents
typedef logic [7:0] inner_type; typedef logic [7:0] inner_type;
parameter inner_type inner_const = 8'hA5; parameter inner_type inner_const = 8'hA5;
typedef enum logic [2:0] {s5=5, s6, s7} inner_enum_t; typedef enum logic [2:0] {s5=5, s6, s7} inner_enum_t;
inner_type inner_gb_i = inner_const; //8'hA5; inner_type inner_gb_i = inner_const; //8'hA5;
inner_enum_t inner_gb_enum1 = s7; inner_enum_t inner_gb_enum1 = s7;
always @(*) assert(inner_gb_i == 8'hA5); always @(*) assert(inner_gb_i == 8'hA5);
always @(*) assert(inner_gb_enum1 == 3'h7); always @(*) assert(inner_gb_enum1 == 3'h7);
// check that copying of struct member types works over multiple type scopes
typedef struct packed {
outer_uint4_t x;
} mystruct_t;
mystruct_t mystruct;
always @(*) assert($bits(mystruct) == 4);
end end
inner_type inner_i2 = 8'h42; inner_type inner_i2 = 8'h42;