X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/48f48e6a26a54751ecd0ab90b10ab972cc5e89cd..4cf57e6db08da791233d75237f62e74bc88dd427:/BlockImplementation.cpp?ds=sidebyside

diff --git a/BlockImplementation.cpp b/BlockImplementation.cpp
index b751021..f71297f 100644
--- a/BlockImplementation.cpp
+++ b/BlockImplementation.cpp
@@ -73,20 +73,31 @@ void BlockImplementation::loadPatterns(QDomElement& root) throw(Exception) {
 }
 
 bool BlockImplementation::checkPatterns() {
-  if (reference == NULL) return false;
+
+
+  if (reference == NULL) {
+    cout << "no ref. while checking patterns of implementation " << endl;
+    return false;
+  }
   
   AbstractInterface* iface;  
   QHashIterator<QString,QString> iterI(consumptionPattern);
   while (iterI.hasNext()) {
     iterI.next();
     iface = reference->getIfaceFromName(iterI.key());
-    if (iface == NULL) return false;
+    if (iface == NULL) {
+      cout << "cannot found an input  ref. iface for impl. iface " << qPrintable(iterI.key()) << endl;
+      return false;
+    }
   }
   QHashIterator<QString,QString> iterO(productionPattern);
   while (iterO.hasNext()) {
     iterO.next();
     iface = reference->getIfaceFromName(iterO.key());
-    if (iface == NULL) return false;
+    if (iface == NULL) {
+      cout << "cannot found an output  ref. iface for impl. iface " << qPrintable(iterI.key()) << endl;
+      return false;
+    }
   }  
   return true;  
 }
@@ -215,17 +226,17 @@ void BlockImplementation::generateLibraries(QDomElement &elt, QTextStream& out)
   for(int i = 0; i < listLib.length(); i++) {
     QDomNode nodeLib = listLib.item(i);
     QDomElement eltLib = nodeLib.toElement();
-    QString nameLib = eltLib.attribute("name", "");
+    QString nameLib = eltLib.attribute("name","none");
     out << "library " << nameLib << ";\n";
     QDomNodeList listPack = eltLib.elementsByTagName("package");
     for(int j = 0; j < listPack.length(); j++) {
       QDomNode nodePack = listPack.item(j);
       QDomElement eltPack = nodePack.toElement();
-      QString namePack = eltPack.attribute("name", "");
-      QString usePack = elt.attribute("use","");
-      out << "use " << nameLib << "." << namePack << "." << usePack << ";\n";
+      QString namePack = eltPack.attribute("name","none");
+      QString usePack = eltPack.attribute("use","none");
+      out << "use " << nameLib << "." << namePack << "." << usePack << endl;
     }
-    out << "\n";
+    out << endl;
   }
 }
 
@@ -233,11 +244,11 @@ void BlockImplementation::generateLibraries(QDomElement &elt, QTextStream& out)
 void BlockImplementation::generateEntity(QTextStream& out, bool hasController) throw(Exception) {
 
   int i=0;
-  nameEnt = reference->getName();
+  nameEnt = block->getName();
   //QList<BlockParameter*> listParams = reference->getParameters();
-  QList<AbstractInterface*> listInputs = reference->getInputs();
-  QList<AbstractInterface*> listOutputs = reference->getOutputs();
-  QList<AbstractInterface*> listBidirs = reference->getBidirs();
+  QList<AbstractInterface*> listInputs = block->getInputs();
+  QList<AbstractInterface*> listOutputs = block->getOutputs();
+  QList<AbstractInterface*> listBidirs = block->getBidirs();
   QString typePort, namePort;
 
   out << "entity " << nameEnt << " is\n";
@@ -246,7 +257,7 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
   /* TODO : rewrite the generation to take into acocunt the new object hierarchy */
 
   // Generation of the generics
-  QList<BlockParameter*> listGenerics = reference->getGenericParameters();
+  QList<BlockParameter*> listGenerics = block->getGenericParameters();
   if ((!listGenerics.isEmpty()) || (hasController)) {
     out << "  generic (" << endl;
     if (hasController) {
@@ -256,9 +267,9 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
       out << endl;
     }
     for(i=0;i<listGenerics.size()-1;i++) {
-      out << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity, 0);
+      out << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;
     }
-    out << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma);
+    out << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;
 
     out << "    );" << endl;
   }
@@ -267,9 +278,9 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
 
   // Generation of the clk & rst signals
   out << "    -- clk/rst" << endl;
-  for(int i = 0; i < listInputs.size(); i++) {
-    if(listInputs.at(i)->getPurpose() == AbstractInterface::Clock || listInputs.at(i)->getPurpose() == AbstractInterface::Reset) {
-      out << "    " << listInputs.at(i)->getName() << " : in std_logic;" << endl;
+  foreach(AbstractInterface* iface, listInputs) {
+    if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {
+      out << "    " << iface->getName() << " : in std_logic;" << endl;
     }
   }
 
@@ -278,55 +289,98 @@ void BlockImplementation::generateEntity(QTextStream& out, bool hasController) t
     out << "    -- registers r/w via wishbone" << endl;
     QList<BlockParameter*> listWB = reference->getWishboneParameters();
     for(i=0;i<listWB.size()-1;i++) {
-      out << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity, 0);
+      out << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;
     }
-    out << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma);
+    out << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;
   }
 
 
