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

vhdlpp: Forward typedefs. 

It was required to make it possible to use typedefs in port types.
Types from packages are emitted in `ifdef..`endif instead of package..endpackage.

The purest solution is to keep package..endpackage and emit appropriate prefix.
Also, it would be great to have constants emitted in the same way.
This commit is contained in:
Maciej Suminski 2015-02-05 17:41:22 +01:00
parent 46c41f9be2
commit fc0728ab6f
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vhdlpp/architec_emit.cc
View File

@ -70,12 +70,12 @@ int Architecture::emit(ostream&out, Entity*entity)
// of the full definition.
typedef_context_t typedef_ctx;
for (map<perm_string,const VType*>::iterator cur = use_types_.begin()
; cur != use_types_.end() ; ++cur) {
//for (map<perm_string,const VType*>::iterator cur = use_types_.begin()
//; cur != use_types_.end() ; ++cur) {
if(const VTypeDef*def = dynamic_cast<const VTypeDef*>(cur->second))
errors += def->emit_typedef(out, typedef_ctx);
}
//if(const VTypeDef*def = dynamic_cast<const VTypeDef*>(cur->second))
//errors += def->emit_typedef(out, typedef_ctx);
//}
for (map<perm_string,const VType*>::iterator cur = cur_types_.begin()
; cur != cur_types_.end() ; ++cur) {

29
vhdlpp/package_emit.cc
View File

@ -32,26 +32,22 @@ int Package::emit_package(ostream&fd) const
if (cur_types_.empty() && cur_constants_.empty() && cur_subprograms_.empty())
return 0;
// If this package was imported from a library, then do not
// emit it again.
if (from_library_.str() != 0) {
fd << "/* Suppress package " << name()
<< " from library " << from_library_ << " */" << endl;
return 0;
}
int errors = 0;
fd << "package \\" << name() << " ;" << endl;
fd << "`ifndef package_" << name() << endl;
fd << "`define package_" << name() << endl;
// Only emit types that were defined within this package. Skip
// the types that were imported from elsewhere.
typedef_context_t typedef_ctx;
for (map<perm_string,const VType*>::const_iterator cur = cur_types_.begin()
; cur != cur_types_.end() ; ++ cur) {
fd << "typedef ";
errors += cur->second->emit_def(fd,
dynamic_cast<const VTypeDef*>(cur->second) ? empty_perm_string : cur->first);
fd << " ;" << endl;
if(const VTypeDef*def = dynamic_cast<const VTypeDef*>(cur->second))
errors += def->emit_typedef(fd, typedef_ctx);
//fd << "typedef ";
//errors += cur->second->emit_def(fd,
//dynamic_cast<const VTypeDef*>(cur->second) ? empty_perm_string : cur->first);
//fd << " ;" << endl;
}
//for (map<perm_string,struct const_t*>::const_iterator cur = use_constants_.begin()
@ -67,14 +63,19 @@ int Package::emit_package(ostream&fd) const
//fd << ";" << endl;
//}
fd << "package \\" << name() << " ;" << endl;
for (map<perm_string,Subprogram*>::const_iterator cur = cur_subprograms_.begin()
; cur != cur_subprograms_.end() ; ++ cur) {
// Do not emit unbounded functions, we will just need fixed instances later
if(!cur->second->unbounded())
errors += cur->second->emit_package(fd);
else
fd << "/* function " << cur->second->name() <<
" has to be instantiated, skipping */" << endl;
}
fd << "endpackage" << endl;
fd << "endpackage /* " << name() << " */" << endl;
fd << "`endif" << endl;
return errors;
}