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

vhdlpp: VTypeArray emits dimensions in a bit smarter way.

This commit is contained in:
Maciej Suminski 2015-01-19 17:33:15 +01:00
parent e6b22a2bea
commit b05a19dffc
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vhdlpp/vtype.h
View File

@ -215,11 +215,12 @@ class VTypeArray : public VType {
int emit_def(std::ostream&out, perm_string name) const; int emit_def(std::ostream&out, perm_string name) const;
int emit_typedef(std::ostream&out, typedef_context_t&ctx) const; int emit_typedef(std::ostream&out, typedef_context_t&ctx) const;
int emit_dimensions(std::ostream&out) const;
bool can_be_packed() const { return etype_->can_be_packed(); } bool can_be_packed() const { return etype_->can_be_packed(); }
private: private:
int emit_with_dims_(std::ostream&out, bool packed, perm_string name) const;
void write_range_to_stream_(std::ostream&fd) const; void write_range_to_stream_(std::ostream&fd) const;
const VType*etype_; const VType*etype_;

43
vhdlpp/vtype_emit.cc
View File

@ -59,9 +59,7 @@ int VTypeERROR::emit_def(ostream&out, perm_string) const
int VTypeArray::emit_def(ostream&out, perm_string name) const int VTypeArray::emit_def(ostream&out, perm_string name) const
{ {
int errors = 0; int errors = 0;
const VType*raw_base = basic_type(); const VType*raw_base = basic_type();
const VTypePrimitive*base = dynamic_cast<const VTypePrimitive*> (raw_base); const VTypePrimitive*base = dynamic_cast<const VTypePrimitive*> (raw_base);
if (base) { if (base) {
@ -74,13 +72,7 @@ int VTypeArray::emit_def(ostream&out, perm_string name) const
raw_base->emit_def(out, empty_perm_string); raw_base->emit_def(out, empty_perm_string);
} }
if(raw_base->can_be_packed()) { errors += emit_with_dims_(out, raw_base->can_be_packed(), name);
errors += emit_dimensions(out);
emit_name(out, name);
} else {
emit_name(out, name);
errors += emit_dimensions(out);
}
return errors; return errors;
} }
@ -90,7 +82,7 @@ int VTypeArray::emit_typedef(std::ostream&out, typedef_context_t&ctx) const
return etype_->emit_typedef(out, ctx); return etype_->emit_typedef(out, ctx);
} }
int VTypeArray::emit_dimensions(std::ostream&out) const int VTypeArray::emit_with_dims_(std::ostream&out, bool packed, perm_string name) const
{ {
int errors = 0; int errors = 0;
@ -102,18 +94,35 @@ int VTypeArray::emit_dimensions(std::ostream&out) const
} }
dims.push_back(cur); dims.push_back(cur);
bool name_emitted = false;
while (! dims.empty()) { while (! dims.empty()) {
cur = dims.front(); cur = dims.front();
dims.pop_front(); dims.pop_front();
out << "["; if(!packed) {
if (cur->dimension(0).msb() && cur->dimension(0).lsb()) { emit_name(out, name);
// bounded array, unbounded arrays have msb() & lsb() nullified name_emitted = true;
errors += cur->dimension(0).msb()->emit(out, 0, 0);
out << ":";
errors += cur->dimension(0).lsb()->emit(out, 0, 0);
} }
out << "]";
for(unsigned i = 0; i < cur->dimensions(); ++i) {
if(cur->dimension(i).is_box() && !name_emitted) {
emit_name(out, name);
name_emitted = true;
}
out << "[";
if (!cur->dimension(i).is_box()) { // if not unbounded {
errors += cur->dimension(i).msb()->emit(out, 0, 0);
out << ":";
errors += cur->dimension(i).lsb()->emit(out, 0, 0);
}
out << "]";
}
}
if(!name_emitted) {
emit_name(out, name);
} }
return errors; return errors;