debugged clk/rst auto conn

diff --git a/AbstractBlock.cpp b/AbstractBlock.cpp
index cdde69fcdc9b6051c396c62559a84f4151b60e04..13adcae22b44098ea2cd9834481bda1d37e80428 100644 (file)
--- a/AbstractBlock.cpp
+++ b/AbstractBlock.cpp
@@ -3,16 +3,20 @@
 #include <QMessageBox>\r
 #include "AbstractInterface.h"\r
 #include "BlockParameter.h"\r
+#include "GroupBlock.h"\r
+#include "ConnectedInterface.h"\r
 \r
 AbstractBlock::AbstractBlock() {\r
   name = "";\r
   parent = NULL;\r
 }\r
 \r
+/*\r
 AbstractBlock::AbstractBlock(const QString& _name) {\r
   name = normalizeName(_name);\r
   parent = NULL;\r
 }\r
+*/\r
 \r
 AbstractBlock::~AbstractBlock() {\r
 \r
@@ -242,4 +246,49 @@ QString AbstractBlock::normalizeName(const QString &name) {
   return s;\r
 }\r
 \r
+void AbstractBlock::connectClkReset() throw(Exception) {\r
+\r
+  GroupBlock* parentBlock = AB_TO_GRP(parent);\r
+\r
+  cout << "connecting clk/rst for child " << qPrintable(name) << " of " << qPrintable(parentBlock->getName()) << endl;\r
+\r
+  QList<AbstractInterface* > lstClk = getInterfaces(AbstractInterface::Input,AbstractInterface::Clock);\r
+  QList<AbstractInterface* > lstRst = getInterfaces(AbstractInterface::Input,AbstractInterface::Reset);\r
+\r
+  if ((lstClk.isEmpty()) || (lstRst.isEmpty())) {\r
+    throw(Exception(IFACE_GROUP_NOCLKRST,this));\r
+  }\r
+\r
+  ConnectedInterface* toClk = AI_TO_CON(lstClk.at(0));\r
+  ConnectedInterface* toRst = AI_TO_CON(lstRst.at(0));\r
+\r
+  ConnectedInterface* fromClk = NULL;\r
+  ConnectedInterface* fromRst = NULL;\r
+\r
+  if (parentBlock->isTop()) {\r
+    AbstractBlock* clkrstgen = parentBlock->getFunctionalBlockByName("clkrstgen");\r
+    if (clkrstgen == NULL) {\r
+      throw(Exception(IFACE_TOP_NOCLKRSTGEN,this));\r
+    }\r
+    else {\r
+      fromClk = AI_TO_CON(clkrstgen->getIfaceFromName("clk"));\r
+      fromRst = AI_TO_CON(clkrstgen->getIfaceFromName("reset"));\r
+    }\r
+  }\r
+  else {\r
+    fromClk = AI_TO_CON(parentBlock->getIfaceFromName("clk"));\r
+    fromRst = AI_TO_CON(parentBlock->getIfaceFromName("reset"));\r
+  }\r
+  if ((fromClk == NULL) || (fromRst == NULL)) {\r
+    throw(Exception(IFACE_GROUP_NOCLKRST,parentBlock));\r
+  }\r
+  else {\r
+    fromClk->connectTo(toClk);\r
+    fromRst->connectTo(toRst);\r
+  }\r
+\r
+\r
+}\r
+\r
+\r
 \r

diff --git a/AbstractBlock.h b/AbstractBlock.h
index 042a59883b90d4bcf5339a8f491ce3e0ca98234d..616682de66bc2cfbc12151269c3293671d97f33c 100644 (file)
--- a/AbstractBlock.h
+++ b/AbstractBlock.h
@@ -21,7 +21,7 @@ class AbstractBlock {
 public:  \r
       \r
   AbstractBlock();\r
-  AbstractBlock(const QString& _name);\r
+  //AbstractBlock(const QString& _name);\r
   virtual ~AbstractBlock();\r
 \r
   // getters\r
@@ -30,7 +30,7 @@ public:
   inline QList<BlockParameter *> getParameters() { return params; }\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*> getBidirs() { return bidirs; }  \r
   QList<BlockParameter *> getUserParameters();\r
   QList<BlockParameter *> getGenericParameters();\r
   QList<BlockParameter *> getPortParameters();\r
@@ -57,6 +57,7 @@ public:
 \r
   // others\r
   static QString normalizeName(const QString& name);\r
+  void connectClkReset() throw(Exception);\r
 \r
   virtual void parametersValidation(QList<AbstractBlock*>* checkedBlocks, QList<AbstractBlock*>* blocksToConfigure) = 0; // ugly but usefull   \r
 \r

diff --git a/Exception.cpp b/Exception.cpp
index 9592e4d83a6655d159cbbd9d480234fe0ec4edc9..8c59d0d2aebb64f2a57f36a7fedc49dccd7df1d4 100644 (file)
--- a/Exception.cpp
+++ b/Exception.cpp
@@ -34,6 +34,9 @@ QString Exception::getDefaultMessage() {
   case IFACE_NULL : ret = tr("A parameter of type AbstractInterface* has been provided with NULL value."); break;
   case IFACE_INVALID_TYPE : ret = tr("A parameter of type AbstractInterface* is used with an incorrect instance type."); break;
   case IFACE_MULTIPLICITY_REACHED : ret = tr("Impossible to create another instance of a GraphInterface: the maximum multiplicity is reached."); break;
+  case IFACE_BLOCK_NOCLKRST : ret = tr("Cannot find a clk or rst for a block."); break;
+  case IFACE_GROUP_NOCLKRST : ret = tr("Cannot find a clk or rst for a group."); break;
+  case IFACE_TOP_NOCLKRSTGEN : ret = tr("Cannot find the clkrstgen block in top group."); break;
   case BLOCKITEM_NULL : ret = tr("A parameter of type AbstractBlockItem* has been provided with NULL value."); break;
   case BLOCKITEM_INVALID_TYPE : ret = tr("A parameter of type AbstractBlockItem* is used with an incorrect instance type."); break;
   case WIDTHS_NOT_EQUALS : ret = tr("Two interfaces are connected but don't have the same widths."); break;

diff --git a/Exception.h b/Exception.h
index e45e7bb5a981418e3eec55fd9c5866d7d5817f6f..608bc551a25f39b660ce982fb52680152d7e2a71 100644 (file)
--- a/Exception.h
+++ b/Exception.h
@@ -44,10 +44,14 @@ supp. infos : saved in UTF-8 [éè]
 #define BLOCK_NULL 1001
 #define BLOCK_INVALID_TYPE 1002
 
+
 // exceptions for interfaces manipulations
 #define IFACE_NULL 2001
 #define IFACE_INVALID_TYPE 2002
 #define IFACE_MULTIPLICITY_REACHED 2003
+#define IFACE_BLOCK_NOCLKRST 2004
+#define IFACE_GROUP_NOCLKRST 2005
+#define IFACE_TOP_NOCLKRSTGEN 2006
 
 // exceptions for block items manipulations
 #define BLOCKITEM_NULL 3001

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index b4947840a6b8b16a41ad03edd47586cbbbc1291a..8ecd6a3d802bb68f15e952f4bde1d78b7cd55a7a 100644 (file)
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -29,6 +29,7 @@ FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference
   lengthPP = -1;\r
   delta = -1;\r
   evaluator = NULL;\r
+\r
 }\r
 \r
 FunctionalBlock::~FunctionalBlock() {\r
@@ -77,6 +78,8 @@ void FunctionalBlock::populate() {
     addParameter(p);\r
   }\r
 \r
+  ConnectedInterface* toClk = NULL;\r
+  ConnectedInterface* toRst = NULL;\r
   // create interfaces from reference block\r
   QList<AbstractInterface *> lstRef = reference->getInterfaces();\r
   // store relation between functional and reference\r
@@ -90,8 +93,19 @@ void FunctionalBlock::populate() {
       exit(1);\r
     }\r
     hashIface.insert(lstRef.at(i),inter);\r
-\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
+       must be connected to defautl clk.\r
+       Presently, the first encountered is chosen\r
+     */\r
+    if ((toClk == NULL) && (inter->getPurpose() == AbstractInterface::Clock)) {\r
+      toClk = AI_TO_CON(inter);\r
+    }\r
+    if ((toRst == NULL) && (inter->getPurpose() == AbstractInterface::Reset)) {\r
+      toRst = AI_TO_CON(inter);\r
+    }\r
   }\r
     \r
   AbstractInterface* funCtlIface = NULL;\r
@@ -108,8 +122,19 @@ void FunctionalBlock::populate() {
       }       \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
     return ((ReferenceBlock *)reference)->getXmlFile();\r

diff --git a/GroupBlock.cpp b/GroupBlock.cpp
index 6950b30fbdae11113e9237cad9b66e17e946be87..4746a7480b9db4d660c4e560eaa090e0533a5d8e 100644 (file)
--- a/GroupBlock.cpp
+++ b/GroupBlock.cpp
@@ -31,20 +31,21 @@ GroupBlock::GroupBlock(GroupBlock *_parent) throw(Exception) :  AbstractBlock()
     rst = new GroupInterface(this,"ext_reset", AbstractInterface::Input, AbstractInterface::Reset);
     addInterface(clk);
     addInterface(rst);
-    // creating clkrstgen block : done in Dispatcher since this has no access to library
+    // creating clkrstgen block and connecting it to this: done in Dispatcher since this has no access to library
   }
   parent = _parent;
+
   if (_parent != NULL) {
-    // adding this to the child blocks of parent    
-    _parent->addBlock(this);
-    // connect clk/rst ifaces to parent clk/rst or to clkrstgen if parent is top group
-    if (_parent->isTop()) {
-      
+    try {
+      connectClkReset();
     }
-    else {
-      
+    catch(Exception e) {
+      AbstractBlock* source = (AbstractBlock *)(e.getSource());
+      cerr << qPrintable(source->getName()) << ":" << qPrintable(e.getMessage()) << endl;
+      throw(e);
     }
   }
+
 }
 
 GroupBlock::~GroupBlock() {

diff --git a/GroupBlock.h b/GroupBlock.h
index 0f0d206fa3d1c9716b94db94dd8049f01a6ca87a..172803d4cfdbb1f92a5007e5e4a9b3bd5044f3f8 100644 (file)
--- a/GroupBlock.h
+++ b/GroupBlock.h
@@ -34,7 +34,7 @@ public:
   inline void addBlock(AbstractBlock* block) { blocks.append(block); }
   void removeBlock(AbstractBlock* block);
   AbstractBlock* getFunctionalBlockByName(QString name);
-  
+
   void removeAllBlocks();
   void parametersValidation(QList<AbstractBlock *> *checkedBlocks, QList<AbstractBlock*>* blocksToConfigure);  
   void addGenericParameter(QString name, QString type, QString value);

diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index fbf78283e3e89259c1544ae00bd4be220e366de2..5137d73f576c7af050a3d82ccd6269c88d9f31cf 100644 (file)
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -94,7 +94,7 @@ void ReferenceBlock::loadInformations(QDomElement &elt) throw(Exception) {
   }
   else {
     QDomText txtName = nodeNameTxt.toText();
-    name = txtName.data().trimmed();
+    name = normalizeName(txtName.data().trimmed());
     cout<< "block name : " << qPrintable(name) << endl;
   }
 
@@ -633,3 +633,5 @@ void ReferenceBlock::computeAdmittanceDelays() throw(Exception) {
   // does strictly nothing
   throw(Exception(INVALID_REFBLOCK_USE));
 }
+
+

diff --git a/blast.creator.user b/blast.creator.user
index 76fb27170a5f021301e2a6fd2189eb4171e677d7..f58f19423c23f89b64da350976087acf841992ce 100755 (executable)
--- a/blast.creator.user
+++ b/blast.creator.user
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.2.0, 2018-01-24T18:18:10. -->
+<!-- Written by QtCreator 4.2.0, 2018-01-24T21:11:11. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
-  <value type="QByteArray">{3701e197-5b6c-48ea-9e98-a6cf6de18672}</value>
+  <value type="QByteArray">{c8006d66-d34f-42be-ad10-d0207752286d}</value>
  </data>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -19,7 +19,7 @@
    <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
     <value type="QString" key="language">Cpp</value>
     <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">qt2</value>
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
     </valuemap>
    </valuemap>
    <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
@@ -31,7 +31,7 @@
    <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
    <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
    <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">2</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
    <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
    <value type="int" key="EditorConfiguration.MarginColumn">80</value>
    <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
@@ -43,12 +43,12 @@
    <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
    <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
    <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
-   <value type="int" key="EditorConfiguration.TabSize">4</value>
-   <value type="bool" key="EditorConfiguration.UseGlobal">false</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
    <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
    <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
    <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
-   <value type="bool" key="EditorConfiguration.cleanWhitespace">false</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
    <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
   </valuemap>
  </data>
@@ -61,7 +61,7 @@
   <valuemap type="QVariantMap">
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ed04208c-8774-456b-99b9-4a02094ca7a4}</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{2c9bf876-3476-44eb-8065-1f0844704dda}</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
@@ -128,7 +128,7 @@
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
     <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
     <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
-    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">0</value>
+    <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
     <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
     <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
     <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
@@ -169,9 +169,8 @@
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
     <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
     <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
-    <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value>
     <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Exécutable personnalisé</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>

diff --git a/lib/implementations/impls.bmf b/lib/implementations/impls.bmf
index 2115cfcb4513070ae45b9cc0b35026aed97f7a8c..8384e85ac170221fc80d284ca79dc7c38aca81f0 100644 (file)
Binary files a/lib/implementations/impls.bmf and b/lib/implementations/impls.bmf differ

diff --git a/lib/references/references.bmf b/lib/references/references.bmf
index 2c93c037751fd725fb1ce2d4e62209c562b58efc..a34f5925c214b924674d852699a77d62c20aedb5 100644 (file)
Binary files a/lib/references/references.bmf and b/lib/references/references.bmf differ