finished testbench generation

[blast.git] / ReferenceBlock.cpp

diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index 5137d73f576c7af050a3d82ccd6269c88d9f31cf..56a34dbe9b8d9939a866177f1f78c93a96ce7165 100644 (file)
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -6,23 +6,19 @@
 #include "BlockParameterGeneric.h"
 #include "BlockParameterPort.h"
 #include "BlockParameterWishbone.h"
 #include "BlockParameterGeneric.h"
 #include "BlockParameterPort.h"
 #include "BlockParameterWishbone.h"

+#include "Parameters.h"

 
 

-ReferenceBlock::ReferenceBlock(const QString _xmlFile) : AbstractBlock() {
-  xmlFile = _xmlFile;
+ReferenceBlock::ReferenceBlock(const QString _xmlFile) : AbstractBlock(NULL) {
+  xmlFile = _xmlFile;  

 }
 
 void ReferenceBlock::addCategory(int id) {
  categories.append(id);
 }
 
 }
 
 void ReferenceBlock::addCategory(int id) {
  categories.append(id);
 }
 

-void ReferenceBlock::setBriefDescription(const QString& str) {
+void ReferenceBlock::setDescription(const QString& str) {

   if(str != NULL)
   if(str != NULL)

-    descriptionBrief = str;
-}
-
-void ReferenceBlock::setDetailedDescription(const QString& str) {
-  if(str != NULL)
-    descriptionDetail = str;
+    description = str;

 }
 
 void ReferenceBlock::addImplementation(BlockImplementation *impl) {
 }
 
 void ReferenceBlock::addImplementation(BlockImplementation *impl) {


@@ -44,6 +40,16 @@ void ReferenceBlock::setHashMd5() {
 
 void ReferenceBlock::load(QDomElement &elt) throw(Exception) {
 
 
 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");
 
   cout << "Block : get informations" << endl;  
   QDomElement eltInfo  = elt.firstChildElement("informations");


@@ -74,7 +80,7 @@ void ReferenceBlock::load(QDomElement &elt) throw(Exception) {
 
   // create interfaces that correspond to a wishbone parameter, if any.
   try {
 
   // create interfaces that correspond to a wishbone parameter, if any.
   try {

-    createInterfaceForParameters();    
+    createInterfaceForWishbone();

   }
   catch(int err) {
     throw(err);
   }
   catch(int err) {
     throw(err);


@@ -94,7 +100,7 @@ void ReferenceBlock::loadInformations(QDomElement &elt) throw(Exception) {
   }
   else {
     QDomText txtName = nodeNameTxt.toText();
   }
   else {
     QDomText txtName = nodeNameTxt.toText();

-    name = normalizeName(txtName.data().trimmed());
+    name = Parameters::normalizeName(txtName.data().trimmed());

     cout<< "block name : " << qPrintable(name) << endl;
   }
 
     cout<< "block name : " << qPrintable(name) << endl;
   }
 


@@ -119,28 +125,16 @@ void ReferenceBlock::loadInformations(QDomElement &elt) throw(Exception) {
   // getting description
   cout << "Block info : get description" << endl;  
   QDomElement eltDesc = eltCat.nextSiblingElement("description");
   // 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";
+  // getting text
+  QDomNode nodeTxt = eltDesc.firstChild();
+  if (nodeTxt.isNull()) {
+    description = "no description";

   }
   else {
   }
   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";
-  }
-  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) {
 }
 
 void ReferenceBlock::loadParameters(QDomElement &elt) throw(Exception) {


@@ -222,43 +216,77 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
   QString widthStr;
   QString endianStr;
   QString purposeStr;
   QString widthStr;
   QString endianStr;
   QString purposeStr;

+  QString clockStr;

   int purpose;
   QString multStr;
   int mult;
   int purpose;
   QString multStr;
   int mult;

-  AbstractInterface* inter;
+  ReferenceInterface* iface;

 
   if ((elt.isNull()) || (elt.tagName() != "interfaces")) throw (Exception(BLOCKFILE_CORRUPTED));
 
   QDomElement eltInputs = elt.firstChildElement("inputs");
   // getting each input
   QDomNodeList listNodeInputs = eltInputs.elementsByTagName("input");
 
   if ((elt.isNull()) || (elt.tagName() != "interfaces")) throw (Exception(BLOCKFILE_CORRUPTED));
 
   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();
   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");
+      iface = new ReferenceInterface(this,nameStr,AbstractInterface::Input, AbstractInterface::Clock, "boolean", "1", AbstractInterface::LittleEndian, 1);
+      if (! iface->checkSetClockIface(nameStr)) {
+        throw (Exception(BLOCKFILE_CORRUPTED));
+      }
+      inputs.append(iface);
+      clocks.append(iface);

     }
     }

+  }
+  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");
     purposeStr = eltInput.attribute("purpose","none");

-    cout << "block : " << this->getName().toStdString() << endl;
-    cout << "purpose for " << nameStr.toStdString() << " : " << purposeStr.toStdString() << endl;

     purpose = ReferenceInterface::translatePurpose(purposeStr);
     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));
+      }
+
+      multStr = eltInput.attribute("multiplicity","none");
+      mult = ReferenceInterface::translateMultiplicity(multStr);

 
 

