X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/6e2b3026c6a496e81642c373796bd39dad33d2a6..3fb762e7042d9b4a1cf78556ad9ed7f117cc53ba:/ReferenceBlock.cpp?ds=inline

diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index 9d6eb53..9b3959c 100644
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -9,21 +9,16 @@
 #include "Parameters.h"
 
 ReferenceBlock::ReferenceBlock(const QString _xmlFile) : AbstractBlock() {
-  xmlFile = _xmlFile;
+  xmlFile = _xmlFile;  
 }
 
 void ReferenceBlock::addCategory(int id) {
  categories.append(id);
 }
 
-void ReferenceBlock::setBriefDescription(const QString& str) {
+void ReferenceBlock::setDescription(const QString& str) {
   if(str != NULL)
-    descriptionBrief = str;
-}
-
-void ReferenceBlock::setDetailedDescription(const QString& str) {
-  if(str != NULL)
-    descriptionDetail = str;
+    description = str;
 }
 
 void ReferenceBlock::addImplementation(BlockImplementation *impl) {
@@ -45,6 +40,16 @@ void ReferenceBlock::setHashMd5() {
 
 void ReferenceBlock::load(QDomElement &elt) throw(Exception) {
 
+  cout << "Block : get version" << endl;
+  QString verStr = elt.attribute("version","none");
+  QString specialStr = elt.attribute("special","none");
+  if (verStr != "none") {
+    setVersion(verStr);
+  }
+  else {
+    setVersion("0.0");
+  }
+  setSpecialType(getSpecialTypeFromString(specialStr));
 
   cout << "Block : get informations" << endl;  
   QDomElement eltInfo  = elt.firstChildElement("informations");
@@ -120,28 +125,16 @@ void ReferenceBlock::loadInformations(QDomElement &elt) throw(Exception) {
   // getting description
   cout << "Block info : get description" << endl;  
   QDomElement eltDesc = eltCat.nextSiblingElement("description");
-  // getting brief  
-  QDomElement eltBrief = eltDesc.firstChildElement("brief");
-  QDomNode nodeBriefTxt = eltBrief.firstChild();
-  if (nodeBriefTxt.isNull()) {
-    descriptionBrief = "no brief description";
-  }
-  else {
-    QDomText txtBrief = nodeBriefTxt.toText();
-    descriptionBrief = txtBrief.data().trimmed();
-    cout << "block brief desc : " << qPrintable(descriptionBrief) << endl;
-  }
-  // getting detailed  
-  QDomElement eltDetail = eltBrief.nextSiblingElement("detailed");
-  QDomNode nodeDetailTxt = eltDetail.firstChild();
-  if (nodeDetailTxt.isNull()) {
-    descriptionDetail = "no detailed description";
+  // getting text
+  QDomNode nodeTxt = eltDesc.firstChild();
+  if (nodeTxt.isNull()) {
+    description = "no description";
   }
   else {
-    QDomText txtDetail = nodeDetailTxt.toText();
-    descriptionDetail = txtDetail.data().trimmed();
-    cout << "block detail desc : " << qPrintable(descriptionDetail) << endl;
-  }
+    QDomText txtBrief = nodeTxt.toText();
+    description = txtBrief.data().trimmed();
+    cout << "block desc : " << qPrintable(description) << endl;
+  }  
 }
 
 void ReferenceBlock::loadParameters(QDomElement &elt) throw(Exception) {
@@ -223,6 +216,7 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
   QString widthStr;
   QString endianStr;
   QString purposeStr;
+  QString clockStr;
   int purpose;
   QString multStr;
   int mult;
@@ -233,33 +227,59 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
   QDomElement eltInputs = elt.firstChildElement("inputs");
   // getting each input
   QDomNodeList listNodeInputs = eltInputs.elementsByTagName("input");
+
+  // find all input clocks
+  QList<AbstractInterface*> clocks;
   for(int i=0;i<listNodeInputs.size();i++) {
     QDomNode node = listNodeInputs.at(i);
     QDomElement eltInput = node.toElement();
-    nameStr = eltInput.attribute("name","none");
-    typeStr = eltInput.attribute("type","none");
-    widthStr = eltInput.attribute("width","none");
-    endianStr = eltInput.attribute("endian","none");
-    int endianess;
-    if ((endianStr == "none") || (endianStr == "little")) {
-      endianess = AbstractInterface::LittleEndian;
-    }
-    else if (endianStr == "big") {
-      endianess = AbstractInterface::BigEndian;
-    }
-    else {
-      throw (Exception(BLOCKFILE_CORRUPTED));
+    purposeStr = eltInput.attribute("purpose","none");
+    if (purposeStr == "clock") {
+      nameStr = eltInput.attribute("name","none");
+      inter = new ReferenceInterface(this,nameStr,AbstractInterface::Input, AbstractInterface::Clock, "boolean", "1", AbstractInterface::LittleEndian, 1);
+      inputs.append(inter);
+      clocks.append(inter);
     }
+  }
+  cout << "number of clocks: " << clocks.size() << endl;
+
+  // find inputs
+  for(int i=0;i<listNodeInputs.size();i++) {
+    QDomNode node = listNodeInputs.at(i);
+    QDomElement eltInput = node.toElement();
     purposeStr = eltInput.attribute("purpose","none");
-    cout << "block : " << this->getName().toStdString() << endl;
-    cout << "purpose for " << nameStr.toStdString() << " : " << purposeStr.toStdString() << endl;
     purpose = ReferenceInterface::translatePurpose(purposeStr);
-    cout << "translated purpose : " << purpose << endl;
-    multStr = eltInput.attribute("multiplicity","none");
-    mult = ReferenceInterface::translateMultiplicity(multStr);
+    if (purpose != AbstractInterface::Clock) {
+      cout << "translated purpose : " << purpose << endl;
+      nameStr = eltInput.attribute("name","none");
+      typeStr = eltInput.attribute("type","none");
+      widthStr = eltInput.attribute("width","none");
+      endianStr = eltInput.attribute("endian","none");
+      clockStr = eltInput.attribute("clock","none");
+      int endianess;
+      if ((endianStr == "none") || (endianStr == "little")) {
+        endianess = AbstractInterface::LittleEndian;
+      }
+      else if (endianStr == "big") {
+        endianess = AbstractInterface::BigEndian;
+      }
+      else {
+        throw (Exception(BLOCKFILE_CORRUPTED));
+      }
 
-    inter = new ReferenceInterface(this,nameStr,AbstractInterface::Input, purpose, typeStr, widthStr, endianess, mult);
-    inputs.append(inter);
+      multStr = eltInput.attribute("multiplicity","none");
+      mult = ReferenceInterface::translateMultiplicity(multStr);
+
+      inter = new ReferenceInterface(this,nameStr, AbstractInterface::Input, purpose, typeStr, widthStr, endianess, mult);
+      if (clockStr == "none") {
+        // no clock given, take the first one (hope that there is a single one !)
+        clockStr = clocks.at(0)->getName();
+      }
+      if (! inter->setClockIface(clockStr)) {
+        throw (Exception(BLOCKFILE_CORRUPTED));
+      }
+      inputs.append(inter);
+    }
   }
   // getting each control
   QDomNodeList listNodeInCtl = eltInputs.elementsByTagName("control");
@@ -282,10 +302,12 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
   for(int i=0;i<listNodeOutputs.size();i++) {
     QDomNode node = listNodeOutputs.at(i);
     QDomElement eltOutput = node.toElement();
+
     nameStr = eltOutput.attribute("name","none");
     typeStr = eltOutput.attribute("type","none");
     widthStr = eltOutput.attribute("width","none");
     endianStr = eltOutput.attribute("endian","none");
+    clockStr = eltOutput.attribute("clock","none");
     int endianess;
     if ((endianStr == "none") || (endianStr == "little")) {
       endianess = AbstractInterface::LittleEndian;
@@ -302,6 +324,13 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     mult = ReferenceInterface::translateMultiplicity(multStr);
 
     inter = new ReferenceInterface(this,nameStr,AbstractInterface::Output, purpose,typeStr,widthStr, endianess, mult);
+    if (clockStr == "none") {
+      // no clock given, take the first one (hope that there is a single one !)
+      clockStr = clocks.at(0)->getName();
+    }
+    if (! inter->setClockIface(clockStr)) {
+      throw (Exception(BLOCKFILE_CORRUPTED));
+    }
     outputs.append(inter);
   }
   // getting each control
@@ -330,6 +359,7 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     typeStr = eltBidir.attribute("type","none");
     widthStr = eltBidir.attribute("width","none");
     endianStr = eltBidir.attribute("endian","none");
+    clockStr = eltBidir.attribute("clock","none");
     int endianess;
     if ((endianStr == "none") || (endianStr == "little")) {
       endianess = AbstractInterface::LittleEndian;
@@ -346,6 +376,13 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     mult = ReferenceInterface::translateMultiplicity(multStr);
 
     inter = new ReferenceInterface(this,nameStr,AbstractInterface::InOut, purpose,typeStr,widthStr, endianess, mult);
+    if (clockStr == "none") {
+      // no clock given, take the first one (hope that there is a single one !)
+      clockStr = clocks.at(0)->getName();
+    }
+    if (! inter->setClockIface(clockStr)) {
+      throw (Exception(BLOCKFILE_CORRUPTED));
+    }
     bidirs.append(inter);
   }
 }
@@ -392,8 +429,9 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
 
   toWrite << b.name;
   toWrite << b.xmlFile;
-  toWrite << b.descriptionBrief;
-  toWrite << b.descriptionDetail;
+  toWrite << b.specialType;
+  toWrite << b.version;
+  toWrite << b.description;
   toWrite << b.categories;
   toWrite << b.hashMd5;
   toWrite << b.params.size();
@@ -418,7 +456,21 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
   }
 
   toWrite << b.inputs.size();
-  // firstly write control ifaces
+  // firstly write clock ifaces
+  for(int i=0; i<b.inputs.size(); i++){
+    ReferenceInterface *iface = (ReferenceInterface *)(b.inputs.at(i));
+    if (iface->getPurpose() == AbstractInterface::Clock) {
+      toWrite << iface->getName();
+      toWrite << iface->getType();
+      toWrite << iface->getWidthString();
+      toWrite << iface->getPurpose();
+      toWrite << iface->getDirection();
+      toWrite << iface->getMultiplicity();
+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();
+    }
+  }
+  // secondly write control ifaces
   for(int i=0; i<b.inputs.size(); i++){
     ReferenceInterface *iface = (ReferenceInterface *)(b.inputs.at(i));
     if (iface->getPurpose() == AbstractInterface::Control) {
@@ -428,18 +480,22 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();
     }
   }
   // secondly, write other ifaces
   for(int i=0; i<b.inputs.size(); i++){
     ReferenceInterface *iface = (ReferenceInterface *)(b.inputs.at(i));
-    if (iface->getPurpose() != AbstractInterface::Control) {
+    if ((iface->getPurpose() != AbstractInterface::Control) && (iface->getPurpose() != AbstractInterface::Clock)) {
       toWrite << iface->getName();
       toWrite << iface->getType();
       toWrite << iface->getWidthString();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();
     }
   }
   toWrite << b.outputs.size();
@@ -453,6 +509,8 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();
     }
   }
   // secondly, write other ifaces
@@ -465,6 +523,8 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();
     }
   }
   toWrite << b.bidirs.size();
@@ -476,6 +536,8 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     toWrite << iface->getPurpose();
     toWrite << iface->getDirection();    
     toWrite << iface->getMultiplicity();
+    toWrite << iface->getClockIfaceType();
+    toWrite << iface->getClockIfaceString();
   }
 
   out << blockData;
@@ -497,8 +559,9 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
 
   in >> b.name;
   in >> b.xmlFile;
-  in >> b.descriptionBrief;
-  in >> b.descriptionDetail;
+  in >> b.specialType;
+  in >> b.version;
+  in >> b.description;
   in >> b.categories;
   in >> b.hashMd5;
   b.params.clear();
@@ -557,13 +620,24 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     iface->setDirection(val);    
     in >> val;
     iface->setMultiplicity(val);
+    int clkType;
+    QString clk;
+    in >> clkType;
+    in >> clk;
+    if (clkType == AbstractInterface::ParameterName) {
+      clk = "$"+clk;
+    }
+    if (! iface->setClockIface(clk)) {
+      cerr << "Abnormal case while reading a reference block in library: cannot set ref clock for an interface" << endl;
+    }
+
     b.inputs.append(iface);
     if (iface->getPurpose() == AbstractInterface::Data) {
       QString ctlRefName = iface->getName()+"_enb";
       ReferenceInterface* ctlRefIface = AI_TO_REF(b.getIfaceFromName(ctlRefName));      
       if (ctlRefIface != NULL) {        
         if (! ctlRefIface->setAssociatedIface(iface)) {
-          cerr << "Abnormal case while reading a reference block in library" << endl;
+          cerr << "Abnormal case while reading a reference block in library: cannot set associated control interface for data interface" << endl;
         }      
       }        
     }    
@@ -586,6 +660,16 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     iface->setDirection(val);
     in >> val;   
     iface->setMultiplicity(val);
+    int clkType;
+    QString clk;
+    in >> clkType;
+    in >> clk;
+    if (clkType == AbstractInterface::ParameterName) {
+      clk = "$"+clk;
+    }
+    if (! iface->setClockIface(clk)) {
+      cerr << "Abnormal case while reading a reference block in library: cannot set ref clock for an interface" << endl;
+    }
     b.outputs.append(iface);
     if (iface->getPurpose() == AbstractInterface::Data) {
       QString ctlRefName = iface->getName()+"_enb";      
@@ -615,6 +699,16 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     iface->setDirection(val);
     in >> val;    
     iface->setMultiplicity(val);
+    int clkType;
+    QString clk;
+    in >> clkType;
+    in >> clk;
+    if (clkType == AbstractInterface::ParameterName) {
+      clk = "$"+clk;
+    }
+    if (! iface->setClockIface(clk)) {
+      cerr << "Abnormal case while reading a reference block in library: cannot set ref clock for an interface" << endl;
+    }
     b.bidirs.append(iface);
   }
 
@@ -660,3 +754,8 @@ void ReferenceBlock::generateEntityOrComponentBody(QTextStream &out, int indentL
   throw(Exception(INVALID_REFBLOCK_USE));
 }
 
+QList<QString> ReferenceBlock::getExternalResources() {
+  QList<QString> list;
+  return list;
+}
+