changed ref/impls xsd and xml

[blast.git] / FunctionalBlock.cpp

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index 3ea8253b6f0f30749809a35980c9edd32d2613af..ccaa7b2c8ead70bc09165e0ac451ce2ee039ecf1 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


@@ -1315,9 +1318,23 @@ int FunctionalBlock::createTriggers() {
   return triggers.size();\r
 }\r
 \r
   return triggers.size();\r
 }\r
 \r

+QList<QString> FunctionalBlock::getExternalResources() {\r
+\r
+  BlockImplementation* impl = reference->getImplementations().at(0); // for now only take first impl available\r
+  QList<QString> list = impl->getResources();\r
+  foreach(QString s, list) {\r
+    cout << qPrintable(s) << " ";\r
+  }\r
+  cout << endl;\r
+\r
+  return list;\r
+}\r
+\r
+\r

 void FunctionalBlock::generateVHDL(const QString& path) throw(Exception){\r
     \r
 void FunctionalBlock::generateVHDL(const QString& path) throw(Exception){\r
     \r

-  BlockImplementation* impl = reference->getImplementations().at(0); // for now only take first impl available\r
+  BlockImplementation* impl = reference->getImplementations().at(0); // for now only take first impl available  \r
+\r

   QFile implFile(impl->getXmlFile());\r
 \r
   // reading in into QDomDocument\r
   QFile implFile(impl->getXmlFile());\r
 \r
   // reading in into QDomDocument\r


@@ -1407,23 +1424,22 @@ void FunctionalBlock::generateComments(QTextStream& out, QDomElement &elt, QStri
   QString mail = eltAuthor.attribute("mail","");\r
   out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")" << endl;\r
   out << "--" << endl;\r
   QString mail = eltAuthor.attribute("mail","");\r
   out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")" << endl;\r
   out << "--" << endl;\r

-  QDomElement eltDate = eltAuthor.nextSiblingElement("date");\r
-  QString crea = eltDate.attribute("creation","");\r
+  QDomElement eltLog = eltAuthor.nextSiblingElement("log");\r
+  QString crea = eltLog.attribute("creation","");\r

   out << "--  Creation Date   : "<<crea<< endl;\r
   out << "--" << endl;\r
   out << "--  Creation Date   : "<<crea<< endl;\r
   out << "--" << endl;\r

-  QDomElement eltRelated = eltDate.nextSiblingElement("related_files");\r
-  QString relateds = eltRelated.attribute("list","");\r
-  out << "--  Related files   :\n"<<relateds<<endl;\r
-  out << "--" << endl;\r
-  QDomElement eltDesc = eltRelated.nextSiblingElement("description");\r
-  QDomElement desc = eltDesc.firstChildElement();\r
-  QString descTxt = desc.text();\r
-  out << "--  Decription      :\n"<<descTxt<<endl;\r
+  QDomNodeList listModifs = eltLog.elementsByTagName("modification");\r
+  for(int j=0;j<listModifs.length();j++) {\r
+    QDomNode nodeModif = listModifs.at(j);\r
+    QDomElement eltModif = nodeModif.toElement();\r
+  }\r
+  out << "-- Description   : " << endl;\r
+  out << reference->getDescription() << endl;\r

   out << "--" << endl;\r
   out << "--" << endl;\r

-  QDomElement eltNote = eltDesc.nextSiblingElement("description");\r
+  QDomElement eltNote = eltLog.nextSiblingElement("notes");\r

   QDomElement note = eltNote.firstChildElement();\r
   QString noteTxt = note.text();\r
   QDomElement note = eltNote.firstChildElement();\r
   QString noteTxt = note.text();\r

-  out << "--  Note          :\n"<<noteTxt<<endl;\r
+  out << "--  Notes          :\n"<<noteTxt<<endl;\r

   out << "--" << endl;\r
   for(int i = 0; i < 50; i++) {\r
     out << "--";\r
   out << "--" << endl;\r
   for(int i = 0; i < 50; i++) {\r
     out << "--";\r


@@ -1445,7 +1461,7 @@ void FunctionalBlock::generateLibraries(QTextStream& out, QDomElement &elt) thro
       QDomElement eltPack = nodePack.toElement();\r
       QString namePack = eltPack.attribute("name","none");\r
       QString usePack = eltPack.attribute("use","none");\r
       QDomElement eltPack = nodePack.toElement();\r
       QString namePack = eltPack.attribute("name","none");\r
       QString usePack = eltPack.attribute("use","none");\r

-      out << "use " << nameLib << "." << namePack << "." << usePack << endl;\r
+      out << "use " << nameLib << "." << namePack << "." << usePack << ";" << endl;\r

     }\r
     out << endl;\r
   }\r
     }\r
     out << endl;\r
   }\r


@@ -1485,106 +1501,82 @@ void FunctionalBlock::generateEntityOrComponentBody(QTextStream& out, int indent
 \r
   out << indent << "  port (" << endl;\r
 \r
 \r
   out << indent << "  port (" << endl;\r
 \r

+  QString ports = "";\r
+  QTextStream outPorts(&ports);\r
+\r

   // Generation of the clk & rst signals\r
   // Generation of the clk & rst signals\r

-  out << indent << "    -- clk/rst" << endl;\r
+  outPorts << indent << "    -- clk/rst" << endl;\r

   foreach(AbstractInterface* iface, listInputs) {\r
     if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {\r
   foreach(AbstractInterface* iface, listInputs) {\r
     if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {\r

-      out << indent << "    " << iface->getName() << " : in std_logic;" << endl;\r
+      outPorts << indent << "    " << iface->getName() << " : in std_logic;" << endl;\r

     }\r
   }\r
   foreach(AbstractInterface* iface, listOutputs) {\r
     if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {\r
     }\r
   }\r
   foreach(AbstractInterface* iface, listOutputs) {\r
     if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {\r

-      out << indent << "    " << iface->getName() << " : out std_logic;" << endl;\r
+      outPorts << indent << "    " << iface->getName() << " : out std_logic;" << endl;\r

     }\r
   }\r
 \r
   if (hasController) {\r
     // Generation of the wishbone signals\r
     }\r
   }\r
 \r
   if (hasController) {\r
     // Generation of the wishbone signals\r

-    out << indent << "    -- registers r/w via wishbone" << endl;\r
+    outPorts << indent << "    -- registers r/w via wishbone" << endl;\r

     QList<BlockParameter*> listWB = reference->getWishboneParameters();\r
     for(i=0;i<listWB.size()-1;i++) {\r
     QList<BlockParameter*> listWB = reference->getWishboneParameters();\r
     for(i=0;i<listWB.size()-1;i++) {\r

-      out << indent << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;\r
+      outPorts << indent << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;\r

     }\r
     }\r

-    out << indent << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;\r
+    outPorts << indent << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;\r

   }\r
 \r
   }\r
 \r

-\r
-  int count = 0;\r
-  foreach(AbstractInterface* iface, getInterfaces()) {\r
-    if((iface->getPurpose() == AbstractInterface::Data)||(iface->getPurpose() == AbstractInterface::Control)) count++;\r
-  }\r

   // Generation of the data/control signals\r
 \r
   // Generation of the data/control signals\r
 \r

-  int flag = 0;\r
-  bool first = true;\r
-\r
-  foreach(AbstractInterface* iface, listInputs) {\r
-    if(iface->getPurpose() == AbstractInterface::Data) {\r
-      if (first) {\r
-        out << indent << "    -- input data ports" << endl;\r
-        first = false;\r
-      }\r
-      count--;\r
-      if (count == 0) flag = AbstractInterface::NoComma;\r
-      out << indent << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+  QList<AbstractInterface*> listIface = getInterfaces(AbstractInterface::Input, AbstractInterface::Data);\r
+  if (listIface.size()>0) {\r
+    outPorts << indent << "    -- input data ports" << endl;\r
+    foreach(AbstractInterface* iface, listIface) {\r
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << endl;\r

     }\r
   }\r
     }\r
   }\r

-  first = true;\r
-  foreach(AbstractInterface* iface, listInputs) {\r
-    if(iface->getPurpose() == AbstractInterface::Control) {\r
-      if (first) {\r
-        out << indent << "    -- input control ports" << endl;\r
-        first = false;\r
-      }\r
-      count--;\r
-      if (count == 0) flag = AbstractInterface::NoComma;\r
-      out << indent << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+  listIface = getInterfaces(AbstractInterface::Input, AbstractInterface::Control);\r
+  if (listIface.size()>0) {\r
+    outPorts << indent << "    -- input control ports" << endl;\r
+    foreach(AbstractInterface* iface, listIface) {\r
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << endl;\r

     }\r
   }\r
     }\r
   }\r

-  first = true;\r
-  foreach(AbstractInterface* iface, listOutputs) {\r
-    if(iface->getPurpose() == AbstractInterface::Data) {\r
-      if (first) {\r
-        out << indent << "    -- output data ports" << endl;\r
-        first = false;\r
-      }\r
-      count--;\r
-      if (count == 0) flag = AbstractInterface::NoComma;\r
-      out << indent << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+  listIface = getInterfaces(AbstractInterface::Output, AbstractInterface::Data);\r
+  if (listIface.size()>0) {\r
+    outPorts << indent << "    -- output data ports" << endl;\r
+    foreach(AbstractInterface* iface, listIface) {\r
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << endl;\r

     }\r
   }\r
     }\r
   }\r

-  first = true;\r
-  foreach(AbstractInterface* iface, listOutputs) {\r
-    if(iface->getPurpose() == AbstractInterface::Control) {\r
-      if (first) {\r
-        out << indent << "    -- output control ports" << endl;\r
-        first = false;\r
-      }\r
-      count--;\r
-      if (count == 0) flag = AbstractInterface::NoComma;\r
-      out << indent << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+  listIface = getInterfaces(AbstractInterface::Output, AbstractInterface::Control);\r
+  if (listIface.size()>0) {\r
+    outPorts << indent << "    -- output control ports" << endl;\r
+    foreach(AbstractInterface* iface, listIface) {\r
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << endl;\r

     }\r
   }\r
     }\r
   }\r

-  first = true;\r
-  foreach(AbstractInterface* iface, listBidirs) {\r
-    if(iface->getPurpose() == AbstractInterface::Data) {\r
-      if (first) {\r
-        out << indent << "    -- bidirs data ports" << endl;\r
-        first = false;\r
-      }\r
-      count--;\r
-      if (count == 0) flag = AbstractInterface::NoComma;\r
-      out << indent << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;\r
+  listIface = getInterfaces(AbstractInterface::InOut, AbstractInterface::Data);\r
+  if (listIface.size()>0) {\r
+    outPorts << indent << "    -- bidirs data ports" << endl;\r
+    foreach(AbstractInterface* iface, listIface) {\r
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << endl;\r

     }\r
   }\r
     }\r
   }\r

+\r
+  ports.chop(2);\r
+  ports += "\n";\r
+  out << ports;\r

   out << indent << "    );" << endl << endl;\r
 \r
 }\r
 \r
 void FunctionalBlock::generateArchitecture(QTextStream& out, QDomElement &elt ) throw(Exception) {\r
   out << indent << "    );" << endl << endl;\r
 \r
 }\r
 \r
 void FunctionalBlock::generateArchitecture(QTextStream& out, QDomElement &elt ) throw(Exception) {\r

+  QRegularExpression rxPort("@\\{([a-zA-Z0-9_]+)\\}");\r

   QString expr;\r
   QString code = elt.text();\r
   QString expr;\r
   QString code = elt.text();\r

-  cout << qPrintable(code) << endl;\r
+  //cout << qPrintable(code) << endl;\r

   out << "architecture rtl of " << name << " is" << endl;\r
 \r
   QStringList listLine = code.split("\n");\r
   out << "architecture rtl of " << name << " is" << endl;\r
 \r
   QStringList listLine = code.split("\n");\r


@@ -1610,12 +1602,72 @@ void FunctionalBlock::generateArchitecture(QTextStream& out, QDomElement &elt )
     }\r
 */\r
     if(line.contains("@{")) {\r
     }\r
 */\r
     if(line.contains("@{")) {\r

-      out << line << endl;\r
+      QMap<QString,QString> modifs;\r
+      //cout << qPrintable(line) << endl;\r
+      QRegularExpressionMatchIterator matchPort = rxPort.globalMatch(line);\r
+      while(matchPort.hasNext()) {\r
+        QRegularExpressionMatch m = matchPort.next();\r
+        QString refName = m.captured(1);\r
+        AbstractInterface* refIface = reference->getIfaceFromName(refName);\r
+        QString funName = getIfaceUserName(refIface);\r
+        if (!funName.isEmpty()) {\r
+          modifs.insert(m.captured(0),funName);\r
+          //cout << "replace " << qPrintable(refIface->getName()) << " by " << qPrintable(funIface->getName()) << endl;\r
+        }\r
+      }\r
+      QMapIterator<QString,QString> iterM(modifs);\r
+      while(iterM.hasNext()) {\r
+        iterM.next();\r
+        QString oldName = iterM.key();\r
+        QString newName = iterM.value();\r
+        line.replace(oldName,newName);\r
+      }\r

     }\r
     }\r

