clkconvert OP compute done

[blast.git] / AbstractBlock.cpp

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index b8ce5e5e1ddd8747ad461b278bbc215cfa093322..218ea61840fa9352149afb8f3520b3a7213a85c7 100644 (file)
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -8,10 +8,11 @@
 #include "ConnectedInterface.h"\r
 \r
 \r
 #include "ConnectedInterface.h"\r
 \r
 \r

-AbstractBlock::AbstractBlock() {\r
+AbstractBlock::AbstractBlock(Graph *_graph) {\r

   name = "";\r
   parent = NULL;\r
   specialType = NotSpecial;\r
   name = "";\r
   parent = NULL;\r
   specialType = NotSpecial;\r

+  graph = _graph;\r

 }\r
 \r
 /*\r
 }\r
 \r
 /*\r


@@ -277,73 +278,6 @@ QList<BlockParameter *> AbstractBlock::getWishboneParameters() {
   return lst;\r
 }\r
 \r
   return lst;\r
 }\r
 \r

-void AbstractBlock::connectClock(QString clkName, int idGen) throw(Exception) {\r
-\r
-  GroupBlock* parentBlock = AB_TO_GRP(parent);  \r
-  ConnectedInterface* fromClk = NULL;\r
-  ConnectedInterface* toClk = AI_TO_CON(getIfaceFromName(clkName));\r
-\r
-  if (parentBlock->isTop()) {\r
-    QString genName = "clkrstgen_" + QString::number(idGen);\r
-    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName(genName);\r
-    if (clkrstgen == NULL) {\r
-      throw(Exception(IFACE_TOP_NOCLKRSTGEN,this));\r
-    }\r
-    else {\r
-      fromClk = AI_TO_CON(clkrstgen->getIfaceFromName("clk"));      \r
-    }\r
-    cout << "connecting clock for " << qPrintable(name) << " to " << qPrintable(genName) << endl;\r
-  }\r
-  else {\r
-    // searching for ext_clk_idGen\r
-    QString name = "ext_clk_"+QString::number(idGen);\r
-    fromClk = AI_TO_CON(parentBlock->getIfaceFromName(name));\r
-    cout << "connecting clk for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;\r
-  }\r
-\r
-  if (fromClk == NULL) {\r
-    throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));\r
-  }\r
-  else {\r
-    fromClk->connectTo(toClk);\r
-    cout << "connection done between " << qPrintable(toClk->getConnectedFrom()->getOwner()->getName()) << "/" << qPrintable(toClk->getConnectedFrom()->getName());\r
-    cout << " and " << qPrintable(toClk->getOwner()->getName()) << "/" << qPrintable(toClk->getName()) << endl;\r
-  }\r
-}\r
-\r
-void AbstractBlock::connectReset(QString rstName, int idGen) throw(Exception) {\r
-\r
-  GroupBlock* parentBlock = AB_TO_GRP(parent);\r
-  ConnectedInterface* fromRst = NULL;\r
-  ConnectedInterface* toRst = AI_TO_CON(getIfaceFromName(rstName));\r
-\r
-  if (parentBlock->isTop()) {\r
-    QString genName = "clkrstgen_" + QString::number(idGen);\r
-    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName(genName);\r
-    if (clkrstgen == NULL) {\r
-      throw(Exception(IFACE_TOP_NOCLKRSTGEN,this));\r
-    }\r
-    else {\r
-      fromRst = AI_TO_CON(clkrstgen->getIfaceFromName("reset"));\r
-    }\r
-    cout << "connecting reset for " << qPrintable(name) << " to " << qPrintable(genName) << endl;\r
-  }\r
-  else {\r
-    QString name = "ext_reset_"+QString::number(idGen);\r
-    fromRst = AI_TO_CON(parentBlock->getIfaceFromName(name));\r
-    cout << "connecting reset for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;\r
-  }\r
-\r
-  if (fromRst == NULL) {\r
-    throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));\r
-  }\r
-  else {\r
-    fromRst->connectTo(toRst);\r
-    cout << "connection done between " << qPrintable(toRst->getConnectedFrom()->getOwner()->getName()) << "/" << qPrintable(toRst->getConnectedFrom()->getName());\r
-    cout << " and " << qPrintable(toRst->getOwner()->getName()) << "/" << qPrintable(toRst->getName()) << endl;\r
-  }\r
-}\r
-\r

 void AbstractBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {\r
 \r
   out << "entity " << name << " is" << endl;\r
 void AbstractBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {\r
 \r
   out << "entity " << name << " is" << endl;\r