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

Fix for GitHub issue #104 - assigning hierarchical signal from top level task. 

When emitting a design, all scopes must be emitted before emitting any
top level task/function/method definitions, otherwise hierarchical
references can't always be resolved.

(cherry picked from commit 2bc42fc6e2)
This commit is contained in:
Martin Whitaker 2016-07-26 21:40:27 +01:00
parent d6d50e9b68
commit 4066031add
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emit.cc
View File

@ -507,7 +507,6 @@ int Design::emit(struct target_t*tgt) const
for (map<NetScope*,PTaskFunc*>::const_iterator scope = root_tasks_.begin() for (map<NetScope*,PTaskFunc*>::const_iterator scope = root_tasks_.begin()
; scope != root_tasks_.end() ; ++ scope) { ; scope != root_tasks_.end() ; ++ scope) {
scope->first->emit_scope(tgt); scope->first->emit_scope(tgt);
scope->first->emit_defs(tgt);
} }
// enumerate package scopes // enumerate package scopes
@ -521,7 +520,6 @@ int Design::emit(struct target_t*tgt) const
const NetScope*use_scope = cur->second->class_scope(); const NetScope*use_scope = cur->second->class_scope();
cur->second->emit_scope(tgt); cur->second->emit_scope(tgt);
tgt->class_type(use_scope, cur->second); tgt->class_type(use_scope, cur->second);
cur->second->emit_defs(tgt);
} }
// enumerate root scopes // enumerate root scopes
@ -548,6 +546,12 @@ int Design::emit(struct target_t*tgt) const
// emit task and function definitions // emit task and function definitions
bool tasks_rc = true; bool tasks_rc = true;
for (map<NetScope*,PTaskFunc*>::const_iterator scope = root_tasks_.begin()
; scope != root_tasks_.end() ; ++ scope)
tasks_rc &= scope->first->emit_defs(tgt);
for (map<perm_string,netclass_t*>::const_iterator cur = classes_.begin()
; cur != classes_.end() ; ++cur)
tasks_rc &= cur->second->emit_defs(tgt);
for (map<perm_string,NetScope*>::const_iterator scope = packages_.begin() for (map<perm_string,NetScope*>::const_iterator scope = packages_.begin()
; scope != packages_.end() ; ++ scope ) ; scope != packages_.end() ; ++ scope )
tasks_rc &= scope->second->emit_defs(tgt); tasks_rc &= scope->second->emit_defs(tgt);