X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/c85843afb9bd492b46d6fe87a8287157097483f5..14cd6d834ab531525a51c6a6992583b3e9143e02:/AbstractBlock.cpp

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index 336b677..c1c3c38 100644
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -59,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, blokcs 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;
 }
 
@@ -247,7 +249,7 @@ void AbstractBlock::connectClkReset() throw(Exception) {
 
   GroupBlock* parentBlock = AB_TO_GRP(parent);
 
-  cout << "connecting clk/rst for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;
+
 
   QList<AbstractInterface* > lstClk = getInterfaces(AbstractInterface::Input,AbstractInterface::Clock);
   QList<AbstractInterface* > lstRst = getInterfaces(AbstractInterface::Input,AbstractInterface::Reset);
@@ -271,10 +273,12 @@ void AbstractBlock::connectClkReset() throw(Exception) {
       fromClk = AI_TO_CON(clkrstgen->getIfaceFromName("clk"));
       fromRst = AI_TO_CON(clkrstgen->getIfaceFromName("reset"));
     }
+    cout << "connecting clk/rst for " << qPrintable(name) << " to clkrstgen" << endl;
   }
   else {
     fromClk = AI_TO_CON(parentBlock->getIfaceFromName("clk"));
     fromRst = AI_TO_CON(parentBlock->getIfaceFromName("reset"));
+    cout << "connecting clk/rst for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;
   }
   if ((fromClk == NULL) || (fromRst == NULL)) {
     throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));
@@ -282,10 +286,33 @@ void AbstractBlock::connectClkReset() throw(Exception) {
   else {
     fromClk->connectTo(toClk);
     fromRst->connectTo(toRst);
+    cout << "connection done between " << qPrintable(toClk->getConnectedFrom()->getOwner()->getName()) << "/" << qPrintable(toClk->getConnectedFrom()->getName());
+    cout << " and " << qPrintable(toClk->getOwner()->getName()) << "/" << qPrintable(toClk->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;
+}