started clkconvert output gen

[blast.git] / SpecialBlock.cpp

diff --git a/SpecialBlock.cpp b/SpecialBlock.cpp
index 8f2271db619f05c05a573fd3bd1335a6a9b8aea6..9576dc96184cfab349f8ddc4de4cc8b86b780e8e 100644 (file)
--- a/SpecialBlock.cpp
+++ b/SpecialBlock.cpp
@@ -1,7 +1,7 @@
 #include "SpecialBlock.h"\r
 #include "FunctionalInterface.h"\r
 \r
 #include "SpecialBlock.h"\r
 #include "FunctionalInterface.h"\r
 \r

-SpecialBlock::SpecialBlock(int _type, GroupBlock* _parent, ReferenceBlock* _reference, bool createIfaces) throw(Exception) : FunctionalBlock(_parent, _reference, createIfaces) {\r
+SpecialBlock::SpecialBlock(Graph *_graph, int _type, GroupBlock* _parent, ReferenceBlock* _reference, bool createIfaces) throw(Exception) : FunctionalBlock(_graph, _parent, _reference, createIfaces) {\r

   specialType = _type;\r
 }\r
 \r
   specialType = _type;\r
 }\r
 \r


@@ -58,7 +58,7 @@ void SpecialBlock::checkInputPatternCompatibilitySource() throw(Exception) {
 }\r
 void SpecialBlock::computeOutputPatternSource(int nbExec) throw(Exception) {\r
 \r
 }\r
 void SpecialBlock::computeOutputPatternSource(int nbExec) throw(Exception) {\r
 \r

-  cout << "computing output pattern of " << qPrintable(name) << " for " << nbExec << " executions" << endl;\r
+  cout << "computing output pattern of special block " << qPrintable(name) << " for " << nbExec << " executions" << endl;\r

   foreach(AbstractInterface* iface, getControlOutputs()) {\r
     FunctionalInterface* connIface = AI_TO_FUN(iface);\r
     // create output pattern\r
   foreach(AbstractInterface* iface, getControlOutputs()) {\r
     FunctionalInterface* connIface = AI_TO_FUN(iface);\r
     // create output pattern\r


@@ -97,14 +97,15 @@ void SpecialBlock::computeOutputPatternClockConvert(int nbExec) throw(Exception)
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r
 #ifdef DEBUG_FCTNAME\r
   cout << "call to " << qPrintable(fctName) << endl;\r
 #endif\r

-  cout << "computing output pattern of " << qPrintable(name) << endl;\r
+  cout << "computing output pattern of special block " << qPrintable(name) << endl;\r

 \r
   /* CAUTION: it is assumed that all clock domain converters are using\r
    * a clk_in and clk_out signals for input and output clocks.\r
    */\r
   AbstractInterface* clkIn = getIfaceFromName("clk_in");\r
   AbstractInterface* clkOut = getIfaceFromName("clk_out");\r
 \r
   /* CAUTION: it is assumed that all clock domain converters are using\r
    * a clk_in and clk_out signals for input and output clocks.\r
    */\r
   AbstractInterface* clkIn = getIfaceFromName("clk_in");\r
   AbstractInterface* clkOut = getIfaceFromName("clk_out");\r

-  cout << "freq clk_in = " << clkIn-\r
+  cout << "freq clk_in = " << clkIn->getClockFrequency() << endl;\r
+  cout << "freq clk_out = " << clkOut->getClockFrequency() << endl;\r

 \r
   // in case of inputPattern not created, do it\r
   if (lengthIP <= 0) {\r
 \r
   // in case of inputPattern not created, do it\r
   if (lengthIP <= 0) {\r