Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use pointer macro to prevent integer oveflow #16

Merged
merged 1 commit into from
Dec 23, 2019
Merged

Use pointer macro to prevent integer oveflow #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions PBLAS/SRC/pdamax_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )
if( ( ( myrow == Xrow ) || ( Xrow < 0 ) ) &&
( ( mycol == Xcol ) || ( Xcol < 0 ) ) )
{
*INDX = *JX; *AMAX = X[Xii+Xjj*Xd[LLD_]];
*INDX = *JX; *AMAX = *Mptr(X,Xii,Xjj,Xd[LLD_],1);
}
return;
}
Expand All @@ -260,9 +260,9 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )
{
Xld = Xd[LLD_];
Xlindx = Xjj - 1 +
idamax_( &Xnq, ((char*)(X+(Xii+Xjj*Xld))), &Xld );
idamax_( &Xnq, ((char*)Mptr(X,Xii,Xjj,Xld,1)), &Xld );
Mindxl2g( Xgindx, Xlindx, Xinb, Xnb, mycol, Xsrc, npcol );
work[0] = X[Xii+Xlindx*Xld];
work[0] = *Mptr(X,Xii,Xlindx,Xld,1);
work[1] = ((double)( Xgindx+1 ));
}
else
Expand Down Expand Up @@ -343,8 +343,8 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )
*/
Xld = Xd[LLD_];
Xlindx = Xjj - 1 +
idamax_( &Xnq, ((char*)(X+(Xii+Xjj*Xld))), &Xld );
*AMAX = X[Xii+Xlindx*Xld];
idamax_( &Xnq, ((char*)Mptr(X,Xii,Xjj,Xld,1)), &Xld );
*AMAX = *Mptr(X,Xii,Xlindx,Xld,1);
}
else
{
Expand Down Expand Up @@ -419,9 +419,9 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )
{
Xld = Xd[LLD_];
Xlindx = Xii - 1 +
idamax_( &Xnp, ((char*)(X+(Xii+Xjj*Xld))), INCX );
idamax_( &Xnp, ((char*)Mptr(X,Xii,Xjj,Xld,1)), INCX );
Mindxl2g( Xgindx, Xlindx, Ximb, Xmb, myrow, Xsrc, nprow );
work[0] = X[Xlindx+Xjj*Xld];
work[0] = *Mptr(X,Xlindx,Xjj,Xld,1);
work[1] = ((double)( Xgindx+1 ));
}
else
Expand Down Expand Up @@ -503,8 +503,8 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )
*/
Xld = Xd[LLD_];
Xlindx = Xii - 1 +
idamax_( &Xnp, ((char*)(X+(Xii+Xjj*Xld))), INCX );
*AMAX = X[Xlindx+Xjj*Xld];
idamax_( &Xnp, ((char*)Mptr(X,Xii,Xjj,Xld,1)), INCX );
*AMAX = *Mptr(X,Xlindx,Xjj,Xld,1);
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions PBLAS/SRC/pdasum_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ void pdasum_( N, ASUM, X, IX, JX, DESCX, INCX )
if( ( ( myrow == Xrow ) || ( Xrow < 0 ) ) &&
( ( mycol == Xcol ) || ( Xcol < 0 ) ) )
{
*ASUM = ABS( X[Xii+Xjj*Xd[LLD_]] );
*ASUM = ABS( *Mptr(X,Xii,Xjj,Xd[LLD_],1) );
}
return;
}
Expand All @@ -243,7 +243,7 @@ void pdasum_( N, ASUM, X, IX, JX, DESCX, INCX )
if( Xnq > 0 )
{
Xld = Xd[LLD_];
dvasum_( &Xnq, ((char *) ASUM), ((char *)( X+(Xii+Xjj*Xld) )),
dvasum_( &Xnq, ((char *) ASUM), ((char *)Mptr( X,Xii,Xjj,Xld,1 )),
&Xld );
}
/*
Expand Down Expand Up @@ -276,7 +276,7 @@ void pdasum_( N, ASUM, X, IX, JX, DESCX, INCX )
if( Xnp > 0 )
{
dvasum_( &Xnp, ((char *) ASUM),
((char *)( X+(Xii+Xjj*Xd[LLD_]) )), INCX );
((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );
}
/*
* If Xnp <= 0, ASUM is zero (see initialization above)
Expand Down
2 changes: 1 addition & 1 deletion PBLAS/SRC/pdger_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void pdger_( M, N, ALPHA, X, IX, JX, DESCX, INCX, Y, IY, JY, DESCY,
if( ( Amp > 0 ) && ( Anq > 0 ) )
{
dger_( &Amp, &Anq, ((char *) ALPHA), XA, &ione, YA, &YAd[LLD_],
((char *) (A+(Aii+Ajj*Ald))), &Ald );
((char *)Mptr(A,Aii,Ajj,Ald,1)), &Ald );
}
if( XAfr ) free( XA );
if( YAfr ) free( YA );
Expand Down
6 changes: 3 additions & 3 deletions PBLAS/SRC/pdnrm2_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ void pdnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )
*/
if( ( ( myrow == Xrow ) || ( Xrow < 0 ) ) &&
( ( mycol == Xcol ) || ( Xcol < 0 ) ) )
*NORM2 = ABS( X[Xii+Xjj*Xd[LLD_]] );
*NORM2 = ABS( *Mptr(X,Xii,Xjj,Xd[LLD_],1) );
return;
}
else if( *INCX == Xd[M_] )
Expand All @@ -246,7 +246,7 @@ void pdnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )
if( Xnq > 0 )
{
Xld = Xd[LLD_];
Xptr = X+(Xii+Xjj*Xld);
Xptr = Mptr(X,Xii,Xjj,Xld,1);

for( k = 0; k < Xnq; k++ )
{
Expand Down Expand Up @@ -366,7 +366,7 @@ void pdnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )
Xnp = PB_Cnumroc( *N, Xi, Xd[IMB_], Xd[MB_], myrow, Xd[RSRC_], nprow );
if( Xnp > 0 )
{
Xptr = X+(Xii+Xjj*Xd[LLD_]);
Xptr = Mptr(X,Xii,Xjj,Xd[LLD_],1);

for( k = 0; k < Xnp; k++ )
{
Expand Down
8 changes: 4 additions & 4 deletions PBLAS/SRC/pdscal_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ void pdscal_( N, ALPHA, X, IX, JX, DESCX, INCX )
Xld = Xd[LLD_];
if( ALPHA[REAL_PART] == ZERO )
{
dset_( &Xnq, ((char *) ALPHA), ((char *)(X+(Xii+Xjj*Xld))),
dset_( &Xnq, ((char *) ALPHA), ((char *)Mptr(X,Xii,Xjj,Xld,1)),
&Xld );
}
else
{
dscal_( &Xnq, ((char *) ALPHA), ((char *)(X+(Xii+Xjj*Xld))),
dscal_( &Xnq, ((char *) ALPHA), ((char *)Mptr(X,Xii,Xjj,Xld,1)),
&Xld );
}
}
Expand All @@ -239,12 +239,12 @@ void pdscal_( N, ALPHA, X, IX, JX, DESCX, INCX )
if( ALPHA[REAL_PART] == ZERO )
{
dset_( &Xnp, ((char *) ALPHA),
((char *)( X+(Xii+Xjj*Xd[LLD_]) )), INCX );
((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );
}
else
{
dscal_( &Xnp, ((char *) ALPHA),
((char *)( X+(Xii+Xjj*Xd[LLD_]) )), INCX );
((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions PBLAS/SRC/psamax_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ void psamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )
{
Xld = Xd[LLD_];
Xlindx = Xjj - 1 +
isamax_( &Xnq, ((char*)(X+(Xii+Xjj*Xld))), &Xld );
isamax_( &Xnq, ((char*)(Mptr(X,Xii,Xjj,Xld,1))), &Xld );
Mindxl2g( Xgindx, Xlindx, Xinb, Xnb, mycol, Xsrc, npcol );
work[0] = X[Xii+Xlindx*Xld];
work[1] = ((float )( Xgindx+1 ));
Expand Down Expand Up @@ -343,8 +343,8 @@ void psamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )
*/
Xld = Xd[LLD_];
Xlindx = Xjj - 1 +
isamax_( &Xnq, ((char*)(X+(Xii+Xjj*Xld))), &Xld );
*AMAX = X[Xii+Xlindx*Xld];
isamax_( &Xnq, ((char*)(Mptr(X,Xii,Xjj,Xld, 1))), &Xld );
*AMAX = *Mptr(X,Xii,Xlindx,Xld,1);
}
else
{
Expand Down Expand Up @@ -419,9 +419,9 @@ void psamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )
{
Xld = Xd[LLD_];
Xlindx = Xii - 1 +
isamax_( &Xnp, ((char*)(X+(Xii+Xjj*Xld))), INCX );
isamax_( &Xnp, ((char*)Mptr(X,Xii,Xjj,Xld,1)), INCX );
Mindxl2g( Xgindx, Xlindx, Ximb, Xmb, myrow, Xsrc, nprow );
work[0] = X[Xlindx+Xjj*Xld];
work[0] = *Mptr(X,Xlindx,Xjj,Xld,1);
work[1] = ((float )( Xgindx+1 ));
}
else
Expand Down
6 changes: 3 additions & 3 deletions PBLAS/SRC/psasum_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ void psasum_( N, ASUM, X, IX, JX, DESCX, INCX )
if( ( ( myrow == Xrow ) || ( Xrow < 0 ) ) &&
( ( mycol == Xcol ) || ( Xcol < 0 ) ) )
{
*ASUM = ABS( X[Xii+Xjj*Xd[LLD_]] );
*ASUM = ABS( *Mptr(X,Xii,Xjj,Xd[LLD_],1) );
}
return;
}
Expand All @@ -243,7 +243,7 @@ void psasum_( N, ASUM, X, IX, JX, DESCX, INCX )
if( Xnq > 0 )
{
Xld = Xd[LLD_];
svasum_( &Xnq, ((char *) ASUM), ((char *)( X+(Xii+Xjj*Xld) )),
svasum_( &Xnq, ((char *) ASUM), ((char *)Mptr( X,Xii,Xjj,Xld,1) ),
&Xld );
}
/*
Expand Down Expand Up @@ -276,7 +276,7 @@ void psasum_( N, ASUM, X, IX, JX, DESCX, INCX )
if( Xnp > 0 )
{
svasum_( &Xnp, ((char *) ASUM),
((char *)( X+(Xii+Xjj*Xd[LLD_]) )), INCX );
((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );
}
/*
* If Xnp <= 0, ASUM is zero (see initialization above)
Expand Down
2 changes: 1 addition & 1 deletion PBLAS/SRC/psger_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void psger_( M, N, ALPHA, X, IX, JX, DESCX, INCX, Y, IY, JY, DESCY,
if( ( Amp > 0 ) && ( Anq > 0 ) )
{
sger_( &Amp, &Anq, ((char *) ALPHA), XA, &ione, YA, &YAd[LLD_],
((char *) (A+(Aii+Ajj*Ald))), &Ald );
((char *)Mptr(A,Aii,Ajj,Ald,1)), &Ald );
}
if( XAfr ) free( XA );
if( YAfr ) free( YA );
Expand Down
6 changes: 3 additions & 3 deletions PBLAS/SRC/psnrm2_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ void psnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )
*/
if( ( ( myrow == Xrow ) || ( Xrow < 0 ) ) &&
( ( mycol == Xcol ) || ( Xcol < 0 ) ) )
*NORM2 = ABS( X[Xii+Xjj*Xd[LLD_]] );
*NORM2 = ABS( *Mptr(X,Xii,Xjj,Xd[LLD_],1) );
return;
}
else if( *INCX == Xd[M_] )
Expand All @@ -246,7 +246,7 @@ void psnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )
if( Xnq > 0 )
{
Xld = Xd[LLD_];
Xptr = X+(Xii+Xjj*Xld);
Xptr = Mptr(X,Xii,Xjj,Xld,1);

for( k = 0; k < Xnq; k++ )
{
Expand Down Expand Up @@ -366,7 +366,7 @@ void psnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )
Xnp = PB_Cnumroc( *N, Xi, Xd[IMB_], Xd[MB_], myrow, Xd[RSRC_], nprow );
if( Xnp > 0 )
{
Xptr = X+(Xii+Xjj*Xd[LLD_]);
Xptr = Mptr(X,Xii,Xjj,Xd[LLD_],1);

for( k = 0; k < Xnp; k++ )
{
Expand Down
8 changes: 4 additions & 4 deletions PBLAS/SRC/psscal_.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,12 +210,12 @@ void psscal_( N, ALPHA, X, IX, JX, DESCX, INCX )
Xld = Xd[LLD_];
if( ALPHA[REAL_PART] == ZERO )
{
sset_( &Xnq, ((char *) ALPHA), ((char *)(X+(Xii+Xjj*Xld))),
sset_( &Xnq, ((char *) ALPHA), ((char *)Mptr(X,Xii,Xjj,Xld,1)),
&Xld );
}
else
{
sscal_( &Xnq, ((char *) ALPHA), ((char *)(X+(Xii+Xjj*Xld))),
sscal_( &Xnq, ((char *) ALPHA), ((char *)Mptr(X,Xii,Xjj,Xld,1)),
&Xld );
}
}
Expand All @@ -239,12 +239,12 @@ void psscal_( N, ALPHA, X, IX, JX, DESCX, INCX )
if( ALPHA[REAL_PART] == ZERO )
{
sset_( &Xnp, ((char *) ALPHA),
((char *)( X+(Xii+Xjj*Xd[LLD_]) )), INCX );
((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );
}
else
{
sscal_( &Xnp, ((char *) ALPHA),
((char *)( X+(Xii+Xjj*Xd[LLD_]) )), INCX );
((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1 )), INCX );
}
}
}
Expand Down