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

Merge branch 'master' of github.com:steveicarus/iverilog

This commit is contained in:
Cary R 2012-12-18 11:10:46 -08:00
parent 3fa7b3f05a 3ab3828aaf
commit c104586760
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
elab_net.cc
View File

@ -490,7 +490,7 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
// (NetNet). We also know that sig is struct_type(), so // (NetNet). We also know that sig is struct_type(), so
// look for a method named method_name. // look for a method named method_name.
if (debug_elaborate) if (debug_elaborate)
cerr << get_fileline() << ": debug: " cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
<< "Signal " << sig->name() << " is a structure, " << "Signal " << sig->name() << " is a structure, "
<< "try to match member " << method_name << endl; << "try to match member " << method_name << endl;
@ -498,6 +498,14 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
const struct netstruct_t::member_t*member = struct_type->packed_member(method_name, member_off); const struct netstruct_t::member_t*member = struct_type->packed_member(method_name, member_off);
ivl_assert(*this, member); ivl_assert(*this, member);
if (debug_elaborate) {
cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
<< "Member " << method_name
<< " has packed dimensions " << member->packed_dims << "." << endl;
cerr << get_fileline() << ": : "
<< "Tail name has " << path_tail.index.size() << " indices." << endl;
}
// Rewrite a member select of a packed structure as a // Rewrite a member select of a packed structure as a
// part select of the base variable. // part select of the base variable.
lidx = member_off; lidx = member_off;
@ -540,6 +548,25 @@ NetNet* PEIdent::elaborate_lnet_common_(Design*des, NetScope*scope,
// Currently, only support const dimensions here. // Currently, only support const dimensions here.
ivl_assert(*this, packed_base == 0); ivl_assert(*this, packed_base == 0);
// Now the lidx/midx values get us to the member. Next
// up, deal with bit/part selects from the member
// itself.
ivl_assert(*this, member->packed_dims.size() <= 1);
ivl_assert(*this, path_tail.index.size() <= 1);
if (path_tail.index.size() > 0) {
long tmp_off;
unsigned long tmp_wid;
const index_component_t&tail_sel = path_tail.index.back();
ivl_assert(*this, tail_sel.sel == index_component_t::SEL_PART || tail_sel.sel == index_component_t::SEL_BIT);
bool rc = calculate_part(this, des, scope, tail_sel, tmp_off, tmp_wid);
ivl_assert(*this, rc);
if (debug_elaborate)
cerr << get_fileline() << ": PEIdent::elaborate_lnet_common_: "
<< "tmp_off=" << tmp_off << ", tmp_wid=" << tmp_wid << endl;
lidx += tmp_off;
midx = lidx + tmp_wid - 1;
}
} else if (sig->unpacked_dimensions() > 0) { } else if (sig->unpacked_dimensions() > 0) {
// Make sure there are enough indices to address an array element. // Make sure there are enough indices to address an array element.

4
netmisc.h
View File

@ -95,6 +95,10 @@ extern NetExpr*condition_reduce(NetExpr*expr);
*/ */
extern NetNet*crop_to_width(Design*des, NetNet*n, unsigned w); extern NetNet*crop_to_width(Design*des, NetNet*n, unsigned w);
extern bool calculate_part(const LineInfo*li, Design*des, NetScope*scope,
const index_component_t&index,
long&off, unsigned long&wid);
/* /*
* These functions generate an equation to normalize an expression using * These functions generate an equation to normalize an expression using
* the provided vector/array information. * the provided vector/array information.