Changeset 115 for trunk/IPs/systemC/processor/Morpheo/Behavioural/include

Timestamp:

Apr 20, 2009, 11:29:17 PM (16 years ago)

Author:

rosiere

Message:

1) Write queue with mealy
2) Network : fix bug
3) leak memory

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/include

Files:

• Allocation.h (modified) (1 diff)
• Component.h (modified) (3 diffs)
• Version.h (modified) (1 diff)

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

@@ -252 +252 @@
 #define ALLOC1_INTERFACE_BEGIN( name, direction, localisation, str, x1)       \
   INTERFACE_PRINT(name);                                                \
-  const uint32_t iterator_1 = x1;                                       \
-  morpheo::behavioural::Interface_fifo * interface [iterator_1];        \
-  {                                                                     \
-    std::string separator="_";                                          \
+  uint32_t iterator_1 = 0;                                              \
+  morpheo::behavioural::Interface_fifo ** interface;                    \
+  {                                                                     \
+    std::string separator="_";                                          \
+    iterator_1 = x1;                                                    \
+    interface = new morpheo::behavioural::Interface_fifo * [iterator_1]; \
     for (uint32_t it1=0; it1<iterator_1; it1++)                         \
       {                                                                 \

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

@@ -25 +25 @@
 namespace behavioural          {
 
+  /*
 #ifdef DEBUG
 # define PORT_MAP(x,a,b,c,d)                                            \
@@ -40 +41 @@
   while (0)
 #else
+*/
 # define PORT_MAP(x,a,b,c,d)                                            \
   do                                                                    \
@@ -46 +48 @@
     }                                                                   \
   while (0)
-#endif
+// #endif
 
 #define COMPONENT_MAP(x,a,b,c,d)                                        \

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

@@ -10 +10 @@
 #define MORPHEO_MAJOR_VERSION "0"
 #define MORPHEO_MINOR_VERSION "2"
-#define MORPHEO_REVISION      "114"
+#define MORPHEO_REVISION      "115"
 #define MORPHEO_CODENAME      "Castor"
 
-#define MORPHEO_DATE_DAY      "17"  
+#define MORPHEO_DATE_DAY      "20"  
 #define MORPHEO_DATE_MONTH    "04"
 #define MORPHEO_DATE_YEAR     "2009"