modif in VHDLConverter

[blast.git] / FunctionalBlock.h

diff --git a/FunctionalBlock.h b/FunctionalBlock.h
index f27bef640f5b78efcf0591910a9612f78a1c80a2..b3cfbc4e85af716f2a0153cc3efdaf98e5c9b654 100644 (file)
--- a/FunctionalBlock.h
+++ b/FunctionalBlock.h
@@ -27,7 +27,7 @@ class FunctionalBlock : public AbstractBlock {
 public:\r
 \r
   FunctionalBlock(GroupBlock* _parent, ReferenceBlock* _reference) throw(Exception);\r
 public:\r
 \r
   FunctionalBlock(GroupBlock* _parent, ReferenceBlock* _reference) throw(Exception);\r

-\r
+  ~FunctionalBlock();\r

   // getters\r
   inline ReferenceBlock* getReference() { return reference; }\r
   inline QList<int> getProductionCounter() { return productionCounter; }\r
   // getters\r
   inline ReferenceBlock* getReference() { return reference; }\r
   inline QList<int> getProductionCounter() { return productionCounter; }\r


@@ -56,26 +56,26 @@ public:
   QString getReferenceHashMd5();\r
   \r
   // patterns\r
   QString getReferenceHashMd5();\r
   \r
   // patterns\r

-  bool createPatterns(); // called in Graph, before checking compatibility and computing output pattern\r
-  bool checkInputPatternCompatibility();\r
-  bool computeOutputPattern(int nbExec = -1);\r
+  void createPatterns() throw(Exception); // called in Graph, before checking compatibility and computing output pattern\r
+  void checkInputPatternCompatibility() throw(Exception);\r
+  void computeOutputPattern(int nbExec = -1) throw(Exception);\r

   \r
 private:  \r
   // patterns\r
   \r
 private:  \r
   // patterns\r

-  bool createDelta();\r
-  bool createConsumptionPattern(); // initialize a QList<char> for each interface from patterns defined in implementation\r
-  bool createProductionPattern(); // initialize a QList<char> for each interface from patterns defined in implementation\r
-  bool createProductionCounter(); // initialize a QList<int> from counter defined in implementation\r
-  bool createAdmittance(int nbExec); // initialize a QList<char> from consumption pattern and delta\r
+  void createDelta() throw(Exception);\r
+  void createConsumptionPattern() throw(Exception); // initialize a QList<char> for each interface from patterns defined in implementation\r
+  void createProductionPattern() throw(Exception); // initialize a QList<char> for each interface from patterns defined in implementation\r
+  void createProductionCounter() throw(Exception); // initialize a QList<int> from counter defined in implementation\r
+  void createAdmittance(int nbExec) throw(Exception); // initialize a QList<char> from consumption pattern and delta\r

   void clearConsumptionPattern();\r
   void clearProductionPattern();\r
   void clearConsumptionPattern();\r
   void clearProductionPattern();\r

-  void createInputPattern();\r
+  void createInputPattern() throw(Exception);\r

   void clearInputPattern();\r
   void clearInputPattern();\r

-  int getNumberOfExecution(); // compute number of block execution from inputPattern and delta\r
+  int createTriggers(); // compute the clock cycle at which the block is triggered\r

   \r
   \r

-  double evaluateExpression(const QString& expression, bool* ok);\r
-  QList<char>* expandPattern(const QString& patternIn, bool* ok);\r
-  void expandPatternRecur(const QString& patternIn, int* offset, bool* ok, QList<char> *patternOut);\r
+  double evaluateExpression(const QString& expression) throw(Exception);\r
+  QList<char>* expandPattern(const QString& patternIn) throw(Exception);\r
+  QList<char> expandPatternRecur(const QString& patternIn, int* offset)  throw(Exception);\r

   /*!\r
    * \brief samePatterns\r
    * \param patternSrc the pattern that must be tested with patternDest (is patternDest == patternDest)  \r
   /*!\r
    * \brief samePatterns\r
    * \param patternSrc the pattern that must be tested with patternDest (is patternDest == patternDest)  \r


@@ -151,7 +151,8 @@ private:
   QMap<AbstractInterface*, QList<char>* > productionPattern;\r
   QMap<AbstractInterface*,QList<char>* > inputPattern;\r
   QMap<AbstractInterface*, QList<char>* > outputPattern; // CAUTION: the QList<char>* must also be stored in the outputPattern attributes of AbstractInterface\r
   QMap<AbstractInterface*, QList<char>* > productionPattern;\r
   QMap<AbstractInterface*,QList<char>* > inputPattern;\r
   QMap<AbstractInterface*, QList<char>* > outputPattern; // CAUTION: the QList<char>* must also be stored in the outputPattern attributes of AbstractInterface\r

-  QList<int> productionCounter; //! only usefull for control output interfaces\r
+  QList<int> productionCounter; // only usefull for control output interfaces\r
+  QList<int> triggers; // the clock cycles at which the block is triggered, taking into account IP\r

   int lengthIP; // for convenience, set in createInputPattern()\r
   int lengthCP; // for convenience, set in createConsumptionPattern()\r
   int lengthAP; // for convenience, set in createAdmittance()\r
   int lengthIP; // for convenience, set in createInputPattern()\r
   int lengthCP; // for convenience, set in createConsumptionPattern()\r
   int lengthAP; // for convenience, set in createAdmittance()\r