X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/blast.git/blobdiff_plain/18fecf25efe710631fabecbb9f689c2997fdfe18..refs/heads/master:/FunctionalBlock.cpp?ds=inline

diff --git a/FunctionalBlock.cpp b/FunctionalBlock.cpp
index 2d455db..98e5e87 100644
--- a/FunctionalBlock.cpp
+++ b/FunctionalBlock.cpp
@@ -8,7 +8,7 @@
 #include "ArithmeticEvaluator.h"
 
 
-FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference) throw(Exception) :  AbstractBlock() {
+FunctionalBlock::FunctionalBlock(Graph *_graph, GroupBlock *_parent, ReferenceBlock *_reference, bool createIfaces) throw(Exception) :  AbstractBlock(_graph) {
   //if (! _reference->isReferenceBlock()) throw(Exception(BLOCK_INVALID_TYPE));
   //if (! _group->isGroupBlock()) throw(Exception(BLOCK_INVALID_TYPE));
   reference = _reference;
@@ -30,6 +30,17 @@ FunctionalBlock::FunctionalBlock(GroupBlock *_parent, ReferenceBlock *_reference
   delta = -1;
   evaluator = NULL;
 
+  BlockParameter* p;
+  // create parameters from reference block
+  QList<BlockParameter*> lstParam = reference->getParameters();
+  for(int i=0;i<lstParam.size();i++) {
+    p = lstParam.at(i)->clone();
+    addParameter(p);
+  }
+
+  if (createIfaces) {
+    populate();
+  }
 }
 
 FunctionalBlock::~FunctionalBlock() {
@@ -61,23 +72,15 @@ bool FunctionalBlock::isFunctionalBlock() {
   return true;
 }
 
-bool FunctionalBlock::isSourceBlock() {
+bool FunctionalBlock::isStimuliBlock() {
   if (parent == NULL) return true;
   return false;
 }
 
 void FunctionalBlock::populate() {
-  int i;
-  BlockParameter* p;
-  AbstractInterface* inter;
-
-  // create parameters from reference block
-  QList<BlockParameter*> lstParam = reference->getParameters();
-  for(i=0;i<lstParam.size();i++) {
-    p = lstParam.at(i)->clone();
-    addParameter(p);
-  }
+  int i;  
 
+  AbstractInterface* inter;
   ConnectedInterface* toClk = NULL;
   ConnectedInterface* toRst = NULL;
   // create interfaces from reference block
@@ -96,7 +99,7 @@ void FunctionalBlock::populate() {
     addInterface(inter);
     /* WARNING FOR THE FUTURE :
        in case of there are several clock interfaces ofr that block
-       it would be a godd idea to make the user choose which one
+       it would be a good idea to make the user choose which one
        must be connected to defautl clk.
        Presently, the first encountered is chosen
      */
@@ -122,18 +125,6 @@ void FunctionalBlock::populate() {
       }       
     }
   }
-
-  // connect clk and rst to group clk/rst or to clkrstgen
-  if ((name != "clkrstgen") && (parent != NULL)) {
-    try {
-      connectClkReset();
-    }
-    catch(Exception e) {
-      AbstractBlock* source = (AbstractBlock *)(e.getSource());
-      cerr << qPrintable(source->getName()) << ":" << qPrintable(e.getMessage()) << endl;
-      throw(e);
-    }
-  }
 }
 
 QString FunctionalBlock::getReferenceXmlFile() {
@@ -149,10 +140,12 @@ void FunctionalBlock::createPatterns() throw(Exception) {
 #ifdef DEBUG_FCTNAME
   cout << "call to " << qPrintable(fctName) << endl;
 #endif
+
+  if (implementation->hasNoPatterns()) return;
   
   cout << "create patterns for block " << qPrintable(name) << endl;
   if (evaluator == NULL) evaluator = new ArithmeticEvaluator();
-  if (! isGeneratorBlock()) {
+  if (! isSourceBlock()) {
     try {
       createDelta();
       createConsumptionPattern();    
@@ -439,12 +432,17 @@ QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *o
       catch(Exception e) {
         throw(e);
       }
+      if (repeat == 0) {
+        // remove the last
+        patternOut.removeLast();
+      }
+      else {
       // repeat just the last value in currentGroup
-      char last = patternOut.last();
-      //cout << "repeat last char " << repeat << " times : " << (int)last << endl;
-      
-      for(int i=1;i<(int)repeat;i++) {
-        patternOut.append(last);
+        char last = patternOut.last();
+        //cout << "repeat last char " << repeat << " times : " << (int)last << endl;
+        for(int i=1;i<(int)repeat;i++) {
+          patternOut.append(last);
+        }
       }
     }    
     *offset += 1;
@@ -468,15 +466,21 @@ QList<char> FunctionalBlock::expandPatternRecur(const QString& patternIn, int *o
     catch(Exception e) {
       throw(e);
     }
-    /*
+    if (repeat == 0) {
+      QList<char> voidList;
+      return voidList;
+    }
+    else {
+      /*
     cout << "repeat last group " << repeat << " times : ";
     foreach (char c, currentGroup) cout <<(int)c;
-    cout << endl;  
+    cout << endl;
     */
-    QList<char> single = patternOut;
-    for(int i=1;i<(int)repeat;i++) {
-      patternOut.append(single);
-    }    
+      QList<char> single = patternOut;
+      for(int i=1;i<(int)repeat;i++) {
+        patternOut.append(single);
+      }
+    }
   }  
   return patternOut;
 }
@@ -664,6 +668,7 @@ void FunctionalBlock::createInputPattern()  throw(Exception) {
   cout << "call to " << qPrintable(fctName) << endl;
 #endif
   
+  cout << "creating input pattern" << endl;
   lengthIP = -1;
   foreach(AbstractInterface* iface, getControlInputs()) {
 
@@ -841,125 +846,113 @@ void FunctionalBlock::computeOutputPattern(int nbExec) throw(Exception) {
 
   clearOutputPattern();
 
-  /* case 1: the block is a generator for which output pattern
-     must be computed for a nbExec following executions
-  */
+  if (specialType != NotSpecial) {
+    cerr << "Abnormal case: the block is special and output pattern is computed normally" << endl;
+    throw(Exception(INVALID_FUNBLOCK_USE,this));
+  }
 
-  if (nbExec > 0) {
-    cout << "computing output pattern of " << qPrintable(name) << " for " << nbExec << " executions" << endl;
-    foreach(AbstractInterface* iface, getControlOutputs()) {
-      FunctionalInterface* connIface = AI_TO_FUN(iface);
-      // create output pattern
-      QList<char>* pp = productionPattern.value(connIface);
-      QList<char>* pattern = new QList<char>(*pp);
-      for(int i=1;i<nbExec;i++) pattern->append(*pp);
-      // assign pattern to interface
-      connIface->setOutputPattern(pattern);
-      // store it in QMap
-      outputPattern.insert(connIface,pattern);      
+  cout << "computing output pattern of " << qPrintable(name) << endl;
+
+  // in case of inputPattern not created, do it
+  if (lengthIP <= 0) {
+
+    cout << "Strange case: input pattern is not created while it is time to compute output pattern !" << endl;
+    // collect the input patterns for each input
+    try {
+      createInputPattern();
     }
+    catch(Exception e) {
+      throw(e);
+    }
+    cout << "input pattern array initialized with min. len " << lengthIP << endl;
   }
-  else {
-    cout << "computing output pattern of " << qPrintable(name) << endl;
-    
-    // in case of inputPattern not created, do it
-    if (lengthIP <= 0) {
 
-      cout << "Strange case: input pattern is not created while it is time to compute output pattern !" << endl;
-      // collect the input patterns for each input    
-      try {
-        createInputPattern();
-      }
-      catch(Exception e) {
-        throw(e);
+  // initialize the output pattern
+  lengthOP = 0;
+  foreach(AbstractInterface* iface, getControlOutputs()) {
+    FunctionalInterface* connIface = AI_TO_FUN(iface);
+    lengthOP = lengthIP+productionPattern.value(connIface)->size();
+    QList<char>* pattern = new QList<char>();
+    for(int i=0;i<lengthOP;i++) pattern->append(0);
+    connIface->setOutputPattern(pattern);
+    outputPattern.insert(connIface,pattern);
+  }
+  cout << "output pattern array initialized" << endl;
+
+  int clock = 0;
+  nbExec = 0;
+  // search for the beginning of the first execution.
+  while ((clock < lengthIP) && (! isValidDataGroup(inputPattern,clock))) clock++;
+  cout << "found 1st exec clock: " << clock << endl;
+
+  while (clock < lengthIP) {
+    // initialize counters for current execution.
+    int p = 0; // index in production pattern
+    int o = 0; // clock+o will give the clock cycle of each output group
+    int cip = 0; // clock+cip give the clock cycle of an input group
+    int ccp = 0; // ccp give a column in the consumptio pattern
+    int nip = 0; // number of input data groups already consumed during the current execution, used while exploring IP
+    int ncp = 0; // number of input data groups already consumed during the current execution, used while exploring CP
+    bool cannotCompleteExec = false;
+    for(int m=0;m<productionCounter.size();m++) {
+      // search for the first production in PP
+      while (!isValidDataGroup(productionPattern,p)) {
+        p += 1;
+        o += 1;
       }
-      cout << "input pattern array initialized with min. len " << lengthIP << endl;
-    }
-    
-    // initialize the output pattern    
-    lengthOP = 0;
-    foreach(AbstractInterface* iface, getControlOutputs()) {
-      FunctionalInterface* connIface = AI_TO_FUN(iface);      
-      lengthOP = lengthIP+productionPattern.value(connIface)->size();
-      QList<char>* pattern = new QList<char>();
-      for(int i=0;i<lengthOP;i++) pattern->append(0);
-      connIface->setOutputPattern(pattern);
-      outputPattern.insert(connIface,pattern);
-    }
-    cout << "output pattern array initialized" << endl;
-    
-    int clock = 0;
-    nbExec = 0;
-    // search for the beginning of the first execution.
-    while ((clock < lengthIP) && (! isValidDataGroup(inputPattern,clock))) clock++;
-    cout << "found 1st exec clock: " << clock << endl;
-    
-    while (clock < lengthIP) {
-      // initialize counters for current execution.
-      int p = 0; // index in production pattern
-      int o = 0; // clock+o will give the clock cycle of each output group
-      int cip = 0; // clock+cip give the clock cycle of an input group
-      int ccp = 0; // ccp give a column in the consumptio pattern
-      int nip = 0; // number of input data groups already consumed during the current execution, used while exploring IP
-      int ncp = 0; // number of input data groups already consumed during the current execution, used while exploring CP
-      bool cannotCompleteExec = false;
-      for(int m=0;m<productionCounter.size();m++) {
-        // search for the first production in PP
-        while (!isValidDataGroup(productionPattern,p)) {
-          p += 1;
-          o += 1;
+      int gap = 0; // count the number of extra null columns
+      // search for PC(m) valid input group in IP
+      while (nip < productionCounter.at(m)) {
+        if (clock+cip < lengthIP) {
+          if (isValidDataGroup(inputPattern,clock+cip)) nip += 1;
+          cip += 1;
+          gap += 1;
         }
-        int gap = 0; // count the number of extra null columns
-        // search for PC(m) valid input group in IP
-        while (nip < productionCounter.at(m)) {
-          if (clock+cip < lengthIP) {
-            if (isValidDataGroup(inputPattern,clock+cip)) nip += 1;
-            cip += 1;
-            gap += 1;
-          }
-          else {
-            cannotCompleteExec = true;
-            break;
-          }        
-        }        
-        
-        if (cannotCompleteExec) break; // no need to go further since the next search of input data group will lead to go outside inputPattern
-        
-        // search for PC(m) valid input group in IP
-        while (ncp < productionCounter.at(m)) {
-          if (isValidDataGroup(consumptionPattern,ccp)) ncp += 1;
-          ccp += 1;
-          gap -= 1;
+        else {
+          cannotCompleteExec = true;
+          break;
         }
-        o += gap; // to take into acocunt of extra null columns
-        combinePatterns(productionPattern,p,outputPattern,clock+o);
-        p += 1;
-        o += 1;
       }
-      
+
       if (cannotCompleteExec) break; // no need to go further since the next search of input data group will lead to go outside inputPattern
-      
-      // current exec. taken into accunt
-      nbExec += 1;
-      
-      // search for the next exec.
-      clock += 1;      
-      nip = 0;
-      while ((clock < lengthIP) && (nip < delta)) {
-        if (isValidDataGroup(inputPattern,clock)) nip += 1;
-        if (nip < delta) clock += 1;
+
+      // search for PC(m) valid input group in IP
+      while (ncp < productionCounter.at(m)) {
+        if (isValidDataGroup(consumptionPattern,ccp)) ncp += 1;
+        ccp += 1;
+        gap -= 1;
       }
-      cout << "found exec " << nbExec << " at clock: " << clock << endl;
+      o += gap; // to take into acocunt of extra null columns
+      combinePatterns(productionPattern,p,outputPattern,clock+o);
+      p += 1;
+      o += 1;
     }
-    // find the last valid output data group
-    while(! isValidDataGroup(outputPattern,lengthOP-1)) {
-      removeDataGroup(outputPattern,lengthOP-1);
-      lengthOP -= 1;
+
+    if (cannotCompleteExec) break; // no need to go further since the next search of input data group will lead to go outside inputPattern
+
+    // current exec. taken into accunt
+    nbExec += 1;
+
+    // search for the next exec.
+    clock += 1;
+    nip = 0;
+    while ((clock < lengthIP) && (nip < delta)) {
+      if (isValidDataGroup(inputPattern,clock)) nip += 1;
+      if (nip < delta) clock += 1;
     }
+    cout << "found exec " << nbExec << " at clock: " << clock << endl;
+  }
+  // find the last valid output data group
+  while(! isValidDataGroup(outputPattern,lengthOP-1)) {
+    removeDataGroup(outputPattern,lengthOP-1);
+    lengthOP -= 1;
+  }
+
+  // clear input pattern
+  clearInputPattern();
+
+  setOutputPatternComputed(true);
 
-    // clear input pattern
-    clearInputPattern();
-  }  
 }
 
 /*
@@ -1313,9 +1306,23 @@ int FunctionalBlock::createTriggers() {
   return triggers.size();
 }
 
+QList<QString> FunctionalBlock::getExternalResources() {
+
+  BlockImplementation* impl = reference->getImplementations().at(0); // for now only take first impl available
+  QList<QString> list = impl->getResources();
+  foreach(QString s, list) {
+    cout << qPrintable(s) << " ";
+  }
+  cout << endl;
+
+  return list;
+}
+
+
 void FunctionalBlock::generateVHDL(const QString& path) throw(Exception){
     
-  BlockImplementation* impl = reference->getImplementations().at(0); // for now only take first impl available
+  BlockImplementation* impl = reference->getImplementations().at(0); // for now only take first impl available  
+
   QFile implFile(impl->getXmlFile());
 
   // reading in into QDomDocument
@@ -1405,23 +1412,29 @@ void FunctionalBlock::generateComments(QTextStream& out, QDomElement &elt, QStri
   QString mail = eltAuthor.attribute("mail","");
   out << "--  Author(s)   : "<<firstName+" "<<lastName<<" ("<<mail<<")" << endl;
   out << "--" << endl;
-  QDomElement eltDate = eltAuthor.nextSiblingElement("date");
-  QString crea = eltDate.attribute("creation","");
+  QDomElement eltLog = eltAuthor.nextSiblingElement("log");
+  QString crea = eltLog.attribute("creation","");
   out << "--  Creation Date   : "<<crea<< endl;
   out << "--" << endl;
-  QDomElement eltRelated = eltDate.nextSiblingElement("related_files");
-  QString relateds = eltRelated.attribute("list","");
-  out << "--  Related files   :\n"<<relateds<<endl;
-  out << "--" << endl;
-  QDomElement eltDesc = eltRelated.nextSiblingElement("description");
-  QDomElement desc = eltDesc.firstChildElement();
-  QString descTxt = desc.text();
-  out << "--  Decription      :\n"<<descTxt<<endl;
+  QDomNodeList listModifs = eltLog.elementsByTagName("modification");
+  for(int j=0;j<listModifs.length();j++) {
+    QDomNode nodeModif = listModifs.at(j);
+    QDomElement eltModif = nodeModif.toElement();
+  }
+  out << "-- Description   : " << endl;
+  QStringList lines = reference->getDescription().split("\n");
+  foreach(QString line, lines) {
+    out << "--   " << line << endl;
+  }
   out << "--" << endl;
-  QDomElement eltNote = eltDesc.nextSiblingElement("description");
+  QDomElement eltNote = eltLog.nextSiblingElement("notes");
   QDomElement note = eltNote.firstChildElement();
   QString noteTxt = note.text();
-  out << "--  Note          :\n"<<noteTxt<<endl;
+  out << "--  Notes          :" << endl;
+  lines = noteTxt.split("\n");
+  foreach(QString line, lines) {
+    out << "--   " << line << endl;
+  }
   out << "--" << endl;
   for(int i = 0; i < 50; i++) {
     out << "--";
@@ -1443,142 +1456,122 @@ void FunctionalBlock::generateLibraries(QTextStream& out, QDomElement &elt) thro
       QDomElement eltPack = nodePack.toElement();
       QString namePack = eltPack.attribute("name","none");
       QString usePack = eltPack.attribute("use","none");
-      out << "use " << nameLib << "." << namePack << "." << usePack << endl;
+      out << "use " << nameLib << "." << namePack << "." << usePack << ";" << endl;
     }
     out << endl;
   }
 }
 
-void FunctionalBlock::generateEntity(QTextStream& out, bool hasController) throw(Exception) {
+
+void FunctionalBlock::generateEntityOrComponentBody(QTextStream& out, int indentLevel, bool hasController) throw(Exception) {
 
   int i=0;
+  QString indent = "";
+  for(i=0;i<indentLevel;i++) {
+    indent += " ";
+  }
   
   //QList<BlockParameter*> listParams = reference->getParameters();
   QList<AbstractInterface*> listInputs = getInputs();
   QList<AbstractInterface*> listOutputs = getOutputs();
-  QList<AbstractInterface*> listBidirs = getBidirs();
-  QString typePort, namePort;
-
-  out << "entity " << name << " is" << endl;
-
-
-  /* TODO : rewrite the generation to take into acocunt the new object hierarchy */
+  QList<AbstractInterface*> listBidirs = getBidirs();    
 
   // Generation of the generics
   QList<BlockParameter*> listGenerics = getGenericParameters();
   if ((!listGenerics.isEmpty()) || (hasController)) {
-    out << "  generic (" << endl;
+    out << indent << "  generic (" << endl;
     if (hasController) {
-      out << "    wb_data_width : integer = 16;" << endl;
-      out << "    wb_addr_width : integer = 12";
-      if (!listGenerics.isEmpty()) out << ";";
+      out << indent << "    wb_data_width : integer = 16;" << endl;
+      out << indent << "    wb_addr_width : integer = 12";
+      if (!listGenerics.isEmpty()) out << indent << ";";
       out << endl;
     }
     for(i=0;i<listGenerics.size()-1;i++) {
-      out << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;
+      out << indent << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;
     }
-    out << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;
+    out << indent << "    " << listGenerics.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;
 
-    out << "    );" << endl;
+    out << indent << "    );" << endl;
   }
 
-  out << "  port (" << endl;
+  out << indent << "  port (" << endl;
+
+  QString ports = "";
+  QTextStream outPorts(&ports);
 
   // Generation of the clk & rst signals
-  out << "    -- clk/rst" << endl;
+  outPorts << indent << "    -- clk/rst" << endl;
   foreach(AbstractInterface* iface, listInputs) {
     if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {
-      out << "    " << iface->getName() << " : in std_logic;" << endl;
+      outPorts << indent << "    " << iface->getName() << " : in std_logic;" << endl;
+    }
+  }
+  foreach(AbstractInterface* iface, listOutputs) {
+    if(iface->getPurpose() == AbstractInterface::Clock || iface->getPurpose() == AbstractInterface::Reset) {
+      outPorts << indent << "    " << iface->getName() << " : out std_logic;" << endl;
     }
   }
 
   if (hasController) {
     // Generation of the wishbone signals
-    out << "    -- registers r/w via wishbone" << endl;
+    outPorts << indent << "    -- 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) << endl;
+      outPorts << indent << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity, 0) << endl;
     }
-    out << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;
+    outPorts << indent << "    " << listWB.at(i)->toVHDL(BlockParameter::Entity,BlockParameter::NoComma) << endl;
   }
 
-
-  int count = 0;
-  foreach(AbstractInterface* iface, getInterfaces()) {
-    if((iface->getPurpose() == AbstractInterface::Data)||(iface->getPurpose() == AbstractInterface::Control)) count++;
-  }
   // Generation of the data/control signals
 
-  int flag = 0;
-  bool first = true;
-
-  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;
+  QList<AbstractInterface*> listIface = getInterfaces(AbstractInterface::Input, AbstractInterface::Data);
+  if (listIface.size()>0) {
+    outPorts << indent << "    -- input data ports" << endl;
+    foreach(AbstractInterface* iface, listIface) {
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << 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;
+  listIface = getInterfaces(AbstractInterface::Input, AbstractInterface::Control);
+  if (listIface.size()>0) {
+    outPorts << indent << "    -- input control ports" << endl;
+    foreach(AbstractInterface* iface, listIface) {
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << 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;
+  listIface = getInterfaces(AbstractInterface::Output, AbstractInterface::Data);
+  if (listIface.size()>0) {
+    outPorts << indent << "    -- output data ports" << endl;
+    foreach(AbstractInterface* iface, listIface) {
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << 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;
+  listIface = getInterfaces(AbstractInterface::Output, AbstractInterface::Control);
+  if (listIface.size()>0) {
+    outPorts << indent << "    -- output control ports" << endl;
+    foreach(AbstractInterface* iface, listIface) {
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << 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;
+  listIface = getInterfaces(AbstractInterface::InOut, AbstractInterface::Data);
+  if (listIface.size()>0) {
+    outPorts << indent << "    -- bidirs data ports" << endl;
+    foreach(AbstractInterface* iface, listIface) {
+      outPorts << indent << "    " << iface->toVHDL(AbstractInterface::Entity, 0) << endl;
     }
   }
-  out << "    );" << endl << endl;
-  out << "end " << name << ";" << endl << endl;
+
+  ports.chop(2);
+  ports += "\n";
+  out << ports;
+  out << indent << "    );" << endl << endl;
+
 }
 
 void FunctionalBlock::generateArchitecture(QTextStream& out, QDomElement &elt ) throw(Exception) {
+  QRegularExpression rxPort("@\\{([a-zA-Z0-9_]+)\\}");
   QString expr;
   QString code = elt.text();
-  cout << qPrintable(code) << endl;
+  //cout << qPrintable(code) << endl;
   out << "architecture rtl of " << name << " is" << endl;
 
   QStringList listLine = code.split("\n");
@@ -1604,12 +1597,72 @@ void FunctionalBlock::generateArchitecture(QTextStream& out, QDomElement &elt )
     }
 */
     if(line.contains("@{")) {
-      out << line << endl;
+      QMap<QString,QString> modifs;
+      //cout << qPrintable(line) << endl;
+      QRegularExpressionMatchIterator matchPort = rxPort.globalMatch(line);
+      while(matchPort.hasNext()) {
+        QRegularExpressionMatch m = matchPort.next();
+        QString refName = m.captured(1);
+        AbstractInterface* refIface = reference->getIfaceFromName(refName);
+        QString funName = getIfaceUserName(refIface);
+        if (!funName.isEmpty()) {
+          modifs.insert(m.captured(0),funName);
+          //cout << "replace " << qPrintable(refIface->getName()) << " by " << qPrintable(funIface->getName()) << endl;
+        }
+      }
+      QMapIterator<QString,QString> iterM(modifs);
+      while(iterM.hasNext()) {
+        iterM.next();
+        QString oldName = iterM.key();
+        QString newName = iterM.value();
+        line.replace(oldName,newName);
+      }
     }
+    out << line << endl;
   }
+
+  out << "end rtl;" << endl;
 }
 
 void FunctionalBlock::generateController(QTextStream &out) throw(Exception) {
   
 }
 
+QString FunctionalBlock::getIfaceUserName(AbstractInterface* refIface) {
+
+  if (! refIface->isReferenceInterface()) return "";
+
+  AbstractInterface* funcIface = NULL;
+
+  if (refIface->getDirection() == AbstractInterface::Input) {
+    foreach(AbstractInterface* iface, getInputs()) {
+      FunctionalInterface* fi = AI_TO_FUN(iface);
+      if (fi->getReference() == refIface) {
+        funcIface = iface;
+        break;
+      }
+    }
+  }
+  else if (refIface->getDirection() == AbstractInterface::Output) {
+    foreach(AbstractInterface* iface, getOutputs()) {
+      FunctionalInterface* fi = AI_TO_FUN(iface);
+      if (fi->getReference() == refIface) {
+        funcIface = iface;
+        break;
+      }
+    }
+  }
+  else if (refIface->getDirection() == AbstractInterface::InOut) {
+    foreach(AbstractInterface* iface, getBidirs()) {
+      FunctionalInterface* fi = AI_TO_FUN(iface);
+      if (fi->getReference() == refIface) {
+        funcIface = iface;
+        break;
+      }
+    }
+  }
+  if (funcIface == NULL) return "";
+
+  return funcIface->getName();
+}
+