Skip to content

SystemVerilog: declarations in named blocks in tasks/functions #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

SystemVerilog: declarations in named blocks in tasks/functions #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion regression/verilog/functioncall/named_block1.desc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KNOWNBUG
CORE
named_block1.sv

^\[.*\] always main\.foo\(\) == 123: PROVED$
Expand Down
35 changes: 22 additions & 13 deletions src/verilog/verilog_typecheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,11 @@ void verilog_typecheckt::convert_function_or_task(verilog_declt &decl)
{
irep_idt decl_class=decl.get_class();

const std::string identifier=
id2string(module_identifier)+"."+
id2string(decl.get_identifier());
// the base name of the function/task
auto base_name = decl.get_identifier();

const std::string identifier =
id2string(module_identifier) + "." + id2string(base_name);

auto result=symbol_table.get_writeable(identifier);

Expand All @@ -292,11 +294,18 @@ void verilog_typecheckt::convert_function_or_task(verilog_declt &decl)

function_or_task_name = symbol.name;

// function/tasks have an implicit named block with the name
// of the function

named_blocks.push_back(id2string(base_name) + ".");

for(auto &inner_decl : decl.declarations())
convert_decl(inner_decl);

convert_statement(decl.body());

named_blocks.pop_back();

function_or_task_name="";

symbol.value=decl.body();
Expand Down Expand Up @@ -336,6 +345,11 @@ exprt verilog_typecheckt::elaborate_constant_function_call(

function_or_task_name = function_symbol.name;

// function/tasks have an implicit named block with the name
// of the function

named_blocks.push_back(id2string(function_symbol.base_name) + ".");

for(auto &inner_decl : decl.declarations())
convert_decl(inner_decl);

Expand Down Expand Up @@ -380,6 +394,8 @@ exprt verilog_typecheckt::elaborate_constant_function_call(
// interpret it
verilog_interpreter(decl.body());

named_blocks.pop_back();

function_or_task_name="";

// get return value
Expand Down Expand Up @@ -429,16 +445,9 @@ void verilog_typecheckt::convert_decl(verilog_declt &decl)
named_block = named_blocks.back();

// fix the type and identifier
irep_idt full_identifier;

if(!function_or_task_name.empty())
full_identifier = id2string(function_or_task_name) + "." +
id2string(named_block) +
id2string(declarator.base_name());
else
full_identifier = id2string(module_identifier) + "." +
id2string(named_block) +
id2string(declarator.base_name());
auto full_identifier = id2string(module_identifier) + "." +
id2string(named_block) +
id2string(declarator.base_name());

symbolt &symbol = symbol_table_lookup(full_identifier);
declarator.type() = symbol.type;
Expand Down
20 changes: 3 additions & 17 deletions src/verilog/verilog_typecheck_expr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,24 +1149,10 @@ exprt verilog_typecheck_exprt::convert_symbol(
{
const irep_idt &identifier = expr.get_identifier();

std::string full_identifier;

// in a task or function? Try local ones first
if(function_or_task_name!="")
{
full_identifier=
id2string(function_or_task_name)+
"."+id2string(identifier);

const symbolt *symbol;
if(!ns.lookup(full_identifier, symbol))
{ // found!
expr.type()=symbol->type;
expr.set_identifier(full_identifier);
return std::move(expr);
}
}

DATA_INVARIANT(!named_blocks.empty(), "must have named block");

std::string full_identifier;
std::string named_block;

// try named blocks, beginning with inner one
Expand Down
Loading