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

always_comb and friends handle void functions similar to tasks 

Void functions can be used in always_comb, but since the compiler
uses the check_synth() method to generate some warnings, make sure
that function is implemented for functions as well as tasks.
This commit is contained in:
Stephen Williams 2022-02-27 08:56:30 -08:00
parent 85a4869ac3
commit 807fb2e5d1
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
elab_scope.cc
View File

@ -692,7 +692,8 @@ static void elaborate_scope_func(Design*des, NetScope*scope, PFunction*task)
if (debug_scopes) { if (debug_scopes) {
cerr << task->get_fileline() << ": elaborate_scope_func: " cerr << task->get_fileline() << ": elaborate_scope_func: "
<< "Elaborate task scope " << scope_path(task_scope) << endl; << "Elaborate function scope " << scope_path(task_scope)
<< endl;
} }
task->elaborate_scope(des, task_scope); task->elaborate_scope(des, task_scope);
@ -1589,7 +1590,7 @@ void PEvent::elaborate_scope(Design*, NetScope*scope) const
void PFunction::elaborate_scope(Design*des, NetScope*scope) const void PFunction::elaborate_scope(Design*des, NetScope*scope) const
{ {
assert(scope->type() == NetScope::FUNC); ivl_assert(*this, scope->type() == NetScope::FUNC);
// Save a reference to the pform representation of the function // Save a reference to the pform representation of the function
// in case we need to perform early elaboration. // in case we need to perform early elaboration.

17
netlist.cc
View File

@ -3502,7 +3502,14 @@ bool NetSTask::check_synth(ivl_process_type_t pr_type,
return false; return false;
} }
bool NetTaskDef::check_synth(ivl_process_type_t pr_type, /*
* This function is called to make sure the task/function can be used
* in a context where it must be synthesizable, such as in an always_comb
* or always_ff.
*
* If this is a function, then the function must be void.
*/
bool NetBaseDef::check_synth(ivl_process_type_t pr_type,
const NetScope* /* scope */) const const NetScope* /* scope */) const
{ {
bool result = false; bool result = false;
@ -3522,7 +3529,13 @@ bool NetTaskDef::check_synth(ivl_process_type_t pr_type,
bool NetUTask::check_synth(ivl_process_type_t pr_type, bool NetUTask::check_synth(ivl_process_type_t pr_type,
const NetScope* scope) const const NetScope* scope) const
{ {
return task()->task_def()->check_synth(pr_type, scope); const NetScope* task_scope = task();
if (task_scope->type() == NetScope::FUNC) {
// This can happen if this a void function.
return task_scope->func_def()->check_synth(pr_type, scope);
} else {
return task_scope->task_def()->check_synth(pr_type, scope);
}
} }
bool NetWhile::check_synth(ivl_process_type_t pr_type, bool NetWhile::check_synth(ivl_process_type_t pr_type,

3
netlist.h
View File

@ -867,6 +867,8 @@ class NetBaseDef {
//const string& name() const; //const string& name() const;
const NetProc*proc() const; const NetProc*proc() const;
virtual bool check_synth(ivl_process_type_t pr_type, const NetScope*scope) const;
private: private:
NetScope*scope_; NetScope*scope_;
std::vector<NetNet*>ports_; std::vector<NetNet*>ports_;
@ -3867,7 +3869,6 @@ class NetTaskDef : public NetBaseDef {
void dump(std::ostream&, unsigned) const; void dump(std::ostream&, unsigned) const;
DelayType delay_type(bool print_delay=false) const; DelayType delay_type(bool print_delay=false) const;
virtual bool check_synth(ivl_process_type_t pr_type, const NetScope*scope) const;
private: // not implemented private: // not implemented
NetTaskDef(const NetTaskDef&); NetTaskDef(const NetTaskDef&);