diff --git a/kernel/arm/amax.c b/kernel/arm/amax.c index ec6b11196..792e68bd9 100644 --- a/kernel/arm/amax.c +++ b/kernel/arm/amax.c @@ -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]); } diff --git a/kernel/arm/amin.c b/kernel/arm/amin.c index fc89604d5..78495a8e3 100644 --- a/kernel/arm/amin.c +++ b/kernel/arm/amin.c @@ -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]); } diff --git a/kernel/arm/asum.c b/kernel/arm/asum.c index 5b6e6ebd2..b284ae3fc 100644 --- a/kernel/arm/asum.c +++ b/kernel/arm/asum.c @@ -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) diff --git a/kernel/arm/iamax.c b/kernel/arm/iamax.c index d211776e9..8c016ce4d 100644 --- a/kernel/arm/iamax.c +++ b/kernel/arm/iamax.c @@ -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]); diff --git a/kernel/arm/iamin.c b/kernel/arm/iamin.c index 7efce19b1..155292bd5 100644 --- a/kernel/arm/iamin.c +++ b/kernel/arm/iamin.c @@ -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) { diff --git a/kernel/arm/imax.c b/kernel/arm/imax.c index 28022f67b..5072dd16e 100644 --- a/kernel/arm/imax.c +++ b/kernel/arm/imax.c @@ -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) { diff --git a/kernel/arm/imin.c b/kernel/arm/imin.c index fe8aa962a..598cba387 100644 --- a/kernel/arm/imin.c +++ b/kernel/arm/imin.c @@ -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) { diff --git a/kernel/arm/izamax.c b/kernel/arm/izamax.c index 54bb35149..8fe33e95b 100644 --- a/kernel/arm/izamax.c +++ b/kernel/arm/izamax.c @@ -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++; diff --git a/kernel/arm/izamin.c b/kernel/arm/izamin.c index 448b3cbfc..fb5a0d4cb 100644 --- a/kernel/arm/izamin.c +++ b/kernel/arm/izamin.c @@ -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++; diff --git a/kernel/arm/max.c b/kernel/arm/max.c index 04529dbd6..2ad956bc0 100644 --- a/kernel/arm/max.c +++ b/kernel/arm/max.c @@ -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) { diff --git a/kernel/arm/min.c b/kernel/arm/min.c index 63c704c79..2812fe397 100644 --- a/kernel/arm/min.c +++ b/kernel/arm/min.c @@ -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) { diff --git a/kernel/arm/nrm2.c b/kernel/arm/nrm2.c index b4d810d53..fcff09337 100644 --- a/kernel/arm/nrm2.c +++ b/kernel/arm/nrm2.c @@ -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; diff --git a/kernel/arm/zamax.c b/kernel/arm/zamax.c index 162f829b8..a39bd7821 100644 --- a/kernel/arm/zamax.c +++ b/kernel/arm/zamax.c @@ -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); } diff --git a/kernel/arm/zamin.c b/kernel/arm/zamin.c index 9e26a66d0..02eab3e75 100644 --- a/kernel/arm/zamin.c +++ b/kernel/arm/zamin.c @@ -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); } diff --git a/kernel/arm/zasum.c b/kernel/arm/zasum.c index 0c5d69e35..61e85cae6 100644 --- a/kernel/arm/zasum.c +++ b/kernel/arm/zasum.c @@ -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; diff --git a/kernel/arm/zaxpby.c b/kernel/arm/zaxpby.c index d9948349d..445354416 100644 --- a/kernel/arm/zaxpby.c +++ b/kernel/arm/zaxpby.c @@ -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; diff --git a/kernel/arm/znrm2.c b/kernel/arm/znrm2.c index c590095e7..fc1c8b54a 100644 --- a/kernel/arm/znrm2.c +++ b/kernel/arm/znrm2.c @@ -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;