diff --git a/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java b/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java index 4ed10ccca5db93d6a96ad39f66ae200fae785834..5a17369992f979a3236a1ab5f2946647ccc019d6 100644 --- a/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java +++ b/src/main/java/syscamstranslator/toSysCAMS/PrimitiveCode.java @@ -152,7 +152,8 @@ public class PrimitiveCode { // System.out.println("@@@@@ Conv ports non empty"); for (SysCAMSTPortConverter conv : convports) { - if(conv.getConvType() !="sc_uint") { + // if(conv.getConvType() !="sc_uint") { + if(conv.getNbits()==0){ if (conv.getOrigin() == 0) { corpsPrimitiveTDF = corpsPrimitiveTDF + "\tsca_tdf::sca_de::sca_in <" + conv.getConvType()+"> " + conv.getName() + ";" + CR; @@ -471,7 +472,22 @@ public class PrimitiveCode { if (!deports.isEmpty()) { //System.out.println("@@@@@@@@@DE ports non empty"); for (SysCAMSTPortDE t : deports) { - if (t.getOrigin() == 0) { + + + if(t.getNbits()==0) + { if (t.getOrigin() == 0) { + corpsPrimitiveDE = corpsPrimitiveDE + "\tsc_core::sc_in <" + t.getDEType() + ">" + t.getName() + ";" + CR; + + //System.out.println("@@@@@@@@@2DE "+t.getDEType()+t.getNbits()); + } else if (t.getOrigin() == 1) { + corpsPrimitiveDE = corpsPrimitiveDE + "\tsc_core::sc_out <" + t.getDEType() + "> "+ t.getName() + ";" + CR; + + //System.out.println("@@@@@@@@@2DE "+t.getDEType()+t.getNbits()); + } + } + else { + +if (t.getOrigin() == 0) { corpsPrimitiveDE = corpsPrimitiveDE + "\tsc_core::sc_in <" + t.getDEType() + "<"+t.getNbits()+"> >" + t.getName() + ";" + CR; //System.out.println("@@@@@@@@@2DE "+t.getDEType()+t.getNbits()); @@ -480,6 +496,10 @@ public class PrimitiveCode { //System.out.println("@@@@@@@@@2DE "+t.getDEType()+t.getNbits()); } + + + } + } } diff --git a/src/main/java/syscamstranslator/toSysCAMSSoclib/PrimitiveCodeSoclib.java b/src/main/java/syscamstranslator/toSysCAMSSoclib/PrimitiveCodeSoclib.java index bb36d3874a382d428f58b09b9502c851fdbdfb94..ce64a0b6cf0569338992b087f41afded6b85dbfa 100644 --- a/src/main/java/syscamstranslator/toSysCAMSSoclib/PrimitiveCodeSoclib.java +++ b/src/main/java/syscamstranslator/toSysCAMSSoclib/PrimitiveCodeSoclib.java @@ -150,7 +150,8 @@ public class PrimitiveCodeSoclib { if (!convports.isEmpty()) { for (SysCAMSTPortConverter conv : convports) { - if(conv.getConvType()!="sc_uint") + //if(conv.getConvType()!="sc_uint") + if(conv.getNbits()==0) { if (conv.getOrigin() == 0) { @@ -161,7 +162,8 @@ public class PrimitiveCodeSoclib { } } - else{ if (conv.getOrigin() == 0) { + else{ + if (conv.getOrigin() == 0) { corpsPrimitiveTDF = corpsPrimitiveTDF + "\tsca_tdf::sca_de::sca_in <" + conv.getConvType()+"<" + conv.getNbits()+"> > " + conv.getName() + ";" + CR; } else if (conv.getOrigin() == 1) {