luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #770 from larsclausen/vlog95-localparam 

tgt-vlog95: Consider scopes with only localparams as unique
This commit is contained in:
Stephen Williams 2022-09-18 09:04:39 -07:00 committed by GitHub
parent b0b0b84815 6ea7763c31
commit fd69d4e09c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t-dll.cc
View File

@ -507,7 +507,8 @@ void dll_target::make_scope_parameters(ivl_scope_t scop, const NetScope*net)
assert(idx < scop->param.size()); assert(idx < scop->param.size());
ivl_parameter_t cur_par = &scop->param[idx]; ivl_parameter_t cur_par = &scop->param[idx];
cur_par->basename = cur_pit->first; cur_par->basename = cur_pit->first;
cur_par->local = cur_pit->second.local_flag; cur_par->local = cur_pit->second.local_flag ||
!cur_pit->second.overridable;
calculate_param_range(cur_pit->second, calculate_param_range(cur_pit->second,
cur_pit->second.ivl_type, cur_pit->second.ivl_type,
cur_par->msb, cur_par->lsb, cur_par->msb, cur_par->lsb,

24
tgt-vlog95/scope.c
View File

@ -253,13 +253,27 @@ static void emit_net_def(ivl_scope_t scope, ivl_signal_t sig)
} }
} }
static bool scope_is_unique(ivl_scope_t scope)
{
unsigned int count = ivl_scope_params(scope);
for (unsigned int idx = 0; idx < count; idx++) {
ivl_parameter_t par = ivl_scope_param(scope, idx);
if (!ivl_parameter_local(par)) {
return false;
}
}
return true;
}
static void emit_mangled_name(ivl_scope_t scope, unsigned root) static void emit_mangled_name(ivl_scope_t scope, unsigned root)
{ {
/* If the module has parameters and it's not a root module then it /* If the module has non-local parameters and it's not a root module then it
* may not be unique so we create a mangled name version instead. * may not be unique so we create a mangled name version instead. The
* The mangled name is of the form: * mangled name is of the form:
* <module_name>[<full_instance_scope>]. */ * <module_name>[<full_instance_scope>]. */
if (ivl_scope_params(scope) && ! root) { if (!root && !scope_is_unique(scope)) {
char *name; char *name;
size_t len = strlen(ivl_scope_name(scope)) + size_t len = strlen(ivl_scope_name(scope)) +
strlen(ivl_scope_tname(scope)) + 3; strlen(ivl_scope_tname(scope)) + 3;
@ -1244,7 +1258,7 @@ int emit_scope(ivl_scope_t scope, ivl_scope_t parent)
(void) emit_scope(scope_to_emit, 0); (void) emit_scope(scope_to_emit, 0);
/* If we used a mangled name then the instance is /* If we used a mangled name then the instance is
* unique so don't add it to the list. */ * unique so don't add it to the list. */
if (ivl_scope_params(scope_to_emit)) continue; if (!scope_is_unique(scope_to_emit)) continue;
add_scope_to_list(scope_to_emit); add_scope_to_list(scope_to_emit);
} }
free(scopes_to_emit); free(scopes_to_emit);