From e744c11b50e195573135a8ae528c0dd8fd61a118 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Thu, 17 Dec 2015 10:46:20 +0000 Subject: [PATCH 1/5] Fixes for IAR compiler compatibilty --- error_handler.h | 16 +- test/iar/etl.dep | 623 +++++--- test/iar/etl.ewd | 518 +++++-- test/iar/etl.ewp | 252 +++- test/iar/etl.ewt | 2071 ++++++++++++++++++++++++++ test/iar/settings/etl.Debug.cspy.bat | 18 +- test/iar/settings/etl.dni | 4 +- test/iar/settings/etl.wsdt | 14 +- test/iar/settings/etl.wspos | 2 +- test/vs2015/etl.vcxproj | 1 + test/vs2015/etl.vcxproj.filters | 3 + 11 files changed, 3122 insertions(+), 400 deletions(-) diff --git a/error_handler.h b/error_handler.h index 46045d59..c1940c59 100644 --- a/error_handler.h +++ b/error_handler.h @@ -94,17 +94,17 @@ namespace etl ///\ingroup error_handler //*************************************************************************** #if defined(ETL_NO_CHECKS) -#define ETL_ASSERT(b, e) (true) // Does nothing. Evaluates to 'true'. + #define ETL_ASSERT(b, e) (true) // Does nothing. Evaluates to 'true'. #elif defined(ETL_THROW_EXCEPTIONS) -#define ETL_ASSERT(b, e) (((b) ? true : throw((e))), true) // Throws an exception if the condition fails. Evaluates to 'true'. + #define ETL_ASSERT(b, e) (((b) ? true : throw((e))), true) // Throws an exception if the condition fails. Evaluates to 'true'. #elif defined(ETL_LOG_ERRORS) -#define ETL_ASSERT(b, e) (((b) ? true : etl::error_handler::error((e))), (b)) // Logs the error if the condition fails. Evaluates to the result of the condition. + #define ETL_ASSERT(b, e) (((b) ? true : etl::error_handler::error((e))), (b)) // Logs the error if the condition fails. Evaluates to the result of the condition. #else -#if defined(NDEBUG) -#define ETL_ASSERT(b, e) (true) // Does nothing. Evaluates to 'true'. -#elif -#define ETL_ASSERT(b, e) ((assert((b))), true) // Asserts if the condition fails. Evaluates to 'true'. -#endif + #if defined(NDEBUG) + #define ETL_ASSERT(b, e) (true) // Does nothing. Evaluates to 'true'. + #else + #define ETL_ASSERT(b, e) ((assert((b))), true) // Asserts if the condition fails. Evaluates to 'true'. + #endif #endif #if defined(ETL_VERBOSE_ERRORS) diff --git a/test/iar/etl.dep b/test/iar/etl.dep index 33e36c98..85a78030 100644 --- a/test/iar/etl.dep +++ b/test/iar/etl.dep @@ -2,210 +2,258 @@ 2 - 4196203668 + 2147248192 Debug - $PROJ_DIR$\..\..\bitset.h - $PROJ_DIR$\..\..\alignment.h - $PROJ_DIR$\..\..\algorithm.h - $PROJ_DIR$\..\..\array.h - $PROJ_DIR$\..\..\crc16.cpp - $PROJ_DIR$\..\..\container.h + $TOOLKIT_DIR$\inc\c\time.h + $TOOLKIT_DIR$\inc\c\clocale + $TOOLKIT_DIR$\inc\c\xmtx.h + $TOOLKIT_DIR$\inc\c\ymath.h + $TOOLKIT_DIR$\inc\cpp\typeinfo + $TOOLKIT_DIR$\inc\c\xlocale_lconv.h + $TOOLKIT_DIR$\inc\cpp\xlocale + $TOOLKIT_DIR$\inc\cpp\xdebug + $TOOLKIT_DIR$\inc\c\xlocale_c.h + $TOOLKIT_DIR$\inc\cpp\streambuf + $TOOLKIT_DIR$\inc\c\xtls.h + $TOOLKIT_DIR$\inc\c\xlocaleuse.h + $TOOLKIT_DIR$\inc\c\ctime + $TOOLKIT_DIR$\inc\cpp\stdexcept + $TOOLKIT_DIR$\inc\c\xtgmath.h + $TOOLKIT_DIR$\inc\cpp\xstring + $TOOLKIT_DIR$\inc\cpp\xlocinfo + $TOOLKIT_DIR$\inc\c\cctype + $TOOLKIT_DIR$\inc\c\locale.h + $TOOLKIT_DIR$\inc\cpp\functional + $TOOLKIT_DIR$\inc\c\xlocale.h + $TOOLKIT_DIR$\inc\cpp\xiosbase + $TOOLKIT_DIR$\inc\c\ctype.h + $PROJ_DIR$\Debug\Obj\crc16_kermit.__cstat.et + $PROJ_DIR$\Debug\Obj\md5.o + $PROJ_DIR$\Debug\Obj\crc32.__cstat.et + $PROJ_DIR$\Debug\Obj\pearson.o + $PROJ_DIR$\Debug\Obj\test_compile.__cstat.et + $PROJ_DIR$\Debug\Obj\md5.pbi + $PROJ_DIR$\Debug\Obj\crc64_ecma.__cstat.et + $PROJ_DIR$\Debug\Obj\pearson.pbi + $PROJ_DIR$\..\..\crc32.h + $PROJ_DIR$\..\..\crc32.cpp + $PROJ_DIR$\..\..\crc16_kermit.cpp + $PROJ_DIR$\..\..\checksum.h + $PROJ_DIR$\..\..\crc64_ecma.h + $PROJ_DIR$\..\..\crc64_ecma.cpp $PROJ_DIR$\..\..\crc16_ccitt.h + $PROJ_DIR$\..\..\container.h + $PROJ_DIR$\..\..\crc16.cpp + $PROJ_DIR$\..\..\crc16_kermit.h $PROJ_DIR$\..\..\crc16.h $PROJ_DIR$\..\..\crc16_ccitt.cpp - $PROJ_DIR$\..\..\crc16_kermit.cpp - $PROJ_DIR$\..\..\crc32.cpp - $PROJ_DIR$\..\..\crc16_kermit.h - $PROJ_DIR$\..\..\crc64_ecma.h - $PROJ_DIR$\..\..\crc32.h - $PROJ_DIR$\..\..\crc64_ecma.cpp - $PROJ_DIR$\..\..\crc8_ccitt.cpp - $PROJ_DIR$\..\..\crc8_ccitt.h - $PROJ_DIR$\..\..\cyclic_value.h - $PROJ_DIR$\..\..\doxygen.h - $PROJ_DIR$\..\..\deque.h - $PROJ_DIR$\..\..\deque_base.h - $PROJ_DIR$\..\..\exception.h - $PROJ_DIR$\..\..\endian.h - $PROJ_DIR$\..\..\enum_type.h $PROJ_DIR$\..\..\error_handler.cpp - $PROJ_DIR$\..\..\error_handler.h - $PROJ_DIR$\..\..\factorial.h - $PROJ_DIR$\..\..\fibonacci.h - $PROJ_DIR$\..\..\forward_list.h - $PROJ_DIR$\..\..\functional.h - $PROJ_DIR$\..\..\forward_list_base.h - $PROJ_DIR$\..\..\function.h - $TOOLKIT_DIR$\inc\c\xmtx.h - $PROJ_DIR$\..\..\ideque.h - $PROJ_DIR$\..\..\iforward_list.h $PROJ_DIR$\..\..\ilist.h - $PROJ_DIR$\..\..\integral_limits.h - $PROJ_DIR$\..\..\imap.h - $PROJ_DIR$\..\..\ipool.h - $PROJ_DIR$\..\..\iqueue.h + $PROJ_DIR$\..\..\endian.h + $PROJ_DIR$\..\..\error_handler.h + $PROJ_DIR$\..\..\etlhash.h + $PROJ_DIR$\..\..\cyclic_value.h + $PROJ_DIR$\..\..\crc8_ccitt.cpp + $PROJ_DIR$\..\..\deque_base.h + $PROJ_DIR$\..\..\deque.h + $PROJ_DIR$\..\..\enum_type.h + $PROJ_DIR$\..\..\doxygen.h + $PROJ_DIR$\..\..\crc8_ccitt.h + $PROJ_DIR$\..\..\iflat_set.h + $PROJ_DIR$\..\..\function.h + $PROJ_DIR$\..\..\iflat_map.h + $PROJ_DIR$\..\..\iforward_list.h + $PROJ_DIR$\..\..\ideque.h + $PROJ_DIR$\..\..\iflat_multimap.h + $PROJ_DIR$\..\..\functional.h + $PROJ_DIR$\..\..\hash.h + $PROJ_DIR$\..\..\iflat_multiset.h + $PROJ_DIR$\..\..\forward_list.h + $PROJ_DIR$\..\..\forward_list_base.h + $PROJ_DIR$\..\..\ibitset.h + $PROJ_DIR$\..\..\icache.h + $PROJ_DIR$\..\..\flat_multiset.h + $PROJ_DIR$\..\..\flat_set.h + $PROJ_DIR$\..\..\fixed_iterator.h + $PROJ_DIR$\..\..\flat_map.h + $PROJ_DIR$\..\..\fibonacci.h + $PROJ_DIR$\..\..\exception.h + $PROJ_DIR$\..\..\fnv_1.h + $PROJ_DIR$\..\..\flat_multimap.h + $PROJ_DIR$\..\..\factorial.h $PROJ_DIR$\..\..\istack.h $PROJ_DIR$\..\..\largest.h - $PROJ_DIR$\..\..\ivector.h - $PROJ_DIR$\..\..\numeric.h + $PROJ_DIR$\..\..\mru_cache.h + $PROJ_DIR$\..\..\md5.cpp + $PROJ_DIR$\..\..\iunordered_map.h $PROJ_DIR$\..\..\list.h + $PROJ_DIR$\..\..\jenkins.h + $PROJ_DIR$\..\..\iset.h $PROJ_DIR$\..\..\list_base.h - $PROJ_DIR$\..\..\map.h - $PROJ_DIR$\..\..\map_base.h $PROJ_DIR$\..\..\log.h - $PROJ_DIR$\..\..\nullptr.h - $PROJ_DIR$\..\..\observer.h - $PROJ_DIR$\..\..\parameter_type.h - $PROJ_DIR$\..\..\power.h + $PROJ_DIR$\..\..\ivector.h + $PROJ_DIR$\..\..\lru_cache.h + $PROJ_DIR$\..\..\map.h + $PROJ_DIR$\..\..\md5.h + $PROJ_DIR$\..\..\map_base.h + $PROJ_DIR$\..\..\imru_cache.h + $PROJ_DIR$\..\..\ilru_cache.h + $PROJ_DIR$\..\..\imultiset.h + $PROJ_DIR$\..\..\imap.h + $PROJ_DIR$\..\..\integral_limits.h + $PROJ_DIR$\..\..\intrusive_forward_list_node.h + $PROJ_DIR$\..\..\intrusive_forward_list.h + $PROJ_DIR$\..\..\imultimap.h + $PROJ_DIR$\..\..\ipool.h + $PROJ_DIR$\..\..\iqueue.h + $PROJ_DIR$\..\..\io_port.h + $PROJ_DIR$\..\..\instance_count.h + $PROJ_DIR$\..\..\irr_cache.h + $PROJ_DIR$\..\..\ipriority_queue.h + $PROJ_DIR$\..\..\pearson.h $PROJ_DIR$\..\..\pool.h - $PROJ_DIR$\..\..\queue.h - $PROJ_DIR$\..\..\smallest.h + $PROJ_DIR$\..\..\priority_queue.h $PROJ_DIR$\..\..\queue_base.h - $PROJ_DIR$\..\..\static_assert.h + $PROJ_DIR$\..\..\rr_cache.h + $PROJ_DIR$\..\..\radix.h + $PROJ_DIR$\..\..\set.h + $PROJ_DIR$\..\..\smallest.h + $PROJ_DIR$\..\..\parameter_type.h + $PROJ_DIR$\..\..\queue.h $PROJ_DIR$\..\..\stack.h + $PROJ_DIR$\..\..\reverse_pointer.h $PROJ_DIR$\..\..\stack_base.h - $PROJ_DIR$\..\..\type_traits.h - $PROJ_DIR$\..\..\variant.h - $TOOLKIT_DIR$\inc\cpp\memory - $PROJ_DIR$\..\..\vector.h - $PROJ_DIR$\..\..\vector_base.h - $PROJ_DIR$\..\..\visitor.h - $PROJ_DIR$\..\test_compile.cpp - $PROJ_DIR$\Debug\Obj\crc16_kermit.pbi - $PROJ_DIR$\Debug\Obj\crc16.pbi - $PROJ_DIR$\Debug\Exe\cpp.out + $PROJ_DIR$\..\..\power.h + $PROJ_DIR$\..\..\pearson.cpp + $PROJ_DIR$\..\..\static_assert.h + $PROJ_DIR$\..\..\numeric.h + $PROJ_DIR$\..\..\observer.h + $PROJ_DIR$\Debug\Obj\crc16.__cstat.et + $PROJ_DIR$\..\..\nullptr.h + $PROJ_DIR$\..\..\murmur3.h + $PROJ_DIR$\..\..\multi_loop.h + $PROJ_DIR$\..\..\multi_array.h + $PROJ_DIR$\..\..\optional.h + $PROJ_DIR$\..\..\multimap.h + $PROJ_DIR$\..\..\multiset.h $TOOLKIT_DIR$\inc\c\ycheck.h - $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h - $TOOLKIT_DIR$\inc\c\DLib_Defaults.h - $TOOLKIT_DIR$\inc\c\stdint.h - $TOOLKIT_DIR$\inc\c\DLib_Product.h - $TOOLKIT_DIR$\inc\c\yvals.h - $PROJ_DIR$\Debug\Obj\crc8_ccitt.pbi - $PROJ_DIR$\Debug\Obj\crc64_ecma.pbi - $PROJ_DIR$\Debug\Obj\crc32.pbi - $TOOLKIT_DIR$\inc\c\stdlib.h - $TOOLKIT_DIR$\inc\c\cstring - $TOOLKIT_DIR$\inc\c\cstdlib - $TOOLKIT_DIR$\inc\cpp\xlocinfo - $PROJ_DIR$\Debug\Obj\test_compile.o - $PROJ_DIR$\Debug\Obj\test_compile.pbi - $TOOLKIT_DIR$\inc\c\cmath - $TOOLKIT_DIR$\inc\c\ysizet.h - $TOOLKIT_DIR$\inc\cpp\iterator - $TOOLKIT_DIR$\inc\c\cwchar - $TOOLKIT_DIR$\inc\c\DLib_Product_string.h - $TOOLKIT_DIR$\inc\c\climits - $TOOLKIT_DIR$\inc\cpp\exception - $TOOLKIT_DIR$\inc\c\stdio.h - $TOOLKIT_DIR$\inc\cpp\ostream - $TOOLKIT_DIR$\inc\cpp\typeinfo - $TOOLKIT_DIR$\inc\c\ctype.h - $TOOLKIT_DIR$\inc\c\xlocaleuse.h - $TOOLKIT_DIR$\inc\c\wchar.h - $TOOLKIT_DIR$\inc\cpp\xstring - $TOOLKIT_DIR$\inc\cpp\xutility - $TOOLKIT_DIR$\inc\c\stddef.h - $TOOLKIT_DIR$\inc\cpp\functional - $TOOLKIT_DIR$\inc\cpp\utility - $TOOLKIT_DIR$\inc\c\ystdio.h - $TOOLKIT_DIR$\inc\cpp\ios - $TOOLKIT_DIR$\inc\cpp\stdexcept - $TOOLKIT_DIR$\inc\cpp\xdebug - $TOOLKIT_DIR$\config\generic.icf - $TOOLKIT_DIR$\lib\dl4t_aln.a - $TOOLKIT_DIR$\lib\m4t_al.a $TOOLKIT_DIR$\lib\shs_l.a - $TOOLKIT_DIR$\inc\c\math.h - $TOOLKIT_DIR$\lib\rt4t_al.a - $TOOLKIT_DIR$\lib\dlpp4t_al_nc.a - $TOOLKIT_DIR$\inc\c\clocale - $TOOLKIT_DIR$\inc\cpp\xmemory - $TOOLKIT_DIR$\inc\c\xlocale.h - $TOOLKIT_DIR$\inc\c\xtls.h - $TOOLKIT_DIR$\inc\cpp\algorithm - $TOOLKIT_DIR$\inc\cpp\xstddef - $TOOLKIT_DIR$\inc\cpp\new - $TOOLKIT_DIR$\inc\c\cstddef - $TOOLKIT_DIR$\inc\c\limits.h - $TOOLKIT_DIR$\inc\cpp\iosfwd - $TOOLKIT_DIR$\inc\c\cstdio - $TOOLKIT_DIR$\inc\c\string.h - $TOOLKIT_DIR$\inc\cpp\istream - $TOOLKIT_DIR$\inc\cpp\xlocnum - $TOOLKIT_DIR$\inc\cpp\streambuf - $TOOLKIT_DIR$\inc\cpp\xiosbase - $TOOLKIT_DIR$\inc\cpp\xlocale - $TOOLKIT_DIR$\inc\c\cctype - $TOOLKIT_DIR$\inc\c\ctime - $TOOLKIT_DIR$\inc\c\xlocale_c.h - $TOOLKIT_DIR$\inc\c\locale.h - $TOOLKIT_DIR$\inc\c\xlocale_lconv.h - $TOOLKIT_DIR$\inc\c\time.h - $PROJ_DIR$\Debug\Obj\error_handler.pbi - $TOOLKIT_DIR$\inc\c\DLib_Threads.h - $PROJ_DIR$\Debug\Obj\error_handler.o - $PROJ_DIR$\..\..\ibitset.h - $PROJ_DIR$\Debug\List\cpp.map - $TOOLKIT_DIR$\inc\c\ymath.h - $TOOLKIT_DIR$\inc\c\xtgmath.h - $TOOLKIT_DIR$\inc\c\xencoding_limits.h + $PROJ_DIR$\Debug\Exe\cpp.out + $TOOLKIT_DIR$\inc\c\DLib_Defaults.h + $TOOLKIT_DIR$\lib\dl4t_aln.a + $PROJ_DIR$\Debug\Obj\crc32.pbi + $TOOLKIT_DIR$\lib\m4t_al.a $PROJ_DIR$\Debug\Obj\crc64_ecma.o - $PROJ_DIR$\Debug\Obj\crc32.o - $PROJ_DIR$\Debug\Obj\crc16.o - $PROJ_DIR$\Debug\Obj\crc16_ccitt.o $PROJ_DIR$\Debug\Obj\etl.pbd - $PROJ_DIR$\Debug\Obj\crc16_ccitt.pbi + $TOOLKIT_DIR$\lib\rt4t_al.a $PROJ_DIR$\Debug\Obj\crc16_kermit.o $PROJ_DIR$\Debug\Obj\crc8_ccitt.o + $TOOLKIT_DIR$\inc\c\DLib_Product.h + $TOOLKIT_DIR$\config\generic.icf + $TOOLKIT_DIR$\inc\c\DLib_Threads.h + $PROJ_DIR$\Debug\Obj\crc32.o + $PROJ_DIR$\Debug\Obj\test_compile.pbi + $TOOLKIT_DIR$\lib\dlpp4t_al_nc.a + $TOOLKIT_DIR$\inc\c\assert.h + $PROJ_DIR$\Debug\Obj\error_handler.__cstat.et + $PROJ_DIR$\Debug\Obj\crc16_kermit.pbi + $PROJ_DIR$\Debug\Obj\crc8_ccitt.__cstat.et + $TOOLKIT_DIR$\inc\c\yvals.h + $PROJ_DIR$\Debug\Obj\crc16_ccitt.__cstat.et + $TOOLKIT_DIR$\inc\c\stdint.h + $PROJ_DIR$\Debug\Obj\test_compile.o + $PROJ_DIR$\Debug\Obj\crc8_ccitt.pbi + $PROJ_DIR$\Debug\Obj\crc16.pbi + $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h + $PROJ_DIR$\Debug\List\cpp.map + $PROJ_DIR$\Debug\Obj\crc16.o + $PROJ_DIR$\Debug\Obj\crc64_ecma.pbi + $PROJ_DIR$\Debug\Obj\error_handler.pbi + $PROJ_DIR$\..\..\visitor.h + $PROJ_DIR$\..\..\unordered_map.h + $PROJ_DIR$\Debug\Obj\crc16_ccitt.pbi + $TOOLKIT_DIR$\inc\c\xencoding_limits.h + $PROJ_DIR$\Debug\Obj\crc16_ccitt.o + $PROJ_DIR$\..\..\vector.h + $PROJ_DIR$\..\test_compile.cpp + $PROJ_DIR$\Debug\Obj\error_handler.o + $PROJ_DIR$\..\..\type_traits.h + $PROJ_DIR$\..\..\variant.h + $PROJ_DIR$\..\..\vector_base.h + $TOOLKIT_DIR$\inc\cpp\xlocnum + $TOOLKIT_DIR$\inc\c\cmath + $TOOLKIT_DIR$\inc\c\math.h + $TOOLKIT_DIR$\inc\cpp\ostream + $TOOLKIT_DIR$\inc\cpp\ios + $PROJ_DIR$\..\..\array.h + $PROJ_DIR$\..\..\basic_intrusive_forward_list.h $PROJ_DIR$\..\..\ihash.h + $PROJ_DIR$\..\..\bloom_filter.h $PROJ_DIR$\..\..\binary.h - $PROJ_DIR$\..\..\io_port.h + $PROJ_DIR$\..\..\alignment.h + $PROJ_DIR$\..\..\algorithm.h + $PROJ_DIR$\..\..\bsd_checksum.h + $PROJ_DIR$\..\..\basic_intrusive_forward_list_node.h + $PROJ_DIR$\..\..\bitset.h + $PROJ_DIR$\Debug\Obj\pearson.__cstat.et + $PROJ_DIR$\Debug\Obj\md5.__cstat.et + $PROJ_DIR$\..\..\private\list_base.h + $PROJ_DIR$\..\..\private\vector_base.h + $PROJ_DIR$\..\..\private\pool_base.h + $PROJ_DIR$\..\..\private\deque_base.h + $TOOLKIT_DIR$\inc\c\stdlib.h + $TOOLKIT_DIR$\inc\c\climits + $TOOLKIT_DIR$\inc\c\cstdlib + $TOOLKIT_DIR$\inc\c\wchar.h + $TOOLKIT_DIR$\inc\cpp\xmemory + $TOOLKIT_DIR$\inc\c\limits.h + $TOOLKIT_DIR$\inc\c\cstdio + $TOOLKIT_DIR$\inc\c\string.h + $TOOLKIT_DIR$\inc\c\DLib_Product_string.h + $TOOLKIT_DIR$\inc\cpp\new + $TOOLKIT_DIR$\inc\cpp\exception + $TOOLKIT_DIR$\inc\cpp\xstddef + $TOOLKIT_DIR$\inc\cpp\xutility + $TOOLKIT_DIR$\inc\c\ystdio.h + $TOOLKIT_DIR$\inc\c\stddef.h + $TOOLKIT_DIR$\inc\c\cstring + $TOOLKIT_DIR$\inc\c\cwchar + $TOOLKIT_DIR$\inc\c\ysizet.h + $TOOLKIT_DIR$\inc\cpp\iosfwd + $TOOLKIT_DIR$\inc\cpp\memory + $TOOLKIT_DIR$\inc\c\cstddef + $TOOLKIT_DIR$\inc\c\stdio.h + $TOOLKIT_DIR$\inc\cpp\iterator + $TOOLKIT_DIR$\inc\cpp\algorithm + $TOOLKIT_DIR$\inc\cpp\utility + $TOOLKIT_DIR$\inc\cpp\istream - $PROJ_DIR$\..\..\crc16.cpp + $PROJ_DIR$\..\..\crc32.cpp + + BICOMP + 137 + ICCARM 147 - BICOMP - 68 + __cstat + 25 - - ICCARM - 73 70 75 72 71 74 144 138 - BICOMP - 70 75 73 144 72 138 71 74 + 132 146 135 168 154 156 160 144 - - - - $PROJ_DIR$\..\..\crc16_ccitt.cpp - ICCARM - 148 - - - BICOMP - 150 - - - - - ICCARM - 73 70 75 72 71 74 144 138 - - - BICOMP - 70 75 73 144 72 138 71 74 + 156 132 154 135 160 144 168 146 @@ -213,54 +261,26 @@ $PROJ_DIR$\..\..\crc16_kermit.cpp - ICCARM - 151 + BICOMP + 152 - BICOMP - 67 + ICCARM + 142 + + + __cstat + 23 - - ICCARM - 73 70 75 72 71 74 144 138 - BICOMP - 70 75 73 144 72 138 71 74 + 132 146 135 168 154 156 160 144 - - - - [ROOT_NODE] - - - ILINK - 69 141 - - - - - $PROJ_DIR$\..\..\crc32.cpp - ICCARM - 146 - - - BICOMP - 78 - - - - - ICCARM - 73 70 75 72 71 74 144 138 - - - BICOMP - 70 75 73 144 72 138 71 74 + 156 132 154 135 160 144 168 146 @@ -268,45 +288,80 @@ $PROJ_DIR$\..\..\crc64_ecma.cpp - ICCARM - 145 + BICOMP + 163 - BICOMP - 77 + ICCARM + 139 + + + __cstat + 29 - ICCARM - 73 70 75 72 71 74 144 138 + BICOMP + 132 146 135 168 154 156 160 144 - BICOMP - 70 75 73 144 72 138 71 74 + ICCARM + 156 132 154 135 160 144 168 146 - $PROJ_DIR$\..\..\crc8_ccitt.cpp + $PROJ_DIR$\..\..\crc16.cpp - ICCARM - 152 + BICOMP + 159 - BICOMP - 76 + ICCARM + 162 + + + __cstat + 124 - ICCARM - 73 70 75 72 71 74 144 138 + BICOMP + 132 146 135 168 154 156 160 144 + + ICCARM + 156 132 154 135 160 144 168 146 + + + + + $PROJ_DIR$\..\..\crc16_ccitt.cpp + BICOMP - 70 75 73 144 72 138 71 74 + 167 + + + ICCARM + 169 + + + __cstat + 155 + + + + + BICOMP + 132 146 135 168 154 156 160 144 + + + ICCARM + 156 132 154 135 160 144 168 146 @@ -314,45 +369,103 @@ $PROJ_DIR$\..\..\error_handler.cpp - ICCARM - 139 + BICOMP + 164 - BICOMP - 137 + ICCARM + 172 + + + __cstat + 151 - ICCARM - 25 21 31 49 + BICOMP + 73 154 146 132 125 150 56 135 168 46 160 144 - BICOMP - 31 49 21 25 + ICCARM + 46 150 132 154 135 160 144 168 146 73 56 125 - $PROJ_DIR$\..\test_compile.cpp + $PROJ_DIR$\..\..\crc8_ccitt.cpp - ICCARM - 83 + BICOMP + 158 - BICOMP - 84 + ICCARM + 143 + + + __cstat + 153 - ICCARM - 2 118 62 115 81 70 75 72 71 74 144 138 79 86 120 91 119 121 100 99 90 122 102 123 124 92 103 80 125 89 88 97 87 126 93 104 127 85 111 142 143 128 129 130 105 98 94 106 82 131 95 116 117 32 96 133 114 134 135 132 136 101 60 49 1 73 57 3 21 51 25 31 0 36 55 48 140 154 5 16 22 23 153 7 6 11 13 12 17 19 33 20 155 63 42 64 61 41 + BICOMP + 132 146 135 168 154 156 160 144 + + ICCARM + 156 132 154 135 160 144 168 146 + + + + + $PROJ_DIR$\..\..\md5.cpp + BICOMP - 60 72 123 36 70 86 81 3 75 122 21 100 11 101 115 119 102 90 91 153 57 118 5 19 120 82 48 73 64 7 12 63 124 99 94 80 95 96 97 98 22 87 1 0 16 6 13 17 155 61 62 79 144 138 71 74 121 125 89 126 127 128 143 105 106 114 88 116 117 32 51 25 2 92 103 93 104 85 111 142 129 130 131 132 133 134 135 136 49 31 55 140 154 23 33 20 42 41 + 28 + + + __cstat + 192 + + + + + BICOMP + 132 146 135 168 154 156 160 144 + + + ICCARM + 156 132 154 135 160 144 168 146 + + + + + $PROJ_DIR$\..\..\pearson.cpp + + + BICOMP + 30 + + + ICCARM + 26 + + + __cstat + 191 + + + + + BICOMP + 132 146 135 168 154 156 160 144 + + + ICCARM + 156 132 154 135 160 144 168 146 @@ -361,16 +474,56 @@ ILINK - 141 + 161 ILINK - 107 147 148 151 146 145 152 139 83 110 112 113 109 108 + 145 162 169 142 147 139 143 172 26 157 133 141 149 138 136 + + $PROJ_DIR$\..\test_compile.cpp + + + BICOMP + 148 + + + ICCARM + 157 + + + __cstat + 27 + + + + + BICOMP + 220 215 15 113 86 82 202 132 56 173 100 40 154 218 198 46 125 211 96 38 51 156 217 203 177 207 219 121 107 181 41 35 170 221 209 144 214 222 7 201 212 22 11 200 73 204 185 187 194 19 186 190 54 37 31 48 102 174 216 199 197 160 168 208 213 210 178 3 13 1 20 10 2 114 150 66 196 44 206 135 146 205 179 180 176 9 14 21 6 4 16 17 12 8 18 5 0 119 59 87 78 193 195 + + + ICCARM + 187 220 216 201 199 132 154 135 160 144 168 146 197 214 206 207 208 217 211 209 198 202 221 215 203 218 210 212 204 205 213 200 219 222 179 180 176 177 178 3 14 9 21 6 13 15 4 7 16 17 22 20 10 2 11 8 1 18 5 12 0 19 156 173 125 186 121 181 73 114 46 150 56 190 96 86 66 185 119 113 38 54 41 37 40 31 35 48 51 59 196 102 170 87 194 174 78 82 44 193 107 100 195 + + + + + [ROOT_NODE] + + + ILINK + 134 161 + + + + + $PROJ_DIR$\..\..\md5.cpp + ICCARM + Release diff --git a/test/iar/etl.ewd b/test/iar/etl.ewd index 9c411aba..8a524c78 100644 --- a/test/iar/etl.ewd +++ b/test/iar/etl.ewd @@ -12,7 +12,7 @@ C-SPY 2 - 26 + 27 1 1 + @@ -520,7 +524,7 @@ IJET_ID 2 - 5 + 6 1 1 + @@ -1060,7 +1068,7 @@ PEMICRO_ID 2 - 1 + 2 1 1 - - - - - - - - - - @@ -1189,7 +1154,7 @@ STLINK_ID 2 - 2 + 3 1 1 + + + + + + + + + + + + + + + + @@ -1252,7 +1282,7 @@ XDS100_ID 2 - 2 + 4 1 1 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1295,6 +1443,10 @@ $TOOLKIT_DIR$\plugins\middleware\HCCWare\HCCWare.ewplugin 0 + + $TOOLKIT_DIR$\plugins\middleware\PercepioTraceExporter\PercepioTraceExportPlugin.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\AVIX\AVIX.ENU.ewplugin 0 @@ -1375,7 +1527,7 @@ C-SPY 2 - 26 + 27 1 0 + @@ -1883,7 +2039,7 @@ IJET_ID 2 - 5 + 6 1 0 + @@ -2423,7 +2583,7 @@ PEMICRO_ID 2 - 1 + 2 1 0 - - - - - - - - - - @@ -2552,7 +2669,7 @@ STLINK_ID 2 - 2 + 3 1 0 + + + + + + + + + + + + + + + + @@ -2615,7 +2797,7 @@ XDS100_ID 2 - 2 + 4 1 0 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2658,6 +2958,10 @@ $TOOLKIT_DIR$\plugins\middleware\HCCWare\HCCWare.ewplugin 0 + + $TOOLKIT_DIR$\plugins\middleware\PercepioTraceExporter\PercepioTraceExportPlugin.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\AVIX\AVIX.ENU.ewplugin 0 diff --git a/test/iar/etl.ewp b/test/iar/etl.ewp index 390712fd..3c5a800d 100644 --- a/test/iar/etl.ewp +++ b/test/iar/etl.ewp @@ -12,7 +12,7 @@ General 3 - 22 + 24 1 1 - - - + + + + + + @@ -302,7 +315,7 @@ @@ -1527,7 +1553,7 @@ 0