X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/c25a6c891bde475aa51b4c4f5d42ecd7540910bb..e40a5399ec7887c2606f18575c809b0d05b09278:/AbstractBlock.cpp?ds=sidebyside

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index 13adcae..116494e 100644
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -3,9 +3,11 @@
 #include <QMessageBox>
 #include "AbstractInterface.h"
 #include "BlockParameter.h"
+#include "Parameters.h"
 #include "GroupBlock.h"
 #include "ConnectedInterface.h"
 
+
 AbstractBlock::AbstractBlock() {
   name = "";
   parent = NULL;
@@ -13,7 +15,7 @@ AbstractBlock::AbstractBlock() {
 
 /*
 AbstractBlock::AbstractBlock(const QString& _name) {
-  name = normalizeName(_name);
+  name = Parameters::normalizeName(_name);
   parent = NULL;
 }
 */
@@ -29,7 +31,7 @@ AbstractBlock::~AbstractBlock() {
 }
 
 void AbstractBlock::setName(const QString& str) {
-  name = normalizeName(str);
+  name = Parameters::normalizeName(str);
 }
 
 void AbstractBlock::setParent(AbstractBlock* _parent) {
@@ -57,10 +59,12 @@ bool AbstractBlock::isSourceBlock() {
 }
 /* NB: a generator is a block that has no data inputs
  * and has at least one data output.
+ * By the way, blocks that have no data input/output
+ * (like clkrstgen) are not generators !
  */
 bool AbstractBlock::isGeneratorBlock() {
   if (getDataInputs().size() > 0) return false;
-  
+  if (getDataOutputs().size() == 0) return false;
   return true;
 }
 
@@ -239,56 +243,95 @@ QList<BlockParameter *> AbstractBlock::getWishboneParameters() {
   return lst;
 }
 
-QString AbstractBlock::normalizeName(const QString &name) {
-  QString s = name;
-  s.replace(QRegularExpression("[^a-zA-Z0-9_]"),"_");
-  s.replace(QRegularExpression("[_]+"),"_");
-  return s;
-}
-
-void AbstractBlock::connectClkReset() throw(Exception) {
+void AbstractBlock::connectClock(QString clkName, int idGen) throw(Exception) {
 
-  GroupBlock* parentBlock = AB_TO_GRP(parent);
-
-  cout << "connecting clk/rst for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;
+  GroupBlock* parentBlock = AB_TO_GRP(parent);  
+  ConnectedInterface* fromClk = NULL;
+  ConnectedInterface* toClk = AI_TO_CON(getIfaceFromName(clkName));
 
-  QList<AbstractInterface* > lstClk = getInterfaces(AbstractInterface::Input,AbstractInterface::Clock);
-  QList<AbstractInterface* > lstRst = getInterfaces(AbstractInterface::Input,AbstractInterface::Reset);
+  if (parentBlock->isTop()) {
+    QString genName = "clkrstgen_" + QString::number(idGen);
+    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName(genName);
+    if (clkrstgen == NULL) {
+      throw(Exception(IFACE_TOP_NOCLKRSTGEN,this));
+    }
+    else {
+      fromClk = AI_TO_CON(clkrstgen->getIfaceFromName("clk"));      
+    }
+    cout << "connecting clock for " << qPrintable(name) << " to " << qPrintable(genName) << endl;
+  }
+  else {
+    // searching for ext_clk_idGen
+    QString name = "ext_clk_"+QString::number(idGen);
+    fromClk = AI_TO_CON(parentBlock->getIfaceFromName(name));
+    cout << "connecting clk for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;
+  }
 
-  if ((lstClk.isEmpty()) || (lstRst.isEmpty())) {
-    throw(Exception(IFACE_GROUP_NOCLKRST,this));
+  if (fromClk == NULL) {
+    throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));
+  }
+  else {
+    fromClk->connectTo(toClk);
+    cout << "connection done between " << qPrintable(toClk->getConnectedFrom()->getOwner()->getName()) << "/" << qPrintable(toClk->getConnectedFrom()->getName());
+    cout << " and " << qPrintable(toClk->getOwner()->getName()) << "/" << qPrintable(toClk->getName()) << endl;
   }
+}
 
-  ConnectedInterface* toClk = AI_TO_CON(lstClk.at(0));
-  ConnectedInterface* toRst = AI_TO_CON(lstRst.at(0));
+void AbstractBlock::connectReset(QString rstName, int idGen) throw(Exception) {
 
-  ConnectedInterface* fromClk = NULL;
+  GroupBlock* parentBlock = AB_TO_GRP(parent);
   ConnectedInterface* fromRst = NULL;
+  ConnectedInterface* toRst = AI_TO_CON(getIfaceFromName(rstName));
 
   if (parentBlock->isTop()) {
-    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName("clkrstgen");
+    QString genName = "clkrstgen_" + QString::number(idGen);
+    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName(genName);
     if (clkrstgen == NULL) {
       throw(Exception(IFACE_TOP_NOCLKRSTGEN,this));
     }
     else {
-      fromClk = AI_TO_CON(clkrstgen->getIfaceFromName("clk"));
       fromRst = AI_TO_CON(clkrstgen->getIfaceFromName("reset"));
     }
+    cout << "connecting reset for " << qPrintable(name) << " to " << qPrintable(genName) << endl;
   }
   else {
-    fromClk = AI_TO_CON(parentBlock->getIfaceFromName("clk"));
-    fromRst = AI_TO_CON(parentBlock->getIfaceFromName("reset"));
+    QString name = "ext_reset_"+QString::number(idGen);
+    fromRst = AI_TO_CON(parentBlock->getIfaceFromName(name));
+    cout << "connecting reset for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;
   }
-  if ((fromClk == NULL) || (fromRst == NULL)) {
+
+  if (fromRst == NULL) {
     throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));
   }
   else {
-    fromClk->connectTo(toClk);
     fromRst->connectTo(toRst);
+    cout << "connection done between " << qPrintable(toRst->getConnectedFrom()->getOwner()->getName()) << "/" << qPrintable(toRst->getConnectedFrom()->getName());
+    cout << " and " << qPrintable(toRst->getOwner()->getName()) << "/" << qPrintable(toRst->getName()) << endl;
   }
+}
 
+void AbstractBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {
 
+  out << "entity " << name << " is" << endl;
+  try {
+    generateEntityOrComponentBody(out, 0, hasController);
+  }
+  catch(Exception e) {
+    throw(e);
+  }
+  out << "end entity " << name << ";" << endl << endl;
 }
 
+void AbstractBlock::generateComponent(QTextStream& out, bool hasController) throw(Exception) {
+
+  out << "  component " << name << " is" << endl;
+  try {
+    generateEntityOrComponentBody(out, 2, hasController);
+  }
+  catch(Exception e) {
+    throw(e);
+  }
+  out << "  end component; " << endl << endl;
+}