Fixed build problem and adapted visibility in generated code

This commit is contained in:
Eyck Jentzsch 2017-10-03 15:52:48 +02:00
parent 8a4469923a
commit f950322d05
3 changed files with 4 additions and 6 deletions

View File

@ -3,5 +3,6 @@ source.. = src/,\
xtend-gen/ xtend-gen/
bin.includes = .,\ bin.includes = .,\
META-INF/,\ META-INF/,\
plugin.xml plugin.xml,\
icons/
bin.excludes = **/*.xtend bin.excludes = **/*.xtend

View File

@ -66,7 +66,7 @@ class RegfileGenerator extends RdlBaseGenerator{
public sc_core::sc_module, public sc_core::sc_module,
public sysc::resetable public sysc::resetable
{ {
protected: public:
// storage declarations // storage declarations
«FOR cdef : componentDefinition.componentDefinitions» «FOR cdef : componentDefinition.componentDefinitions»
«IF cdef.type == ComponentDefinitionType.REG» «IF cdef.type == ComponentDefinitionType.REG»
@ -119,7 +119,6 @@ class RegfileGenerator extends RdlBaseGenerator{
«ENDFOR» «ENDFOR»
«ENDFOR» «ENDFOR»
public:
«componentDefinition.name»(sc_core::sc_module_name nm); «componentDefinition.name»(sc_core::sc_module_name nm);
template<unsigned BUSWIDTH=32> template<unsigned BUSWIDTH=32>

View File

@ -138,7 +138,7 @@ public class RegfileGenerator extends RdlBaseGenerator {
_builder.newLine(); _builder.newLine();
_builder.append("{"); _builder.append("{");
_builder.newLine(); _builder.newLine();
_builder.append("protected:"); _builder.append("public:");
_builder.newLine(); _builder.newLine();
_builder.append(" "); _builder.append(" ");
_builder.append("// storage declarations"); _builder.append("// storage declarations");
@ -384,8 +384,6 @@ public class RegfileGenerator extends RdlBaseGenerator {
} }
_builder.append(" "); _builder.append(" ");
_builder.newLine(); _builder.newLine();
_builder.append("public:");
_builder.newLine();
_builder.append(" "); _builder.append(" ");
String _name_8 = this.componentDefinition.getName(); String _name_8 = this.componentDefinition.getName();
_builder.append(_name_8, " "); _builder.append(_name_8, " ");