modif in VHDLConverter

[blast.git] / GroupBlock.cpp

diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index a8a06e641a7156b93de9de6ae52fbbaafb47b78e..62fd6ec8c813599c568d8c928b901f7ffc6e5aba 100644 (file)
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -105,22 +105,35 @@ void GroupBlock::removeGenericParameter(QString name) {
   if (p != NULL) params.removeAll(p);
 }
 
   if (p != NULL) params.removeAll(p);
 }
 

-void GroupBlock::initInputPattern() {
+void GroupBlock::createInputPattern() {

   foreach(AbstractInterface* iface, getControlInputs()) {
   foreach(AbstractInterface* iface, getControlInputs()) {

-    iface->setOutputPattern(iface->getConnectedFrom()->getOutputPattern());    
+    ConnectedInterface* connIface = AI_TO_CON(iface);
+    QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));    
+    connIface->setOutputPattern(pattern);    

   }  
 }
 
   }  
 }
 

-bool GroupBlock::computeOutputPattern(int nbExec) {
+void GroupBlock::checkInputPatternCompatibility() throw(Exception){  
+}
+
+void GroupBlock::computeOutputPattern(int nbExec) throw(Exception) {
+
+  static QString fctName = "GroupBlock::computeOutputPattern()";
+#ifdef DEBUG_FCTNAME
+  cout << "call to " << qPrintable(fctName) << endl;
+#endif
+
+  cout << "computing output pattern of group " << qPrintable(name) << endl;

   
   

-  bool canCompute = true;
+  bool canCompute = false;  

   // get the input pattern on each inputs
   // get the input pattern on each inputs

-  initInputPattern();
+  createInputPattern();

   
   

+  cout << "Input pattern OK" << endl;

   // find blocks that are connected to that inputs and generators
   QList<AbstractBlock*> fifo;
   foreach(AbstractBlock* block, blocks) {
   // find blocks that are connected to that inputs and generators
   QList<AbstractBlock*> fifo;
   foreach(AbstractBlock* block, blocks) {

-    
+        

     bool addIt = false;
     // if a block is a generator and has control outputs, add it
     if (block->isGeneratorBlock()) {
     bool addIt = false;
     // if a block is a generator and has control outputs, add it
     if (block->isGeneratorBlock()) {


@@ -129,24 +142,43 @@ bool GroupBlock::computeOutputPattern(int nbExec) {
     else {
       // if the block has a control input connected from an intput of the group, add it too
       foreach(AbstractInterface* iface, block->getControlInputs()) {
     else {
       // if the block has a control input connected from an intput of the group, add it too
       foreach(AbstractInterface* iface, block->getControlInputs()) {

-        ConnectedInterface* conn = (ConnectedInterface*)iface;
-        ConnectedInterface* groupIface = conn->getConnectionFromParentGroup();
-        if (groupIface != NULL) {
+        //cout << qPrintable(iface->getName()) << " of " << qPrintable(iface->getOwner()->getName()) << " connected to " << endl;       
+        ConnectedInterface* connFrom = ((ConnectedInterface*)iface)->getConnectedFrom();
+        //cout << qPrintable(connFrom->getName()) << " of " << qPrintable(connFrom->getOwner()->getName()) << endl;
+        
+        if (connFrom->getOwner() == this) {

           addIt = true;
           break;
         }
       }
     }
           addIt = true;
           break;
         }
       }
     }

-    if (addIt) fifo.append(block);    
+    if (addIt) {
+      cout << "adding " << qPrintable(block->getName()) << " to initialize the FIFO" << endl;
+      fifo.append(block);    
+    }

   }
   }

+  

   while (!fifo.isEmpty()) {
     AbstractBlock* block = fifo.takeFirst();
   while (!fifo.isEmpty()) {
     AbstractBlock* block = fifo.takeFirst();

-    cout << "computing pattern for " << qPrintable(block->getName()) << endl;
-    canCompute = block->computeOutputPattern();
-    if (!canCompute) {
+    
+    if (block->getPatternComputed()) continue; // block has already been processed
+    
+    try {
+      block->checkInputPatternCompatibility();
+    }
+    catch(Exception e) {
+      cout << qPrintable(block->getName()) << " is not compatible with his input pattern" << endl;
+      throw(e);
+    }    
+    
+    try {
+      block->computeOutputPattern();
+    }
+    catch(Exception e) {    

       cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;
       cout << "cannot finalize output pattern computation of " << qPrintable(block->getName()) << endl;

-      break;
+      throw(e);      

     }
     }

+    canCompute = true;

     block->setPatternComputed(true);
     // add other blocks connected from block to the fifo
     foreach(AbstractInterface* iface, block->getControlOutputs()) {
     block->setPatternComputed(true);
     // add other blocks connected from block to the fifo
     foreach(AbstractInterface* iface, block->getControlOutputs()) {


@@ -167,9 +199,10 @@ bool GroupBlock::computeOutputPattern(int nbExec) {
   
   if (canCompute) {
     foreach(AbstractInterface* iface, getControlOutputs()) {
   
   if (canCompute) {
     foreach(AbstractInterface* iface, getControlOutputs()) {

-      iface->setOutputPattern(iface->getConnectedFrom()->getOutputPattern());    
+      ConnectedInterface* connIface = AI_TO_CON(iface);
+      QList<char>* pattern = new QList<char>(*(connIface->getConnectedFrom()->getOutputPattern()));
+      connIface->setOutputPattern(pattern);    

     }
     setPatternComputed(true);
     }
     setPatternComputed(true);

-  }
-  return canCompute;
+  }  

 }
 }