Changeset 137 for trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h

Timestamp:

Feb 16, 2010, 1:35:48 PM (14 years ago)

Author:

rosiere

Message:

Various modif (add test, and vhdl)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h (modified) (6 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h

@@ -337 +337 @@
     for (uint32_t it1=0; it1<iterator_1; it1++)                         \
       {                                                                 \
-        interface [it1] = _interfaces->set_interface( name+separator+toString(it1), direction, localisation, str); \
+        interface [it1] = _interfaces->set_interface(((toString(name)!="")?(name+separator):"")+toString(it1), direction, localisation, str); \
       }                                                                 \
   }
@@ -351 +351 @@
     for (uint32_t it1=0; it1<iterator_1; it1++)                         \
       {                                                                 \
-        interface [it1] = _interfaces->set_interface( name+separator+toString(it1)); \
+        interface [it1] = _interfaces->set_interface(((toString(name)!="")?(name+separator):"")+toString(it1)); \
       }                                                                 \
   }
@@ -559 +559 @@
         for (uint32_t it2=0; it2<iterator_2; it2++)                     \
           {                                                             \
-            interface [it1][it2] = _interfaces->set_interface( name+separator+toString(it1)+separator+toString(it2), direction, localisation, str); \
+            interface [it1][it2] = _interfaces->set_interface(((toString(name)!="")?(name+separator):"")+toString(it1)+separator+toString(it2), direction, localisation, str); \
           }                                                             \
       }                                                                 \
@@ -579 +579 @@
         for (uint32_t it2=0; it2<iterator_2; it2++)                     \
           {                                                             \
-            interface [it1][it2] = _interfaces->set_interface( name+separator+toString(it1)+separator+toString(it2)); \
+            interface [it1][it2] = _interfaces->set_interface(((toString(name)!="")?(name+separator):"")+toString(it1)+separator+toString(it2)); \
           }                                                             \
       }                                                                 \
@@ -849 +849 @@
             for (uint32_t it3=0; it3<iterator_3; it3++)                 \
               {                                                         \
-                interface [it1][it2][it3] = _interfaces->set_interface( name+separator+toString(it1)+separator+toString(it2)+separator+toString(it3), direction, localisation, str); \
+                interface [it1][it2][it3] = _interfaces->set_interface(((toString(name)!="")?(name+separator):"")+toString(it1)+separator+toString(it2)+separator+toString(it3), direction, localisation, str); \
               }                                                         \
           }                                                             \
@@ -875 +875 @@
             for (uint32_t it3=0; it3<iterator_3; it3++)                 \
               {                                                         \
-                interface [it1][it2][it3] = _interfaces->set_interface( name+separator+toString(it1)+separator+toString(it2)+separator+toString(it3)); \
+                interface [it1][it2][it3] = _interfaces->set_interface(((toString(name)!="")?(name+separator):"")+toString(it1)+separator+toString(it2)+separator+toString(it3)); \
               }                                                         \
           }                                                             \