clkconvert OP compute done

[blast.git] / AbstractBlock.h

diff --git a/AbstractBlock.h b/AbstractBlock.h
index e1c33e4dfff272cd02ff237a66eedb2370f2cdd4..efbd47471f19144261fc6968792129c9d1e6b4b3 100644 (file)
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -9,6 +9,7 @@
 #include "AbstractInterface.h"\r
 class AbstractInterface;\r
 class BlockParameter;\r
 #include "AbstractInterface.h"\r
 class AbstractInterface;\r
 class BlockParameter;\r

+class Graph;\r

 \r
 #define AB_TO_REF(ptr) ((ReferenceBlock*)ptr)\r
 #define AB_TO_FUN(ptr) ((FunctionalBlock*)ptr)\r
 \r
 #define AB_TO_REF(ptr) ((ReferenceBlock*)ptr)\r
 #define AB_TO_FUN(ptr) ((FunctionalBlock*)ptr)\r


@@ -26,7 +27,7 @@ public:
   enum SpecialType { NotSpecial = 0, Source = 1, Sink = 2, ClkConvert = 3 };\r
 \r
 \r
   enum SpecialType { NotSpecial = 0, Source = 1, Sink = 2, ClkConvert = 3 };\r
 \r
 \r

-  AbstractBlock();\r
+  AbstractBlock(Graph* _graph);\r

   //AbstractBlock(const QString& _name);\r
   virtual ~AbstractBlock();\r
 \r
   //AbstractBlock(const QString& _name);\r
   virtual ~AbstractBlock();\r
 \r


@@ -35,14 +36,25 @@ public:
   inline int getSpecialType() { return specialType; }\r
   inline QString getVersion() { return version; }\r
   inline int nbParameters() { return params.size(); }\r
   inline int getSpecialType() { return specialType; }\r
   inline QString getVersion() { return version; }\r
   inline int nbParameters() { return params.size(); }\r

-  inline QList<BlockParameter *> getParameters() { return params; }\r
+  inline Graph* getGraph() { return graph; }\r
+\r

   inline QList<AbstractInterface*> getInputs() { return inputs; }\r
   inline QList<AbstractInterface*> getOutputs() { return outputs; }\r
   inline QList<AbstractInterface*> getBidirs() { return bidirs; }  \r
   inline QList<AbstractInterface*> getInputs() { return inputs; }\r
   inline QList<AbstractInterface*> getOutputs() { return outputs; }\r
   inline QList<AbstractInterface*> getBidirs() { return bidirs; }  \r

+  QList<AbstractInterface *> getInterfaces(int direction = AbstractInterface::AnyDirection, int purpose = AbstractInterface::AnyPurpose);\r
+  QList<AbstractInterface *> getDataInputs(); //! return all inputs of type data\r
+  QList<AbstractInterface *> getDataOutputs(); //! return all inputs of type data\r
+  QList<AbstractInterface *> getControlInputs(); //! return all inputs of type control\r
+  QList<AbstractInterface *> getControlOutputs(); //! return all outputs of type control\r
+  AbstractInterface* getIfaceFromName(QString name);\r
+\r
+  inline QList<BlockParameter *> getParameters() { return params; }\r
+  BlockParameter* getParameterFromName(QString name);\r

   QList<BlockParameter *> getUserParameters();\r
   QList<BlockParameter *> getGenericParameters();\r
   QList<BlockParameter *> getPortParameters();\r
   QList<BlockParameter *> getWishboneParameters();\r
   QList<BlockParameter *> getUserParameters();\r
   QList<BlockParameter *> getGenericParameters();\r
   QList<BlockParameter *> getPortParameters();\r
   QList<BlockParameter *> getWishboneParameters();\r

+\r

   inline AbstractBlock* getParent() { return parent; }\r
   inline bool getOutputPatternComputed() { return outputPatternComputed; }\r
   inline int getTraversalLevel() { return traversalLevel; }\r
   inline AbstractBlock* getParent() { return parent; }\r
   inline bool getOutputPatternComputed() { return outputPatternComputed; }\r
   inline int getTraversalLevel() { return traversalLevel; }\r


@@ -74,9 +86,7 @@ public:
    * \brief connectClkReset connects the clock and reset inputs to a clkrstgen block or the the group ifaces\r
    * \param idBlockClk is the id of the clock interface (there may be severals)\r
    * \param idGen is the id of the clkrstgen block\r
    * \brief connectClkReset connects the clock and reset inputs to a clkrstgen block or the the group ifaces\r
    * \param idBlockClk is the id of the clock interface (there may be severals)\r
    * \param idGen is the id of the clkrstgen block\r

-  */\r
-  void connectClock(QString clkName, int idGen = 0) throw(Exception);\r
-  void connectReset(QString rstName, int idGen = 0) throw(Exception);\r
+  */  \r

   virtual QList<QString> getExternalResources() = 0; // returns the list of all external files needed for VHDL generation\r
   virtual void generateVHDL(const QString& path) throw(Exception) = 0; // main entry to generate the VHDL code\r
   void generateComponent(QTextStream& out, bool hasController=false) throw(Exception); // generate the component using reference\r
   virtual QList<QString> getExternalResources() = 0; // returns the list of all external files needed for VHDL generation\r
   virtual void generateVHDL(const QString& path) throw(Exception) = 0; // main entry to generate the VHDL code\r
   void generateComponent(QTextStream& out, bool hasController=false) throw(Exception); // generate the component using reference\r


@@ -90,13 +100,6 @@ public:
   void removeAllInterfaces();\r
   void defineBlockParam(BlockParameter *param);\r
 \r
   void removeAllInterfaces();\r
   void defineBlockParam(BlockParameter *param);\r
 \r

-  QList<AbstractInterface *> getInterfaces(int direction = AbstractInterface::AnyDirection, int purpose = AbstractInterface::AnyPurpose);\r
-  QList<AbstractInterface *> getDataInputs(); //! return all inputs of type data\r
-  QList<AbstractInterface *> getDataOutputs(); //! return all inputs of type data\r
-  QList<AbstractInterface *> getControlInputs(); //! return all inputs of type control\r
-  QList<AbstractInterface *> getControlOutputs(); //! return all outputs of type control\r
-  AbstractInterface* getIfaceFromName(QString name);\r
-  BlockParameter* getParameterFromName(QString name);\r

 \r
   // patterns\r
   virtual void checkInputPatternCompatibility() throw(Exception) = 0;\r
 \r
   // patterns\r
   virtual void checkInputPatternCompatibility() throw(Exception) = 0;\r


@@ -109,6 +112,7 @@ protected:
   QString name;\r
   int specialType;\r
   QString version;\r
   QString name;\r
   int specialType;\r
   QString version;\r

+  Graph* graph;\r

 \r
   // parameters\r
   QList<BlockParameter *> params;\r
 \r
   // parameters\r
   QList<BlockParameter *> params;\r