X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/bc5d59217a24b25c1b913bec4a41dd026d02720c..e0eaffd44fc9733bc230a803c80d8d5efd0faca6:/ReferenceBlock.cpp

diff --git a/ReferenceBlock.cpp b/ReferenceBlock.cpp
index 553955b..56a34db 100644
--- a/ReferenceBlock.cpp
+++ b/ReferenceBlock.cpp
@@ -80,7 +80,7 @@ void ReferenceBlock::load(QDomElement &elt) throw(Exception) {
 
   // create interfaces that correspond to a wishbone parameter, if any.
   try {
-    createInterfaceForParameters();    
+    createInterfaceForWishbone();
   }
   catch(int err) {
     throw(err);
@@ -220,7 +220,7 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
   int purpose;
   QString multStr;
   int mult;
-  AbstractInterface* inter;
+  ReferenceInterface* iface;
 
   if ((elt.isNull()) || (elt.tagName() != "interfaces")) throw (Exception(BLOCKFILE_CORRUPTED));
 
@@ -236,9 +236,12 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     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);
+      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;
@@ -270,15 +273,19 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
       multStr = eltInput.attribute("multiplicity","none");
       mult = ReferenceInterface::translateMultiplicity(multStr);
 
-      inter = new ReferenceInterface(this,nameStr, AbstractInterface::Input, purpose, typeStr, widthStr, endianess, mult);
+      iface = 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 !)
+        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 (! inter->setClockIface(clockStr)) {
+      if (! iface->checkSetClockIface(clockStr)) {
         throw (Exception(BLOCKFILE_CORRUPTED));
       }
-      inputs.append(inter);
+      inputs.append(iface);
     }
   }
   // getting each control
@@ -289,13 +296,17 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     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));      
     }
-    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");
@@ -323,15 +334,20 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     multStr = eltOutput.attribute("multiplicity","none");
     mult = ReferenceInterface::translateMultiplicity(multStr);
 
-    inter = new ReferenceInterface(this,nameStr,AbstractInterface::Output, purpose,typeStr,widthStr, endianess, mult);
+    iface = 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 !)
+      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 (! inter->setClockIface(clockStr)) {
+    if (! iface->checkSetClockIface(clockStr)) {
       throw (Exception(BLOCKFILE_CORRUPTED));
     }
-    outputs.append(inter);
+
+    outputs.append(iface);
   }
   // getting each control
   QDomNodeList listNodeOutCtl = eltOutputs.elementsByTagName("control");
@@ -342,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";
-    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));      
     }
-    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");
@@ -375,19 +395,24 @@ void ReferenceBlock::loadInterfaces(QDomElement &elt) throw(Exception) {
     multStr = eltBidir.attribute("multiplicity","none");
     mult = ReferenceInterface::translateMultiplicity(multStr);
 
-    inter = new ReferenceInterface(this,nameStr,AbstractInterface::InOut, purpose,typeStr,widthStr, endianess, mult);
+    iface = 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 !)
+      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 (! inter->setClockIface(clockStr)) {
+    if (! iface->checkSetClockIface(clockStr)) {
       throw (Exception(BLOCKFILE_CORRUPTED));
     }
-    bidirs.append(inter);
+
+    bidirs.append(iface);
   }
 }
 
-void ReferenceBlock::createInterfaceForParameters() throw(Exception){
+void ReferenceBlock::createInterfaceForWishbone() throw(Exception){
   ReferenceInterface* iface = NULL;
   foreach(BlockParameter* param, params) {
     
@@ -484,7 +509,7 @@ QDataStream& operator<<(QDataStream &out, const ReferenceBlock &b) {
       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));
     if ((iface->getPurpose() != AbstractInterface::Control) && (iface->getPurpose() != AbstractInterface::Clock)) {
@@ -624,13 +649,8 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     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;
-    }
-
+    iface->setClockIfaceName(clk);
+    iface->setClockIfaceType(clkType);
     b.inputs.append(iface);
     if (iface->getPurpose() == AbstractInterface::Data) {
       QString ctlRefName = iface->getName()+"_enb";
@@ -664,12 +684,8 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     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;
-    }
+    iface->setClockIfaceName(clk);
+    iface->setClockIfaceType(clkType);
     b.outputs.append(iface);
     if (iface->getPurpose() == AbstractInterface::Data) {
       QString ctlRefName = iface->getName()+"_enb";      
@@ -703,12 +719,8 @@ QDataStream& operator>>(QDataStream &in, ReferenceBlock &b) {
     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;
-    }
+    iface->setClockIfaceName(clk);
+    iface->setClockIfaceType(clkType);
     b.bidirs.append(iface);
   }