Merge pull request #4557 from martin-frbg/4552-2

martin-frbg · web-flow · commit 42584b4158c0 · 2024-03-12T16:13:54.000+01:00
Fix support for a negative INC_X in the "generic" NRM2 kernels
diff --git a/kernel/arm/nrm2.c b/kernel/arm/nrm2.c
@@ -61,7 +61,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if ( n == 1 ) return( ABS(x[0]) );
 
 	n *= inc_x;
-	while(i < n)
+	while(abs(i) < abs(n))
 	{
 
 		if ( x[i] != 0.0 )
diff --git a/kernel/arm/znrm2.c b/kernel/arm/znrm2.c
@@ -62,7 +62,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	inc_x2 = 2 * inc_x;
 
 	n *= inc_x2;
-	while(i < n)
+	while(abs(i) < abs(n))
 	{
 
 		if ( x[i] != 0.0 )
diff --git a/kernel/mips/nrm2.c b/kernel/mips/nrm2.c
@@ -61,7 +61,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if ( n == 1 ) return( ABS(x[0]) );
 
 	n *= inc_x;
-	while(i < n)
+	while(abs(i) < abs(n))
 	{
 
 		if ( x[i] != 0.0 )
diff --git a/kernel/mips/znrm2.c b/kernel/mips/znrm2.c
@@ -53,7 +53,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	inc_x2 = 2 * inc_x;
 
 	n *= inc_x2;
-	while(i < n)
+	while(abs(i) < abs(n))
 	{
 
 		if ( x[i] != 0.0 )
diff --git a/kernel/riscv64/nrm2.c b/kernel/riscv64/nrm2.c
@@ -61,7 +61,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if ( n == 1 ) return( ABS(x[0]) );
 
 	n *= inc_x;
-	while(i < n)
+	while(abs(i) < abs(n))
 	{
 
 		if ( x[i] != 0.0 )
diff --git a/kernel/riscv64/znrm2.c b/kernel/riscv64/znrm2.c
@@ -62,7 +62,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	inc_x2 = 2 * inc_x;
 
 	n *= inc_x2;
-	while(i < n)
+	while(abs(i) < abs(n))
 	{
 
 		if ( x[i] != 0.0 )

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)`
`61`	`61`	`if ( n == 1 ) return( ABS(x[0]) );`
`62`	`62`
`63`	`63`	`n *= inc_x;`
`64`		`- while(i < n)`
	`64`	`+ while(abs(i) < abs(n))`
`65`	`65`	`{`
`66`	`66`
`67`	`67`	`if ( x[i] != 0.0 )`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)`
`62`	`62`	`inc_x2 = 2 * inc_x;`
`63`	`63`
`64`	`64`	`n *= inc_x2;`
`65`		`- while(i < n)`
	`65`	`+ while(abs(i) < abs(n))`
`66`	`66`	`{`
`67`	`67`
`68`	`68`	`if ( x[i] != 0.0 )`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)`
`53`	`53`	`inc_x2 = 2 * inc_x;`
`54`	`54`
`55`	`55`	`n *= inc_x2;`
`56`		`- while(i < n)`
	`56`	`+ while(abs(i) < abs(n))`
`57`	`57`	`{`
`58`	`58`
`59`	`59`	`if ( x[i] != 0.0 )`