moved vhdl gen. into block

[blast.git] / AbstractInterface.cpp

diff --git a/AbstractInterface.cpp b/AbstractInterface.cpp
index 76654ff84ec03669c748138dd6b0e1ef448f7aa5..a32f78e6d8c0d5130bcfc1ea48f977a01574bd02 100644 (file)
--- a/AbstractInterface.cpp
+++ b/AbstractInterface.cpp
@@ -1,6 +1,7 @@
 #include "AbstractInterface.h"
 #include "BlockParameterPort.h"
 #include "AbstractBlock.h"
 #include "AbstractInterface.h"
 #include "BlockParameterPort.h"
 #include "AbstractBlock.h"

+#include "Parameters.h"

 
 AbstractInterface::AbstractInterface(AbstractBlock* _owner) {
 
 
 AbstractInterface::AbstractInterface(AbstractBlock* _owner) {
 


@@ -18,7 +19,7 @@ AbstractInterface::AbstractInterface(AbstractBlock* _owner) {
 AbstractInterface::AbstractInterface(AbstractBlock* _owner, const QString& _name, int _direction, int _purpose, const QString& _type, const QString& _width, int _endianess) {
 
   owner = _owner;  
 AbstractInterface::AbstractInterface(AbstractBlock* _owner, const QString& _name, int _direction, int _purpose, const QString& _type, const QString& _width, int _endianess) {
 
   owner = _owner;  

-  name = _name;
+  name = Parameters::normalizeName(_name);

   width = _width;
   direction = _direction;
   purpose = _purpose;
   width = _width;
   direction = _direction;
   purpose = _purpose;


@@ -29,7 +30,7 @@ AbstractInterface::AbstractInterface(AbstractBlock* _owner, const QString& _name
 
 AbstractInterface::AbstractInterface(AbstractInterface* other) {
   owner = NULL;
 
 AbstractInterface::AbstractInterface(AbstractInterface* other) {
   owner = NULL;

-  name = other->name;
+  name = Parameters::normalizeName(other->name);

   type = other->type;
   width = other->width;
   direction = other->direction;
   type = other->type;
   width = other->width;
   direction = other->direction;


@@ -38,6 +39,10 @@ AbstractInterface::AbstractInterface(AbstractInterface* other) {
   associatedIface = NULL;
 }
 
   associatedIface = NULL;
 }
 

+void AbstractInterface::setName(const QString& _name) {
+  name = Parameters::normalizeName(_name);
+}
+

 AbstractInterface::~AbstractInterface() {
 
 }
 AbstractInterface::~AbstractInterface() {
 
 }


@@ -209,15 +214,21 @@ int AbstractInterface::typeFromString(const QString &_type) {
 
 QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
 
 
 QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
 

+

   if (isReferenceInterface()) throw(Exception(IFACE_INVALID_TYPE));
 
   QString msb = width;
   QString ret="";
   bool ok;
   if (isReferenceInterface()) throw(Exception(IFACE_INVALID_TYPE));
 
   QString msb = width;
   QString ret="";
   bool ok;

+    cout << "iface " << qPrintable(name) << " must be evaluated to vhdl :" << qPrintable(msb) << " with type = " << qPrintable(getTypeString()) << endl;
+

   if ((context == BlockParameter::Entity) || (context == BlockParameter::Component)) {
 
     QString formatBool = "%1 : %2 std_logic";
   if ((context == BlockParameter::Entity) || (context == BlockParameter::Component)) {
 
     QString formatBool = "%1 : %2 std_logic";

-    QString formatVector = "%1 : %2 std_logic_vector(%3 downto %4)";
+    QString formatVector = "";
+    if (endianess == LittleEndian) formatVector = "%1 : %2 std_logic_vector(%3 downto %4)";
+    else formatVector = "%1 : %2 std_logic_vector(%4 to %3)";
+

     if ((flags & BlockParameter::NoComma) == 0) {
       formatBool.append(";");
       formatVector.append(";");
     if ((flags & BlockParameter::NoComma) == 0) {
       formatBool.append(";");
       formatVector.append(";");


@@ -233,7 +244,7 @@ QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
       orientation = "inout";
     }
     if (type == Boolean) {
       orientation = "inout";
     }
     if (type == Boolean) {

-      ret = formatVector.arg(name).arg(orientation);
+      ret = formatBool.arg(name).arg(orientation);

     }
     else if (type == Natural) {
       int w = width.toInt(&ok);
     }
     else if (type == Natural) {
       int w = width.toInt(&ok);


@@ -246,6 +257,8 @@ QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
       }
     }
     else if (type == Expression) {
       }
     }
     else if (type == Expression) {

+
+

       /* must check the following conditions :
            - if it contains user/port parameters : must evaluate their numeric value
            - if it contains generic parameters : just remove the $ -> the expression is not arithmetically evaluated.
       /* must check the following conditions :
            - if it contains user/port parameters : must evaluate their numeric value
            - if it contains generic parameters : just remove the $ -> the expression is not arithmetically evaluated.


@@ -255,7 +268,7 @@ QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
       QList<BlockParameter*> listPorts = owner->getPortParameters();
       foreach(BlockParameter* p, listUsers) {
         QString var = "$";
       QList<BlockParameter*> listPorts = owner->getPortParameters();
       foreach(BlockParameter* p, listUsers) {
         QString var = "$";

-        var.append(p->getName());
+        var += p->getName();

         if (width.contains(var)) {
           int w = p->getValue().toInt(&ok);
           if (!ok) throw(Exception(INVALID_VALUE));
         if (width.contains(var)) {
           int w = p->getValue().toInt(&ok);
           if (!ok) throw(Exception(INVALID_VALUE));


@@ -264,18 +277,21 @@ QString AbstractInterface::toVHDL(int context, int flags) throw(Exception) {
       }
       foreach(BlockParameter* p, listPorts) {
         QString var = "$";
       }
       foreach(BlockParameter* p, listPorts) {
         QString var = "$";

-        var.append(p->getName());
+        var += p->getName();
+        if (width.contains(var)) {          
+          msb.replace(var,p->toVHDL(0,0));
+        }
+      }
+      foreach(BlockParameter* p, listGenerics) {
+        QString var = "$";
+        var += p->getName();

         if (width.contains(var)) {
         if (width.contains(var)) {

-          BlockParameterPort* pp = (BlockParameterPort*)p;
-          AbstractInterface* iface = owner->getIfaceFromName(pp->getIfaceName());
-
-          int w = p->getValue().toInt(&ok);
-          if (!ok) throw(Exception(INVALID_VALUE));
-          msb.replace(var,p->getValue().toString());
+          msb.replace(var,p->getName());

         }
       }
         }
       }

-
-      ret = formatVector.arg(name).arg(orientation).arg("toto").arg("0");
+      msb += "-1";
+      cout << "iface size :" << qPrintable(msb) << endl;
+      ret = formatVector.arg(name).arg(orientation).arg(msb).arg("0");

     }
   }
   return ret;
     }
   }
   return ret;