finished testbench generation

[blast.git] / AbstractBlock.h

diff --git a/AbstractBlock.h b/AbstractBlock.h
index 8f09410f44011e1dd44fa090cae84453bf0205e3..f40af86773e020d59e417508004dbb63d7572319 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,6 +36,7 @@ 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 Graph* getGraph() { return graph; }\r

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


@@ -73,7 +75,7 @@ public:
   virtual bool isGroupBlock();\r
   virtual bool isStimuliBlock(); //! a stimuli block is outside the top group and simulates a peripheral (NB: this is also a source)\r
   virtual bool isTopGroupBlock();\r
   virtual bool isGroupBlock();\r
   virtual bool isStimuliBlock(); //! a stimuli block is outside the top group and simulates a peripheral (NB: this is also a source)\r
   virtual bool isTopGroupBlock();\r

-  bool isSourceBlock(); //! a source block has no data inputs and thus executes infinitely\r
+  bool isSourceBlock(); //! a source block is either a block that has no data inputs or that is of special type source. Thus it executes infinitely\r

   bool isSinkBlock(); //! a sink block has no data outputs and just collects what it receives (i.e. no compatibility check)\r
   bool isWBConfigurable();\r
 \r
   bool isSinkBlock(); //! a sink block has no data outputs and just collects what it receives (i.e. no compatibility check)\r
   bool isWBConfigurable();\r
 \r


@@ -84,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


@@ -112,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