-    inter = new ReferenceInterface(this,nameStr,AbstractInterface::Input, purpose, typeStr, widthStr, endianess, mult);
-    inputs.append(inter);
+      iface = new ReferenceInterface(this,nameStr, AbstractInterface::Input, purpose, typeStr, widthStr, endianess, mult);
+      if (clockStr == "none") {
+        if (clocks.size() > 1) {
+          // if several clocks, the associated one MUST be given
+          throw (Exception(BLOCKFILE_CORRUPTED));
+        }
+        // no clock given, take the single one
+        clockStr = clocks.at(0)->getName();
+      }
+      if (! iface->checkSetClockIface(clockStr)) {
+        throw (Exception(BLOCKFILE_CORRUPTED));
+      }
+      inputs.append(iface);
+    }

   }
   // getting each control
   QDomNodeList listNodeInCtl = eltInputs.elementsByTagName("control");
   }
   // getting each control
   QDomNodeList listNodeInCtl = eltInputs.elementsByTagName("control");


@@ -268,23 +296,29 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     nameStr = eltInput.attribute("iface","none");
     AbstractInterface* dataIface = getIfaceFromName(nameStr);
     if (dataIface == NULL) throw (Exception(BLOCKFILE_CORRUPTED));
     nameStr = eltInput.attribute("iface","none");
     AbstractInterface* dataIface = getIfaceFromName(nameStr);
     if (dataIface == NULL) throw (Exception(BLOCKFILE_CORRUPTED));

-    nameStr = dataIface->getName()+"_enb";
-    inter = new ReferenceInterface(this,nameStr,AbstractInterface::Input, AbstractInterface::Control,"boolean","1", AbstractInterface::LittleEndian, 1);
-    if (!inter->setAssociatedIface(dataIface)) {
+    QString nameEnbStr = dataIface->getName()+"_enb";
+    iface = new ReferenceInterface(this,nameEnbStr,AbstractInterface::Input, AbstractInterface::Control,"boolean","1", AbstractInterface::LittleEndian, 1);
+    if (!iface->setAssociatedIface(dataIface)) {

       throw (Exception(BLOCKFILE_CORRUPTED));      
     }
       throw (Exception(BLOCKFILE_CORRUPTED));      
     }