+    out << line << endl;\r

   }\r
   }\r

+\r
+  out << "end rtl;" << endl;\r

 }\r
 \r
 void FunctionalBlock::generateController(QTextStream &out) throw(Exception) {\r
   \r
 }\r
 \r
 }\r
 \r
 void FunctionalBlock::generateController(QTextStream &out) throw(Exception) {\r
   \r
 }\r
 \r

+QString FunctionalBlock::getIfaceUserName(AbstractInterface* refIface) {\r
+\r
+  if (! refIface->isReferenceInterface()) return "";\r
+\r
+  AbstractInterface* funcIface = NULL;\r
+\r
+  if (refIface->getDirection() == AbstractInterface::Input) {\r
+    foreach(AbstractInterface* iface, getInputs()) {\r
+      FunctionalInterface* fi = AI_TO_FUN(iface);\r
+      if (fi->getReference() == refIface) {\r
+        funcIface = iface;\r
+        break;\r
+      }\r
+    }\r
+  }\r
+  else if (refIface->getDirection() == AbstractInterface::Output) {\r
+    foreach(AbstractInterface* iface, getOutputs()) {\r
+      FunctionalInterface* fi = AI_TO_FUN(iface);\r
+      if (fi->getReference() == refIface) {\r
+        funcIface = iface;\r
+        break;\r
+      }\r
+    }\r
+  }\r
+  else if (refIface->getDirection() == AbstractInterface::InOut) {\r
+    foreach(AbstractInterface* iface, getBidirs()) {\r
+      FunctionalInterface* fi = AI_TO_FUN(iface);\r
+      if (fi->getReference() == refIface) {\r
+        funcIface = iface;\r
+        break;\r
+      }\r
+    }\r
+  }\r
+  if (funcIface == NULL) return "";\r
+\r
+  return funcIface->getName();\r
+}\r
+\r