Fixes and improvements to the WMC tool

src/wmc_tool/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5)
 project(wmc_tool)
 include(CTest)
 
@@ -10,8 +10,8 @@ if(WIN32)
   )
 endif()  
 
-add_executable(wmc_tool c_parser.cpp output.cpp text_utils.cpp wmc_tool.cpp)
-find_package(PythonInterp)
+add_executable(wmc_tool parsing_defs.h c_parser.h c_parser.cpp output.h output.cpp text_utils.h text_utils.cpp constants.h wmc_tool.h wmc_tool.cpp)
+find_package (Python COMPONENTS Interpreter)
 
 # Testing
 file(TO_CMAKE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/test_data TEST_DIR)

src/wmc_tool/HISTORY.md

@@ -66,4 +66,14 @@
  * export information about all dynamic allocations/de-allocations occuring during the runtime of the codec to a `.csv` file
  * added an exemplary Python script `mem_analysis.py` for graphical analysis and profiling of dynamic memory alloations based on the generated `.csv` file
  * added support for counting complexity and PROM size of BASOP operations and BASOP functions within floating-point source code
+
+## v1.5.1
+
+ * added the -s (--skip_cmplx_instrumentation) command-line option, which avoids the instrumentation of function bodies. The func_start_ and return_ keywords, along with the remaining functionality, remain unchanged.
+
+## v1.6
+
+ * fixed instrumentation issues in encoder.c of the 3GPP EVS codec where malloc() is instrumented and print_mem() is present as well
+ * when #undef WMC_TOOL_SKIP is missing, automatically assume end of file, but before the last automatically instrumented segment
+ * the function DesInstrument_ROM() is called in all regular files as well as the file pointed to with the -m command-line argument
 

src/wmc_tool/c_parser.h

@@ -31,7 +31,7 @@ void Free_Pointer_Table_Memory( Pointer_Tbl_def *PointerTable_ptr );
 TOOL_ERROR Setup_Regions( Parse_Context_def *ParseContext_ptr, bool verbose );
 TOOL_ERROR DesInstrument( Parse_Context_def *ParseContext_ptr, bool keep_manual );
 TOOL_ERROR DesInstrument_ROM(Parse_Context_def* ParseCtx_ptr);
-TOOL_ERROR Instrument(Parse_Context_def* ParseContext_ptr, bool instr_const);
+TOOL_ERROR Instrument(Parse_Context_def* ParseContext_ptr, bool instr_const, bool skip_cmplx_instrum);
 TOOL_ERROR Instrument_Const_Data_PROM_Table( Parse_Context_def *ParseContext_ptr, T_FILE_BOOK file_book[], int nRecords );
 TOOL_ERROR Finalize( Parse_Context_def *ParseContext_ptr );
 TOOL_ERROR Include_Header(Parse_Context_def* ParseContext_ptr, char** ptr_end_preproc_block );

src/wmc_tool/test_data/ref/main2.c

@@ -20,7 +20,7 @@
 /*AddedByWMC_Tool*/}
 /*AddedByWMC_Tool*/ROM_Size_Lookup_Table Const_Data_PROM_Table[] =
 /*AddedByWMC_Tool*/{
-/*AddedByWMC_Tool*/    { "out/test*.c", 291, Get_Const_Data_Size_out_test_c },
+/*AddedByWMC_Tool*/    { "out/test*.c", 292, Get_Const_Data_Size_out_test_c },
 /*AddedByWMC_Tool*/    { "", -1, NULL }
 /*AddedByWMC_Tool*/};
 /*AddedByWMC_Tool*/#endif

src/wmc_tool/test_data/ref/test_basop32.c

@@ -2430,4 +2430,4 @@ Word32 L_msu0 (Word32 L_var3, Word16 var1, Word16 var2) {
 #undef WMC_TOOL_SKIP
 
 /* end of file */
-/*AddedByWMC_Tool*/ int PROM_Size_Func( test_basop32 ) { return 157; }
+/*AddedByWMC_Tool*/ int PROM_Size_Func( test_basop32 ) { return 158; }