Skip to content
Snippets Groups Projects
Commit 7961b7ed authored by Daniela Genius's avatar Daniela Genius
Browse files

bugfixes SystemC AMS topcell generatiobugfixes SystemC AMS topcell generationn

parent 227ff242
No related branches found
No related tags found
2 merge requests!255New lip6,!253New lip6
Hide whitespace changes
Inline Side-by-side
src/main/java/syscamstranslator/toSysCAMS/ClusterCode.java
+ 10
− 7
View file @ 7961b7ed
...@@ -109,8 +109,9 @@ public class ClusterCode { ...@@ -109,8 +109,9 @@ public class ClusterCode {
} }
else{ else{
corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortConverter) c.get_p1().getComponent()).getConvType()+ "<"+ ((SysCAMSTPortConverter) c.get_p1().getComponent()).getNbits()+"> " + "> " // corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortConverter) c.get_p1().getComponent()).getConvType()+ "<"+ ((SysCAMSTPortConverter) c.get_p1().getComponent()).getNbits()+"> " + "> "
+ c.getName() + ";" + CR; corpsCluster = corpsCluster + "\tsc_core::sc_signal<" + ((SysCAMSTPortConverter) c.get_p1().getComponent()).getConvType()+ "<"+ ((SysCAMSTPortConverter) c.get_p1().getComponent()).getNbits()+"> " + "> "
+ c.getName() + ";" + CR; //DG 18.10.
names.add(c.getName()); names.add(c.getName());
} }
...@@ -125,14 +126,15 @@ public class ClusterCode { ...@@ -125,14 +126,15 @@ public class ClusterCode {
} else { } else {
if( ((SysCAMSTPortConverter) c.get_p2().getComponent()).getNbits()==0 ) if( ((SysCAMSTPortConverter) c.get_p2().getComponent()).getNbits()==0 )
{ {
corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortConverter) c.get_p2().getComponent()).getConvType() + "> " // corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortConverter) c.get_p2().getComponent()).getConvType() + "> " + c.getName() + ";" + CR;
+ c.getName() + ";" + CR; corpsCluster = corpsCluster + "\tsc_core::sc_signal<" + ((SysCAMSTPortConverter) c.get_p2().getComponent()).getConvType() + "> " + c.getName() + ";" + CR; //DG 18.10.
names.add(c.getName()); names.add(c.getName());
} }
else{ else{
corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortConverter) c.get_p2().getComponent()).getConvType()+ "<"+((SysCAMSTPortConverter) c.get_p2().getComponent()).getNbits() + "> > " // corpsCluster = corpsCluster + "\tsca_tdf::sca_signal<" + ((SysCAMSTPortConverter) c.get_p2().getComponent()).getConvType()+ "<"+((SysCAMSTPortConverter) c.get_p2().getComponent()).getNbits() + "> > " + c.getName() + ";" + CR;
+ c.getName() + ";" + CR; corpsCluster = corpsCluster + "\tsc_core::sc_signal<" + ((SysCAMSTPortConverter) c.get_p2().getComponent()).getConvType()+ "<"+((SysCAMSTPortConverter) c.get_p2().getComponent()).getNbits() + "> > " + c.getName() + ";" + CR;
//DG 18.10.
names.add(c.getName()); names.add(c.getName());
} }
...@@ -167,7 +169,8 @@ public class ClusterCode { ...@@ -167,7 +169,8 @@ public class ClusterCode {
for (SysCAMSTClock t : clock) { for (SysCAMSTClock t : clock) {
corpsCluster = corpsCluster + "\t sc_clock " + t.getName() + " (\"" + t.getName() + "\"," + t.getFrequency()+","+ t.getUnit()+","+ t.getDutyCycle()+","+ t.getStartTime()+","+ t.getUnitStartTime()+","+ t.getPosFirst()+");" + CR; // corpsCluster = corpsCluster + "\t sc_clock " + t.getName() + " (\"" + t.getName() + "\"," + t.getFrequency()+","+ t.getUnit()+","+ t.getDutyCycle()+","+ t.getStartTime()+","+ t.getUnitStartTime()+","+ t.getPosFirst()+");" + CR;
corpsCluster = corpsCluster + "\t sc_clock " + t.getName() + " (\"" + t.getName() + "\"," + t.getFrequency()+", SC_MS,"+ t.getDutyCycle()+","+ t.getStartTime()+", SC_MS,"+ t.getPosFirst()+");" + CR;
} }
nb_block=0; nb_block=0;
......
src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java
+ 16
− 17
View file @ 7961b7ed
...@@ -556,10 +556,12 @@ if (t.getOrigin() == 0) { ...@@ -556,10 +556,12 @@ if (t.getOrigin() == 0) {
} }
boolean sensitive = false, method = false; boolean sensitive = false, method = false;
if (!de.getCode().equals("")) { //if (!de.getCode().equals("")) {
corpsPrimitiveDE = corpsPrimitiveDE + "\t{" + CR + "\t\tSC_METHOD(" + de.getNameFn() + ");" + CR; corpsPrimitiveDE = corpsPrimitiveDE + "\t{"+CR;
// corpsPrimitiveDE = corpsPrimitiveDE + "\t{" + CR + "\t\tSC_METHOD(" + de.getNameFn() + ");" + CR;
if (!de.getCode().equals("")) {
method = true; method = true;
} }
/* for (SysCAMSTPortDE t : deports) { /* for (SysCAMSTPortDE t : deports) {
if (t.getSensitive() == true) { if (t.getSensitive() == true) {
...@@ -579,31 +581,28 @@ if (t.getOrigin() == 0) { ...@@ -579,31 +581,28 @@ if (t.getOrigin() == 0) {
//DG 17.10. //DG 17.10.
if(de.getClockName()!=""){ if(de.getClockName()!=""){
corpsPrimitiveDE = corpsPrimitiveDE + "\t\tsensitive << " + de.getClockName() + "."; corpsPrimitiveDE = corpsPrimitiveDE + "\t\tsensitive << " + de.getClockName() + ".pos();"+CR;
if (de.getClockSensitiveMethod().equals("positive")) { /* if (de.getClockSensitiveMethod().equals("positive")) {
corpsPrimitiveDE = corpsPrimitiveDE + "pos();" + CR; corpsPrimitiveDE = corpsPrimitiveDE + "pos();" + CR;
} else if (de.getClockSensitiveMethod().equals("negative")) { } else if (de.getClockSensitiveMethod().equals("negative")) {
corpsPrimitiveDE = corpsPrimitiveDE + "neg();" + CR; corpsPrimitiveDE = corpsPrimitiveDE + "neg();" + CR;
} }*/
sensitive = true;
} }
//fin ajoute DG //fin ajoute DG
for (SysCAMSTPortDE t : deports) { /*for (SysCAMSTPortDE t : deports) {
if (t.getSensitive() == true) { if (t.getSensitive() == true) {
if (method == false) { if (method == false) {
corpsPrimitiveDE = corpsPrimitiveDE + "\t{" + CR; corpsPrimitiveDE = corpsPrimitiveDE + "\t" + CR;
} }
corpsPrimitiveDE = corpsPrimitiveDE + "\t\tsensitive << " + t.getName() + ";"; corpsPrimitiveDE = corpsPrimitiveDE + "\t\tsensitive << " + t.getName() + ";"+ CR;
if (t.getSensitiveMethod().equals("positive")) {
corpsPrimitiveDE = corpsPrimitiveDE + "pos();" + CR;
} else if (t.getSensitiveMethod().equals("negative")) {
corpsPrimitiveDE = corpsPrimitiveDE + "neg();" + CR;
}
sensitive = true;
}
} }
sensitive = true;
}*/
if (sensitive == true || method == true) { if (sensitive == true || method == true) {
corpsPrimitiveDE = corpsPrimitiveDE + "\t}" + CR2; corpsPrimitiveDE = corpsPrimitiveDE + "\t}" + CR2;
} else { } else {
corpsPrimitiveDE = corpsPrimitiveDE + "\t{}" + CR2; corpsPrimitiveDE = corpsPrimitiveDE + "\t{}" + CR2;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment