Browse Source

Minor C code fixes in kernel/arm

tags/v0.2.16.rc1
Ralph Campbell Ashwin Sekhar T K 10 years ago
parent
commit
c053559ed9
17 changed files with 64 additions and 53 deletions
  1. +4
    -2
      kernel/arm/amax.c
  2. +4
    -2
      kernel/arm/amin.c
  3. +1
    -1
      kernel/arm/asum.c
  4. +4
    -2
      kernel/arm/iamax.c
  5. +3
    -1
      kernel/arm/iamin.c
  6. +3
    -1
      kernel/arm/imax.c
  7. +3
    -1
      kernel/arm/imin.c
  8. +7
    -7
      kernel/arm/izamax.c
  9. +7
    -7
      kernel/arm/izamin.c
  10. +3
    -1
      kernel/arm/max.c
  11. +3
    -1
      kernel/arm/min.c
  12. +1
    -1
      kernel/arm/nrm2.c
  13. +8
    -10
      kernel/arm/zamax.c
  14. +8
    -10
      kernel/arm/zamin.c
  15. +2
    -1
      kernel/arm/zasum.c
  16. +2
    -4
      kernel/arm/zaxpby.c
  17. +1
    -1
      kernel/arm/znrm2.c

+ 4
- 2
kernel/arm/amax.c View File

@@ -54,13 +54,15 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
BLASLONG ix=0;
FLOAT maxf=0.0;

if (n < 0 || inc_x < 1 ) return(maxf);
if (n <= 0 || inc_x <= 0) return(maxf);

maxf=ABS(x[0]);
ix += inc_x;
i++;

