Commit e0d76e89 authored by sagnowski's avatar sagnowski
Browse files

Merge branch 'basop_noglob' into configurable_overflow_handling

parents a15409a8 f006d30b

basic_math/log2.c

+4 −0
Original line number Diff line number Diff line
@@ -185,7 +185,11 @@ Word32 pow_10(Word32 x , Word16 *Q) 
  FOR(i =1 ;i <= n ;i++)

  {

	  Overflow = 0;   move16();

#ifdef BASOP_NOGLOB

	  L_tmp = L_shl_o(L_tmp,i, &Overflow);

#else

	  L_tmp = L_shl(L_tmp,i);

#endif

	  IF(Overflow)

      {

	      count = add(count,1);

basic_op/basop32.c

+1 −1
Original line number Diff line number Diff line
@@ -2776,7 +2776,7 @@ Word16 div_l (Word32 L_num, Word16 den) { 
#ifdef BASOP_NOGLOB

Word16 i_mult_o (Word16 a, Word16 b, Flag* Overflow) {

#else

Word16 i_mult (Word16 a, Word16 b, Flag* Overflow) {

Word16 i_mult (Word16 a, Word16 b) {

#endif

#ifdef ORIGINAL_G7231

  return a * b;