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

Remove excess evaluate_parameters method calls.

This commit is contained in:
Stephen Williams 2012-05-18 08:07:27 -07:00
parent 84f14dbc81
commit 2d0c786bfb
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
elaborate.cc
View File

@ -4695,6 +4695,9 @@ class top_defparams : public elaborator_work_item_t {
virtual void elaborate_runrun()
{
if (debug_scopes) {
cerr << "debug: top_defparams::elaborate_runrun()" << endl;
}
// This method recurses through the scopes, looking for
// defparam assignments to apply to the parameters in the
// various scopes. This needs to be done after all the scopes
@ -4706,6 +4709,10 @@ class top_defparams : public elaborator_work_item_t {
// scopes and evaluate the parameters all the way down to
// constants.
des->evaluate_parameters();
if (debug_scopes) {
cerr << "debug: top_defparams::elaborate_runrun() done" << endl;
}
}
};
@ -4719,6 +4726,10 @@ class later_defparams : public elaborator_work_item_t {
virtual void elaborate_runrun()
{
if (debug_scopes) {
cerr << "debug: later_defparams::elaborate_runrun()" << endl;
}
list<NetScope*>tmp_list;
for (set<NetScope*>::iterator cur = des->defparams_later.begin()
; cur != des->defparams_later.end() ; ++ cur )
@ -4731,7 +4742,13 @@ class later_defparams : public elaborator_work_item_t {
tmp_list.pop_front();
cur->run_defparams_later(des);
}
des->evaluate_parameters();
// The overridden parameters will be evaluated later in
// a top_defparams work item.
if (debug_scopes) {
cerr << "debuf: later_defparams::elaborate_runrun() done" << endl;
}
}
};

8
net_design.cc
View File

@ -303,11 +303,9 @@ void NetScope::run_defparams_later(Design*des)
target_scopes.insert(targ_scope);
}
// All the scopes that this defparam set touched should have
// their parameters re-evaluated.
for (set<NetScope*>::iterator cur = target_scopes.begin()
; cur != target_scopes.end() ; ++ cur )
(*cur)->evaluate_parameters(des);
// The scopes that this defparam set touched will be
// re-evaluated later it a top_defparams work item. So do not
// do the evaluation now.
// If there are some scopes that still have missing scopes,
// then save them back into the defparams_later list for a