-  // Generation of the data signals
-  out << "-- data ports\n";
-  for(int i = 0; i < listInputs.size(); i++) {
-    namePort = getIfaceUserName(reference->AbstractBlock::getIfaceFromName(listInputs.at(i)->getName()));
-    if(listInputs.at(i)->getWidth().compare("1"))
-      typePort = "std_logic";
-    else
-      typePort = calculateWidth(listInputs.at(i)->getWidth());
-    if(listInputs.at(i)->getPurpose() == 1)
-      out << namePort << " : in std_logic_vector(" << typePort << " -1 downto 0) ;\n";
+  int count = 0;
+  foreach(AbstractInterface* iface, block->getInterfaces()) {
+    if((iface->getPurpose() == AbstractInterface::Data)||(iface->getPurpose() == AbstractInterface::Control)) count++;
   }
+  // Generation of the data/control signals
 
-  for(int i = 0; i < listOutputs.size(); i++) {
-    namePort = getIfaceUserName(reference->AbstractBlock::getIfaceFromName(listOutputs.at(i)->getName()));
-    if(listOutputs.at(i)->getWidth().compare("1"))
-      typePort = "std_logic";
-    else
-      typePort = calculateWidth(listOutputs.at(i)->getWidth());
-    if(listOutputs.at(i)->getPurpose() == 1)
-      out << namePort << " : out std_logic_vector(" << typePort << " -1 downto 0) ;\n";
-  }
+  int flag = 0;
+  bool first = true;
 
-  for(int i = 0; i < listBidirs.size(); i++) {
-    namePort = getIfaceUserName(reference->AbstractBlock::getIfaceFromName(listBidirs.at(i)->getName()));
-    if(listBidirs.at(i)->getWidth().compare(("1")))
-      typePort = "std_logic";
-    else
-      typePort = calculateWidth((listBidirs.at(i)->getWidth()));
-    if(listBidirs.at(i)->getPurpose() == 1)
-      out << namePort << " : inout std_logic_vector(" << typePort << " -1 downto 0) ;\n";
+  foreach(AbstractInterface* iface, listInputs) {
+    if(iface->getPurpose() == AbstractInterface::Data) {
+      if (first) {
+        out << "    -- input data ports" << endl;
+        first = false;
+      }
+      count--;
+      if (count == 0) flag = AbstractInterface::NoComma;
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+    }
+  }
+  first = true;
+  foreach(AbstractInterface* iface, listInputs) {
+    if(iface->getPurpose() == AbstractInterface::Control) {
+      if (first) {
+        out << "    -- input control ports" << endl;
+        first = false;
+      }
+      count--;
+      if (count == 0) flag = AbstractInterface::NoComma;
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+    }
+  }
+  first = true;
+  foreach(AbstractInterface* iface, listOutputs) {
+    if(iface->getPurpose() == AbstractInterface::Data) {
+      if (first) {
+        out << "    -- output data ports" << endl;
+        first = false;
+      }
+      count--;
+      if (count == 0) flag = AbstractInterface::NoComma;
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+    }
+  }
+  first = true;
+  foreach(AbstractInterface* iface, listOutputs) {
+    if(iface->getPurpose() == AbstractInterface::Control) {
+      if (first) {
+        out << "    -- output control ports" << endl;
+        first = false;
+      }
+      count--;
+      if (count == 0) flag = AbstractInterface::NoComma;
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+    }
+  }
+  first = true;
+  foreach(AbstractInterface* iface, listBidirs) {
+    if(iface->getPurpose() == AbstractInterface::Data) {
+      if (first) {
+        out << "    -- bidirs data ports" << endl;
+        first = false;
+      }
+      count--;
+      if (count == 0) flag = AbstractInterface::NoComma;
+      out << "    " << iface->toVHDL(AbstractInterface::Entity, flag) << endl;
+    }
   }
+  out << "    );" << endl << endl;
+  out << "end " << nameEnt << ";" << endl << endl;
 }
 
 // This function generates the architecture part of the VHDL document
 void BlockImplementation::generateArchitecture(QDomElement &elt, QTextStream& out) throw(Exception) {
 
   QString expr;
-  QDomElement eltArch = elt.nextSiblingElement("architecture");
-  out << "architecture " << nameEnt <<"_1 of " << nameEnt << "is\n";
-  QString implText = eltArch.text();
-  QStringList listLine = implText.split("\n");
+  QString code = elt.text();
+  cout << qPrintable(code) << endl;
+  out << "architecture rtl of " << nameEnt << " is" << endl;
+
+  QStringList listLine = code.split("\n");
   for(int i =0; i < listLine.size(); i++) {
-    if(listLine.at(i).contains(QRegularExpression("@foreach{")) != -1) {
+    QString line = listLine.at(i).simplified();
+
+    /*
+    if(listLine.at(i).contains(QRegularExpression("@foreach{"))) {
       while(listLine.at(i).compare("@endforeach") != -1) {
         expr = expr + listLine.at(i) + '\n';
         i++;
@@ -334,7 +388,7 @@ void BlockImplementation::generateArchitecture(QDomElement &elt, QTextStream& ou
       expr = expr + listLine.at(i);
       out << evalComplex(expr, 1) << '\n';
     }
-    if(listLine.at(i).contains(QRegularExpression("@caseeach{")) != -1) {
+    if(listLine.at(i).contains(QRegularExpression("@caseeach{"))) {
       while(listLine.at(i).compare("@endcaseeach") != -1) {
         expr = expr + listLine.at(i) + '\n';
         i++;
@@ -342,11 +396,10 @@ void BlockImplementation::generateArchitecture(QDomElement &elt, QTextStream& ou
       expr = expr + listLine.at(i);
       out << evalComplex(expr, 2) << '\n';
     }
-
-    if(listLine.at(i).contains('@') == -1)
-      out << listLine.at(i) << "\n";
-    else
-      out << eval(listLine.at(i), out) << "\n";
+*/
+    if(line.contains("@{")) {
+      out << line << endl;
+    }
   }
 }