while(i < n)
{
if( ABS(x[ix]) > ABS(maxf) )
if( ABS(x[ix]) > maxf )
{
maxf = ABS(x[ix]);
}


+ 4
- 2
kernel/arm/amin.c View File

@@ -54,13 +54,15 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
BLASLONG ix=0;
FLOAT minf=0.0;

if (n < 0 || inc_x < 1 ) return(minf);
if (n <= 0 || inc_x <= 0) return(minf);

minf=ABS(x[0]);
ix += inc_x;
i++;

while(i < n)
{
if( ABS(x[ix]) < ABS(minf) )
if( ABS(x[ix]) < minf )
{
minf = ABS(x[ix]);
}


+ 1
- 1
kernel/arm/asum.c View File

@@ -53,7 +53,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
{
BLASLONG i=0;
FLOAT sumf = 0.0;
if (n < 0 || inc_x < 1 ) return(sumf);
if (n <= 0 || inc_x <= 0) return(sumf);

n *= inc_x;
while(i < n)


+ 4
- 2
kernel/arm/iamax.c View File

@@ -55,13 +55,15 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
FLOAT maxf=0.0;
BLASLONG max=0;

if (n < 0 || inc_x < 1 ) return(max);
if (n <= 0 || inc_x <= 0) return(max);

maxf=ABS(x[0]);
ix += inc_x;
i++;

while(i < n)
{
if( ABS(x[ix]) > ABS(maxf) )
if( ABS(x[ix]) > maxf )
{
max = i;
maxf = ABS(x[ix]);


+ 3
- 1
kernel/arm/iamin.c View File

@@ -55,9 +55,11 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
FLOAT minf=0.0;
BLASLONG min=0;

if (n < 0 || inc_x < 1 ) return(min);
if (n <= 0 || inc_x <= 0) return(min);

minf=ABS(x[0]);
ix += inc_x;
i++;

while(i < n)
{


+ 3
- 1
kernel/arm/imax.c View File

@@ -47,9 +47,11 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
FLOAT maxf=0.0;
BLASLONG max=0;

if (n < 0 || inc_x < 1 ) return(max);
if (n <= 0 || inc_x <= 0) return(max);

maxf=x[0];
ix += inc_x;
i++;

while(i < n)
{


+ 3
- 1
kernel/arm/imin.c View File

@@ -45,9 +45,11 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
FLOAT minf=0.0;
BLASLONG min=0;

if (n < 0 || inc_x < 1 ) return(min);
if (n <= 0 || inc_x <= 0) return(min);

minf=x[0];
ix += inc_x;
i++;

while(i < n)
{


+ 7
- 7
kernel/arm/izamax.c View File

@@ -53,24 +53,24 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
{
BLASLONG i=0;
BLASLONG ix=0;
FLOAT maxf[2];
FLOAT maxf;
BLASLONG max=0;
BLASLONG inc_x2;

if (n < 0 || inc_x < 1 ) return(max);
if (n <= 0 || inc_x <= 0) return(max);

inc_x2 = 2 * inc_x;

maxf[0] = ABS(x[ix]);
maxf[1] = ABS(x[ix+1]);
maxf = CABS1(x,0);
ix += inc_x2;
i++;

while(i < n)
{
if( CABS1(x,ix) > CABS1(maxf,0) )
if( CABS1(x,ix) > maxf )
{
max = i;
maxf[0] = ABS(x[ix]);
maxf[1] = ABS(x[ix+1]);
maxf = CABS1(x,ix);
}
ix += inc_x2;
i++;


+ 7
- 7
kernel/arm/izamin.c View File

@@ -53,24 +53,24 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
{
BLASLONG i=0;
BLASLONG ix=0;
FLOAT minf[2];
FLOAT minf;
BLASLONG min=0;
BLASLONG inc_x2;

if (n < 0 || inc_x < 1 ) return(min);
if (n <= 0 || inc_x <= 0) return(min);

inc_x2 = 2 * inc_x;

minf[0] = ABS(x[ix]);
minf[1] = ABS(x[ix+1]);
minf = CABS1(x,0);
ix += inc_x2;
i++;

while(i < n)
{
if( CABS1(x,ix) < CABS1(minf,0) )
if( CABS1(x,ix) < minf )
{
min = i;
minf[0] = ABS(x[ix]);
minf[1] = ABS(x[ix+1]);
minf = CABS1(x,ix);
}
ix += inc_x2;
i++;


+ 3
- 1
kernel/arm/max.c View File

@@ -44,9 +44,11 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
BLASLONG ix=0;
FLOAT maxf=0.0;

if (n < 0 || inc_x < 1 ) return(maxf);
if (n <= 0 || inc_x <= 0) return(maxf);

maxf=x[0];
ix += inc_x;
i++;

while(i < n)
{


+ 3
- 1
kernel/arm/min.c View File

@@ -44,9 +44,11 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
BLASLONG ix=0;
FLOAT minf=0.0;

if (n < 0 || inc_x < 1 ) return(minf);
if (n <= 0 || inc_x <= 0) return(minf);

minf=x[0];
ix += inc_x;
i++;

while(i < n)
{


+ 1
- 1
kernel/arm/nrm2.c View File

@@ -57,7 +57,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
FLOAT absxi = 0.0;


if (n < 0 || inc_x < 1 ) return(0.0);
if (n <= 0 || inc_x <= 0) return(0.0);
if ( n == 1 ) return( ABS(x[0]) );

n *= inc_x;


+ 8
- 10
kernel/arm/zamax.c View File

@@ -53,29 +53,27 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
{
BLASLONG i=0;
BLASLONG ix=0;
FLOAT maxf[2];
BLASLONG max=0;
FLOAT maxf;
BLASLONG inc_x2;

if (n < 0 || inc_x < 1 ) return(0.0);
if (n <= 0 || inc_x <= 0) return(0.0);

inc_x2 = 2 * inc_x;

maxf[0] = ABS(x[ix]);
maxf[1] = ABS(x[ix+1]);
maxf = CABS1(x,0);
ix += inc_x2;
i++;

while(i < n)
{
if( CABS1(x,ix) > CABS1(maxf,0) )
if( CABS1(x,ix) > maxf )
{
max = i;
maxf[0] = ABS(x[ix]);
maxf[1] = ABS(x[ix+1]);
maxf = CABS1(x,ix);
}
ix += inc_x2;
i++;
}
return(CABS1(maxf,0));
return(maxf);
}



+ 8
- 10
kernel/arm/zamin.c View File

@@ -53,29 +53,27 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
{
BLASLONG i=0;
BLASLONG ix=0;
FLOAT minf[2];
BLASLONG min=0;
FLOAT minf;
BLASLONG inc_x2;

if (n < 0 || inc_x < 1 ) return(0.0);
if (n <= 0 || inc_x <= 0) return(0.0);

inc_x2 = 2 * inc_x;

minf[0] = ABS(x[ix]);
minf[1] = ABS(x[ix+1]);
minf = CABS1(x,0);
ix += inc_x2;
i++;

while(i < n)
{
if( CABS1(x,ix) < CABS1(minf,0) )
if( CABS1(x,ix) < minf )
{
min = i;
minf[0] = ABS(x[ix]);
minf[1] = ABS(x[ix+1]);
minf = CABS1(x,ix);
}
ix += inc_x2;
i++;
}
return(CABS1(minf,0));
return(minf);
}



+ 2
- 1
kernel/arm/zasum.c View File

@@ -55,7 +55,8 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
BLASLONG i=0;
FLOAT sumf = 0.0;
BLASLONG inc_x2;
if (n < 0 || inc_x < 1 ) return(sumf);

if (n <= 0 || inc_x <= 0) return(sumf);

inc_x2 = 2 * inc_x;



+ 2
- 4
kernel/arm/zaxpby.c View File

@@ -37,11 +37,9 @@ int CNAME(BLASLONG n, FLOAT alpha_r, FLOAT alpha_i, FLOAT *x, BLASLONG inc_x, FL
BLASLONG i=0;
BLASLONG ix,iy;
FLOAT temp;
BLASLONG inc_x2, inc_y2;

BLASLONG inc_x2;
BLASLONG inc_y2;

if ( n < 0 ) return(0);
if ( n <= 0 ) return(0);

ix = 0;
iy = 0;


+ 1
- 1
kernel/arm/znrm2.c View File

@@ -57,7 +57,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
BLASLONG inc_x2;
FLOAT temp;

if (n < 0 || inc_x < 1 ) return(0.0);
if (n <= 0 || inc_x <= 0) return(0.0);

inc_x2 = 2 * inc_x;



Loading…
Cancel
Save