Commit 1b6555a9 authored by malenov's avatar malenov
Browse files

simplify the incrIf/incrElse functions -remove obsolete aux. variables

parent 3fd681b0

lib_com/control.c

+5 −2
Original line number Diff line number Diff line
@@ -21,10 +21,13 @@ 
#include "stl.h"



#ifdef WMOPS

int funcId_where_last_call_to_else_occurred;

long funcid_total_wmops_at_last_call_to_else;

int call_occurred = 1;

#ifdef FIX_1054_IF_ELSE_CMPLX

char func_name_where_last_call_to_else_occurred[MAX_FUNCTION_NAME_LENGTH + 1] = "";

#else

int funcId_where_last_call_to_else_occurred;

int call_occurred = 1;

#endif

#endif



#ifdef CONTROL_CODE_OPS

lib_com/control.h

+36 −8
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <string.h>

#include "stl.h"





/*****************************************************************************

 *

 *  Constants and Globals
@@ -47,8 +46,11 @@ extern BASIC_OP multiCounter[MAXCOUNTERS]; 
extern int currCounter;



#define MAX_FUNCTION_NAME_LENGTH 200 /* Maximum length of the function name */

extern char func_name_where_last_call_to_else_occurred[];



extern long funcid_total_wmops_at_last_call_to_else;

#ifdef FIX_1054_IF_ELSE_CMPLX

extern char func_name_where_last_call_to_else_occurred[];

#else

/* Technical note :

 * The following 3 variables are only used for correct complexity

 * evaluation of the following structure :
@@ -64,9 +66,10 @@ extern char func_name_where_last_call_to_else_occurred[]; 
 *     ...

 *   }

 */

extern int funcId_where_last_call_to_else_occurred;

extern long funcid_total_wmops_at_last_call_to_else;



extern int call_occurred;

extern int funcId_where_last_call_to_else_occurred;

#endif

#endif /* ifdef WMOPS */
@@ -176,19 +179,32 @@ static __inline void incrWhile( void ) 
#define IF( a ) if ( a )



#else /* ifndef WMOPS */

#ifdef FIX_1054_IF_ELSE_CMPLX

#define IF( a ) if ( incrIf( __func__ ), a )

#else

#define IF( a ) if ( incrIf(), a )

#endif



#ifdef FIX_1054_IF_ELSE_CMPLX

static __inline void incrIf( const char *func_name )

#else

static __inline void incrIf( void )

#endif

{

    /* Technical note :

     * If the "IF" operator comes just after an "ELSE", its counter

     * must not be incremented.

     */

    if ( ( currCounter != funcId_where_last_call_to_else_occurred ) || ( strncmp( func_name, func_name_where_last_call_to_else_occurred, MAX_FUNCTION_NAME_LENGTH ) != 0 ) || ( TotalWeightedOperation() != funcid_total_wmops_at_last_call_to_else ) || ( call_occurred == 1 ) )

#ifdef FIX_1054_IF_ELSE_CMPLX

    if ( ( strncmp( func_name, func_name_where_last_call_to_else_occurred, MAX_FUNCTION_NAME_LENGTH ) != 0 ) || ( TotalWeightedOperation() != funcid_total_wmops_at_last_call_to_else ) )

        multiCounter[currCounter].If++;

#else

    if ( ( currCounter != funcId_where_last_call_to_else_occurred ) || ( TotalWeightedOperation() != funcid_total_wmops_at_last_call_to_else ) || ( call_occurred == 1 ) )

        multiCounter[currCounter].If++;



    call_occurred = 0;

    funcId_where_last_call_to_else_occurred = MAXCOUNTERS;

#endif

}

#endif /* ifndef WMOPS */
@@ -208,26 +224,38 @@ static __inline void incrIf( const char *func_name ) 
#define ELSE else



#else /* ifndef WMOPS */

#ifdef FIX_1054_IF_ELSE_CMPLX

#define ELSE                             \

    else if ( incrElse( __func__ ), 0 ); \

    else

#else

#define ELSE                             \

    else if ( incrElse(), 0 ); \

    else

#endif



#ifdef FIX_1054_IF_ELSE_CMPLX

static __inline void incrElse( const char *func_name )

#else

static __inline void incrElse( void )

#endif

{

    multiCounter[currCounter].If++;



    /* We keep track of the funcId of the last function which used ELSE {...} structure. */

    funcId_where_last_call_to_else_occurred = currCounter;



    /* We keep track of the number of WMOPS of this funcId when the ELSE macro was called. */

    funcid_total_wmops_at_last_call_to_else = TotalWeightedOperation();



#ifdef FIX_1054_IF_ELSE_CMPLX

    /* We keep track of the name of the last calling function when the ELSE macro was called */

    strncpy( func_name_where_last_call_to_else_occurred, func_name, MAX_FUNCTION_NAME_LENGTH );

    func_name_where_last_call_to_else_occurred[MAX_FUNCTION_NAME_LENGTH] = '\0';

#else

    /* We keep track of the funcId of the last function which used ELSE {...} structure. */

    funcId_where_last_call_to_else_occurred = currCounter;



    /* call_occurred is set to 0, in order to count the next IF (if necessary) */

    call_occurred = 0;

#endif

}

#endif /* ifndef WMOPS */

lib_com/count.c

+4 −0
Original line number Diff line number Diff line
@@ -365,7 +365,9 @@ void setCounter( int counterId ) 
        return;

    }

    currCounter = counterId;

#ifndef FIX_1054_IF_ELSE_CMPLX

    call_occurred = 1;

#endif

#else

    (void) counterId;

#endif /* ifdef WMOPS */
@@ -514,9 +516,11 @@ void Init_WMOPS_counter( void ) 
    LastWOper[currCounter] = 0;

    funcid[currCounter] = 0;



#ifndef FIX_1054_IF_ELSE_CMPLX

    /* Following line is useful for incrIf(), see control.h */

    call_occurred = 1;

    funcId_where_last_call_to_else_occurred = MAXCOUNTERS;

#endif



    sum_bc[currCounter] = MAX_32;

    sum_wc[currCounter] = 0;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ 
#define FIX_999_WRONG_ISM_EXTENDED_METADATA     /* VA: fix 999: fix ISM extended metadata decoding */

#define NONBE_FIX_1205_TD_STEREO_MOD_CT         /* VA: fix mismatch of coder_type (mod_ct) btw. TD stereo encoder and decoder */

#define NONBE_FIX_1204_MDCT_STEREO_NOISE_EST_SCALING    /* FhG: fixes for decoder-side noise level estimation in MDCT-Stereo to prevent noise bursts in stereo switching */

#define FIX_1054_IF_ELSE_CMPLX                  /* VA: Fix 1054 incorrect counting of complexity when ELSE-IF sequence is encoutered in two functions */

/* ################## End DEVELOPMENT switches ######################### */



/* clang-format on */

lib_debug/wmc_auto.c

+2 −0
Original line number Diff line number Diff line
@@ -187,9 +187,11 @@ void reset_wmops( void ) 
        wmops_caller_stack[i] = -1;

    }



#ifndef FIX_1054_IF_ELSE_CMPLX

    /* initialize auxiliary BASOP WMOPS variables */

    //call_occurred = 1;

    //funcId_where_last_call_to_else_occurred = INT_MAX;

#endif



    return;

}