-    cout << "created a control input named " << qPrintable(inter->getName()) << endl;
-    inputs.append(inter);
+    clockStr = dataIface->getClockIfaceString();
+    if (! iface->checkSetClockIface(clockStr)) {
+      throw (Exception(BLOCKFILE_CORRUPTED));
+    }
+    cout << "created a control input named " << qPrintable(iface->getName()) << endl;
+    inputs.append(iface);

   }
   QDomElement eltOutputs = eltInputs.nextSiblingElement("outputs");
   QDomNodeList listNodeOutputs = eltOutputs.elementsByTagName("output");
   for(int i=0;i<listNodeOutputs.size();i++) {
     QDomNode node = listNodeOutputs.at(i);
     QDomElement eltOutput = node.toElement();
   }
   QDomElement eltOutputs = eltInputs.nextSiblingElement("outputs");
   QDomNodeList listNodeOutputs = eltOutputs.elementsByTagName("output");
   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");
     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;
     int endianess;
     if ((endianStr == "none") || (endianStr == "little")) {
       endianess = AbstractInterface::LittleEndian;


@@ -300,8 +334,20 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     multStr = eltOutput.attribute("multiplicity","none");
     mult = ReferenceInterface::translateMultiplicity(multStr);
 
     multStr = eltOutput.attribute("multiplicity","none");
     mult = ReferenceInterface::translateMultiplicity(multStr);
 

-    inter = new ReferenceInterface(this,nameStr,AbstractInterface::Output, purpose,typeStr,widthStr, endianess, mult);
-    outputs.append(inter);
+    iface = new ReferenceInterface(this,nameStr,AbstractInterface::Output, purpose,typeStr,widthStr, endianess, mult);
+    if (clockStr == "none") {
+      if (clocks.size() > 1) {
+        // if several clocks, the associated one MUST be given
+        throw (Exception(BLOCKFILE_CORRUPTED));
+      }
+      // no clock given, take the single one
+      clockStr = clocks.at(0)->getName();
+    }
+    if (! iface->checkSetClockIface(clockStr)) {
+      throw (Exception(BLOCKFILE_CORRUPTED));
+    }
+
+    outputs.append(iface);

   }
   // getting each control
   QDomNodeList listNodeOutCtl = eltOutputs.elementsByTagName("control");
   }
   // getting each control
   QDomNodeList listNodeOutCtl = eltOutputs.elementsByTagName("control");


@@ -312,12 +358,16 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     AbstractInterface* dataIface = getIfaceFromName(nameStr);
     if (dataIface == NULL) throw (Exception(BLOCKFILE_CORRUPTED));
     nameStr = dataIface->getName()+"_enb";
     AbstractInterface* dataIface = getIfaceFromName(nameStr);
     if (dataIface == NULL) throw (Exception(BLOCKFILE_CORRUPTED));
     nameStr = dataIface->getName()+"_enb";

-    inter = new ReferenceInterface(this,nameStr,AbstractInterface::Output, AbstractInterface::Control,"boolean","1",AbstractInterface::LittleEndian, 1);
-    if (!inter->setAssociatedIface(dataIface)) {
+    iface = new ReferenceInterface(this,nameStr,AbstractInterface::Output, AbstractInterface::Control,"boolean","1",AbstractInterface::LittleEndian, 1);
+    if (!iface->setAssociatedIface(dataIface)) {

       throw (Exception(BLOCKFILE_CORRUPTED));      
     }
       throw (Exception(BLOCKFILE_CORRUPTED));      
     }

-    cout << "created a control output named " << qPrintable(inter->getName()) << endl;
-    outputs.append(inter);
+    clockStr = dataIface->getClockIfaceString();
+    if (! iface->checkSetClockIface(clockStr)) {
+      throw (Exception(BLOCKFILE_CORRUPTED));
+    }
+    cout << "created a control output named " << qPrintable(iface->getName()) << endl;
+    outputs.append(iface);

   }
 
   QDomElement eltBidirs = eltInputs.nextSiblingElement("bidirs");
   }
 
   QDomElement eltBidirs = eltInputs.nextSiblingElement("bidirs");


