added clk/rst link when creating a block

[blast.git] / FunctionalBlock.cpp

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index 449e2ecee4df3605beff48c630451fb3c4a31dd1..ab9611d9f9aa3e9fc2276068418cf93b44cf76ee 100644 (file)
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -8,7 +8,7 @@
 #include "ArithmeticEvaluator.h"\r
 \r
 \r
 #include "ArithmeticEvaluator.h"\r
 \r
 \r

-FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference) throw(Exception) :  AbstractBlock() {\r
+FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference, bool createIfaces) throw(Exception) :  AbstractBlock() {\r

   //if (! _reference->isReferenceBlock()) throw(Exception(BLOCK_INVALID_TYPE));\r
   //if (! _group->isGroupBlock()) throw(Exception(BLOCK_INVALID_TYPE));\r
   reference = _reference;\r
   //if (! _reference->isReferenceBlock()) throw(Exception(BLOCK_INVALID_TYPE));\r
   //if (! _group->isGroupBlock()) throw(Exception(BLOCK_INVALID_TYPE));\r
   reference = _reference;\r


@@ -30,6 +30,10 @@ FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference
   delta = -1;\r
   evaluator = NULL;\r
 \r
   delta = -1;\r
   evaluator = NULL;\r
 \r

+  if (createIfaces) {\r
+    populate();\r
+  }\r
+\r

 }\r
 \r
 FunctionalBlock::~FunctionalBlock() {\r
 }\r
 \r
 FunctionalBlock::~FunctionalBlock() {\r


@@ -96,7 +100,7 @@ void FunctionalBlock::populate() {
     addInterface(inter);\r
     /* WARNING FOR THE FUTURE :\r
        in case of there are several clock interfaces ofr that block\r
     addInterface(inter);\r
     /* WARNING FOR THE FUTURE :\r
        in case of there are several clock interfaces ofr that block\r

-       it would be a godd idea to make the user choose which one\r
+       it would be a good idea to make the user choose which one\r

        must be connected to defautl clk.\r
        Presently, the first encountered is chosen\r
      */\r
        must be connected to defautl clk.\r
        Presently, the first encountered is chosen\r
      */\r


@@ -122,18 +126,6 @@ void FunctionalBlock::populate() {
       }       \r
     }\r
   }\r
       }       \r
     }\r
   }\r

-\r
-  // connect clk and rst to group clk/rst or to clkrstgen\r
-  if ((name != "clkrstgen") && (parent != NULL)) {\r
-    try {\r
-      connectClkReset();\r
-    }\r
-    catch(Exception e) {\r
-      AbstractBlock* source = (AbstractBlock *)(e.getSource());\r
-      cerr << qPrintable(source->getName()) << ":" << qPrintable(e.getMessage()) << endl;\r
-      throw(e);\r
-    }\r
-  }\r

 }\r
 \r
 QString FunctionalBlock::getReferenceXmlFile() {\r
 }\r
 \r
 QString FunctionalBlock::getReferenceXmlFile() {\r


@@ -441,12 +433,17 @@ QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *o
       catch(Exception e) {\r
         throw(e);\r
       }\r
       catch(Exception e) {\r
         throw(e);\r
       }\r

+      if (repeat == 0) {\r
+        // remove the last\r
+        patternOut.removeLast();\r
+      }\r
+      else {\r

       // repeat just the last value in currentGroup\r
       // repeat just the last value in currentGroup\r

-      char last = patternOut.last();\r
-      //cout << "repeat last char " << repeat << " times : " << (int)last << endl;\r
-      \r
-      for(int i=1;i<(int)repeat;i++) {\r
-        patternOut.append(last);\r
+        char last = patternOut.last();\r
+        //cout << "repeat last char " << repeat << " times : " << (int)last << endl;\r
+        for(int i=1;i<(int)repeat;i++) {\r
+          patternOut.append(last);\r
+        }\r

       }\r
     }    \r
     *offset += 1;\r
       }\r
     }    \r
     *offset += 1;\r


@@ -470,15 +467,21 @@ QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *o
     catch(Exception e) {\r
       throw(e);\r
     }\r
     catch(Exception e) {\r
       throw(e);\r
     }\r

-    /*\r
+    if (repeat == 0) {\r
+      QList<char> voidList;\r
+      return voidList;\r
+    }\r
+    else {\r
+      /*\r

     cout << "repeat last group " << repeat << " times : ";\r
     foreach (char c, currentGroup) cout <<(int)c;\r
     cout << "repeat last group " << repeat << " times : ";\r
     foreach (char c, currentGroup) cout <<(int)c;\r

-    cout << endl;  \r
+    cout << endl;\r

     */\r
     */\r

-    QList<char> single = patternOut;\r
-    for(int i=1;i<(int)repeat;i++) {\r
-      patternOut.append(single);\r
-    }    \r
+      QList<char> single = patternOut;\r
+      for(int i=1;i<(int)repeat;i++) {\r
+        patternOut.append(single);\r
+      }\r
+    }\r

   }  \r
   return patternOut;\r
 }\r
   }  \r
   return patternOut;\r
 }\r