Commit 956c2933 authored by thomas dettbarn's avatar thomas dettbarn
Browse files

compiles again without warnings.

parent c3f22917
Loading
Loading
Loading
Loading
+4 −16
Original line number Diff line number Diff line
@@ -968,7 +968,6 @@ static void HouseholderReduction_fx(
				printf("compare%d,%d: ",nCh,i);
				for (j=0;j<nChannelsC;j++)
				{
					Word16 n;
					printf("%08X ",singularVectors_Left_fx[i][j]);
				}
				printf("\n");
@@ -984,7 +983,6 @@ static void HouseholderReduction_fx(
				printf("COMPARE%d,%d: ",nCh,i);
				for (j=0;j<nChannelsC;j++)
				{
					Word16 n;
					printf("%08X<%3d ",singularVectors_Left_fx[i][j],singularVectors_Left_fx_e[i][j]);
				}
				printf("\n");
@@ -1010,12 +1008,10 @@ static void HouseholderReduction_fx(
    pop_wmops();
    {
	    int i,j;
	    int magicnum;
	    static int replacecnt=0;
	    static int bettercnt=0;
	    static int totalcnt=0;

	    magicnum=singularVectors_Left_fx_e[0][0]+W_norm(singularVectors_Left_64[0][0])+1;
	    for (i=0;i<nChannelsL;i++)
	    {
			printf("EXPONENT%02d: IN%3d ",i,singularVectors_Left_e);
@@ -1023,13 +1019,12 @@ static void HouseholderReduction_fx(
		    {
			    Word16 n;
			    Word32 tmp;
			    Word32 minemant;
			    unsigned int x,y;
				int mine,theirs;
			    int k;
			    int cnt;
			    n=norm_l(singularVectors_Left_fx[i][j]);
			    tmp=singularVectors_Left_fx[i][j]<<n;
                            x=(unsigned int)tmp;
			    minemant=singularVectors_Left_fx[i][j]<<n;
                            x=(unsigned int)minemant;
				printf("[(%2d)",singularVectors_Left_fx_e[i][j]-n);
				theirs=singularVectors_Left_fx_e[i][j]-n;

@@ -1040,9 +1035,8 @@ static void HouseholderReduction_fx(
				n=32+singularVectors_Left_e-n;
				mine=n;
				printf("MINE:%2d]",n);
			    cnt=0;
				if (!((x^y)&0xff000000)) bettercnt++;
				if (mine==theirs || x==singularVectors_Left_fx[i][j])
				if (mine==theirs || minemant==singularVectors_Left_fx[i][j])
				{
					singularVectors_Left_fx[i][j]=x;
					singularVectors_Left_fx_e[i][j]=mine;
@@ -1374,12 +1368,6 @@ static void biDiagonalReductionLeft_fx(
            FOR( jCh = idx; jCh < nChannelsL; jCh++ ) /* nChannelsL */
            {
                Word16 temp_e = norm_l( singularVectors[jCh][currChannel] );
		Word32 tmp;

	//	tmp=L_shl( singularVectors[jCh][currChannel],temp_e);
		tmp=singularVectors[jCh][currChannel];

		tmp=L_shl( singularVectors[jCh][currChannel],temp_e);
                singularVectors[jCh][currChannel] = Mpy_32_32( L_shl( singularVectors[jCh][currChannel], temp_e ), invVal ); /* exp(sing_exp + (singularVectors_e - sig_x_e) */
                move32();
                singularVectors2_e[jCh][currChannel] = sub( add( invVal_e, sub( singularVectors2_e[jCh][currChannel], *sig_x_e ) ), temp_e );