@@ -329,6 +379,7 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     typeStr = eltBidir.attribute("type","none");
     widthStr = eltBidir.attribute("width","none");
     endianStr = eltBidir.attribute("endian","none");
     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;
     int endianess;
     if ((endianStr == "none") || (endianStr == "little")) {
       endianess = AbstractInterface::LittleEndian;


@@ -344,12 +395,24 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     multStr = eltBidir.attribute("multiplicity","none");
     mult = ReferenceInterface::translateMultiplicity(multStr);
 
     multStr = eltBidir.attribute("multiplicity","none");
     mult = ReferenceInterface::translateMultiplicity(multStr);
 

-    inter = new ReferenceInterface(this,nameStr,AbstractInterface::InOut, purpose,typeStr,widthStr, endianess, mult);
-    bidirs.append(inter);
+    iface = new ReferenceInterface(this,nameStr,AbstractInterface::InOut, purpose,typeStr,widthStr, endianess, mult);
+    if (clockStr == "none") {
+      if (clocks.size() > 1) {
+        // if several clocks, the associated one MUST be given
+        throw (Exception(BLOCKFILE_CORRUPTED));
+      }
+      // no clock given, take the single one
+      clockStr = clocks.at(0)->getName();
+    }
+    if (! iface->checkSetClockIface(clockStr)) {
+      throw (Exception(BLOCKFILE_CORRUPTED));
+    }
+
+    bidirs.append(iface);

   }
 }
 
   }
 }
 

-void ReferenceBlock::createInterfaceForParameters() throw(Exception){
+void ReferenceBlock::createInterfaceForWishbone() throw(Exception){

   ReferenceInterface* iface = NULL;
   foreach(BlockParameter* param, params) {
     
   ReferenceInterface* iface = NULL;
   foreach(BlockParameter* param, params) {
     


@@ -391,8 +454,9 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
 
   toWrite << b.name;
   toWrite << b.xmlFile;
 
   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();
   toWrite << b.categories;
   toWrite << b.hashMd5;
   toWrite << b.params.size();


@@ -417,28 +481,46 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
   }
 
   toWrite << b.inputs.size();
   }
 
   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) {
       toWrite << iface->getName();
       toWrite << iface->getType();
   for(int i=0; i<b.inputs.size(); i++){
     ReferenceInterface *iface = (ReferenceInterface *)(b.inputs.at(i));
     if (iface->getPurpose() == AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();

-      toWrite << iface->getWidth();
+      toWrite << iface->getWidthString();

       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();

+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();

     }
   }
     }
   }

-  // secondly, write other ifaces
+  // thirdly, write other ifaces

   for(int i=0; i<b.inputs.size(); i++){
     ReferenceInterface *iface = (ReferenceInterface *)(b.inputs.at(i));
   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->getName();
       toWrite << iface->getType();

-      toWrite << iface->getWidth();
+      toWrite << iface->getWidthString();

       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();

+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();

     }
   }
   toWrite << b.outputs.size();
     }
   }
   toWrite << b.outputs.size();


@@ -448,10 +530,12 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     if (iface->getPurpose() == AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();
     if (iface->getPurpose() == AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();

-      toWrite << iface->getWidth();
+      toWrite << iface->getWidthString();

       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();

+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();

     }
   }
   // secondly, write other ifaces
     }
   }
   // secondly, write other ifaces


@@ -460,10 +544,12 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     if (iface->getPurpose() != AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();
     if (iface->getPurpose() != AbstractInterface::Control) {
       toWrite << iface->getName();
       toWrite << iface->getType();

-      toWrite << iface->getWidth();
+      toWrite << iface->getWidthString();

       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();
       toWrite << iface->getPurpose();
       toWrite << iface->getDirection();    
       toWrite << iface->getMultiplicity();

+      toWrite << iface->getClockIfaceType();
+      toWrite << iface->getClockIfaceString();

     }
   }
   toWrite << b.bidirs.size();
     }
   }
   toWrite << b.bidirs.size();


