Changeset 122 for trunk/IPs/systemC/processor/Morpheo/Behavioural/include
- Timestamp:
- Jun 3, 2009, 10:15:51 AM (16 years ago)
- Location:
- trunk/IPs/systemC/processor/Morpheo/Behavioural/include
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Allocation.h
r115 r122 250 250 251 251 #ifdef POSITION 252 #define ALLOC1_INTERFACE_BEGIN( name, direction, localisation, str, x1) 252 #define ALLOC1_INTERFACE_BEGIN( name, direction, localisation, str, x1) \ 253 253 INTERFACE_PRINT(name); \ 254 uint32_t iterator_1 = 0; 255 morpheo::behavioural::Interface_fifo ** interface; 254 uint32_t iterator_1 = 0; \ 255 morpheo::behavioural::Interface_fifo ** interface; \ 256 256 { \ 257 257 std::string separator="_"; \ … … 264 264 } 265 265 #else 266 #define ALLOC1_INTERFACE_BEGIN( name, direction, localisation, str, x1) 266 #define ALLOC1_INTERFACE_BEGIN( name, direction, localisation, str, x1) \ 267 267 INTERFACE_PRINT(name); \ 268 const uint32_t iterator_1 = x1; \ 269 morpheo::behavioural::Interface_fifo * interface [iterator_1]; \ 270 { \ 271 std::string separator="_"; \ 268 uint32_t iterator_1 = 0; \ 269 morpheo::behavioural::Interface_fifo ** interface; \ 270 { \ 271 std::string separator="_"; \ 272 iterator_1 = x1; \ 273 interface = new morpheo::behavioural::Interface_fifo * [iterator_1]; \ 272 274 for (uint32_t it1=0; it1<iterator_1; it1++) \ 273 275 { \ … … 277 279 #endif 278 280 279 #define ALLOC1_INTERFACE_END(x1) 281 #define ALLOC1_INTERFACE_END(x1) \ 282 delete [] interface; 280 283 281 284 #define ALLOC1_VAL_ACK_IN( sig, name, type) \ … … 467 470 #endif 468 471 469 #define ALLOC2_INTERFACE_END(x1, x2) \472 #define ALLOC2_INTERFACE_END(x1, x2) \ 470 473 for (uint32_t it1=0; it1<x1; it1++) \ 471 delete interface [it1];\474 delete [] interface [it1]; \ 472 475 delete [] interface; 473 476 … … 734 737 { \ 735 738 for (uint32_t it2=0; it2<x2; it2++) \ 736 delete interface [it1][it2];\739 delete [] interface [it1][it2]; \ 737 740 delete [] interface [it1]; \ 738 741 } \ -
trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h
r121 r122 10 10 #define MORPHEO_MAJOR_VERSION "0" 11 11 #define MORPHEO_MINOR_VERSION "2" 12 #define MORPHEO_REVISION "12 1"12 #define MORPHEO_REVISION "122" 13 13 #define MORPHEO_CODENAME "Castor" 14 14 15 #define MORPHEO_DATE_DAY " 27"16 #define MORPHEO_DATE_MONTH "0 5"15 #define MORPHEO_DATE_DAY "03" 16 #define MORPHEO_DATE_MONTH "06" 17 17 #define MORPHEO_DATE_YEAR "2009" 18 18
Note: See TracChangeset
for help on using the changeset viewer.