@@ -471,10 +557,12 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
     ReferenceInterface *iface = (ReferenceInterface *)(b.bidirs.at(i));
     toWrite << iface->getName();
     toWrite << iface->getType();
     ReferenceInterface *iface = (ReferenceInterface *)(b.bidirs.at(i));
     toWrite << iface->getName();
     toWrite << iface->getType();

-    toWrite << iface->getWidth();
+    toWrite << iface->getWidthString();

     toWrite << iface->getPurpose();
     toWrite << iface->getDirection();    
     toWrite << iface->getMultiplicity();
     toWrite << iface->getPurpose();
     toWrite << iface->getDirection();    
     toWrite << iface->getMultiplicity();

+    toWrite << iface->getClockIfaceType();
+    toWrite << iface->getClockIfaceString();

   }
 
   out << blockData;
   }
 
   out << blockData;


@@ -496,8 +584,9 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
 
   in >> b.name;
   in >> b.xmlFile;
 
   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();
   in >> b.categories;
   in >> b.hashMd5;
   b.params.clear();


@@ -556,13 +645,19 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     iface->setDirection(val);    
     in >> val;
     iface->setMultiplicity(val);
     iface->setDirection(val);    
     in >> val;
     iface->setMultiplicity(val);

+    int clkType;
+    QString clk;
+    in >> clkType;
+    in >> clk;
+    iface->setClockIfaceName(clk);
+    iface->setClockIfaceType(clkType);

     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)) {
     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;

         }      
       }        
     }    
         }      
       }        
     }    


@@ -585,6 +680,12 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     iface->setDirection(val);
     in >> val;   
     iface->setMultiplicity(val);
     iface->setDirection(val);
     in >> val;   
     iface->setMultiplicity(val);

+    int clkType;
+    QString clk;
+    in >> clkType;
+    in >> clk;
+    iface->setClockIfaceName(clk);
+    iface->setClockIfaceType(clkType);

     b.outputs.append(iface);
     if (iface->getPurpose() == AbstractInterface::Data) {
       QString ctlRefName = iface->getName()+"_enb";      
     b.outputs.append(iface);
     if (iface->getPurpose() == AbstractInterface::Data) {
       QString ctlRefName = iface->getName()+"_enb";      


@@ -614,6 +715,12 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     iface->setDirection(val);
     in >> val;    
     iface->setMultiplicity(val);
     iface->setDirection(val);
     in >> val;    
     iface->setMultiplicity(val);

+    int clkType;
+    QString clk;
+    in >> clkType;
+    in >> clk;
+    iface->setClockIfaceName(clk);
+    iface->setClockIfaceType(clkType);

     b.bidirs.append(iface);
   }
 
     b.bidirs.append(iface);
   }
 


@@ -635,3 +742,33 @@ void ReferenceBlock::computeAdmittanceDelays() throw(Exception) {
 }
 
 
 }
 
 

+void ReferenceBlock::generateVHDL(const QString& path) throw(Exception){
+ throw(Exception(INVALID_REFBLOCK_USE));
+}
+
+void ReferenceBlock::generateComments(QTextStream& out, QDomElement &elt, QString coreFile) throw(Exception) {
+  throw(Exception(INVALID_REFBLOCK_USE));
+}
+
+void ReferenceBlock::generateLibraries(QTextStream& out, QDomElement &elt) throw(Exception) {
+  throw(Exception(INVALID_REFBLOCK_USE));
+}
+
+void ReferenceBlock::generateArchitecture(QTextStream& out, QDomElement &elt ) throw(Exception) {
+  throw(Exception(INVALID_REFBLOCK_USE));
+}
+
+void ReferenceBlock::generateController(QTextStream& out) throw(Exception) {
+  throw(Exception(INVALID_REFBLOCK_USE));
+}
+
+void ReferenceBlock::generateEntityOrComponentBody(QTextStream &out, int indentLevel, bool hasController) throw(Exception) {
+  throw(Exception(INVALID_REFBLOCK_USE));
+}
+
+QList<QString> ReferenceBlock::getExternalResources() {
+  QList<QString> list;
+  return list;
+}
+
+