Use pointer macro to prevent integer oveflow

luszczek · luszczek · commit ab6b157e502b · 2019-12-22T16:43:56.000-05:00
An integer overflow occurs and causes segmentation fault
when 2D row/col index is linearized using 32-bit integers.
PBLAS Mptr() macro should be used instead.

This fix only fixes address calculations with row, column, and leading
dimension. There might be other places where an overflow occurs but
they may not matter for practical purposes because they would require
very large matrices or very long vectors within a single process.
diff --git a/PBLAS/SRC/pdamax_.c b/PBLAS/SRC/pdamax_.c
@@ -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;
    }
@@ -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
@@ -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
             {
@@ -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
@@ -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
             {
diff --git a/PBLAS/SRC/pdasum_.c b/PBLAS/SRC/pdasum_.c
@@ -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;
    }
@@ -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 );
          }
 /*
@@ -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)
diff --git a/PBLAS/SRC/pdger_.c b/PBLAS/SRC/pdger_.c
@@ -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 );
diff --git a/PBLAS/SRC/pdnrm2_.c b/PBLAS/SRC/pdnrm2_.c
@@ -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_] )
@@ -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++ )
             {
@@ -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++ )
             {
diff --git a/PBLAS/SRC/pdscal_.c b/PBLAS/SRC/pdscal_.c
@@ -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 );
             }
          }
@@ -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 );
             }
          }
       }
diff --git a/PBLAS/SRC/psamax_.c b/PBLAS/SRC/psamax_.c
@@ -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 ));
@@ -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
             {
@@ -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
diff --git a/PBLAS/SRC/psasum_.c b/PBLAS/SRC/psasum_.c
@@ -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;
    }
@@ -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 );
          }
 /*
@@ -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)
diff --git a/PBLAS/SRC/psger_.c b/PBLAS/SRC/psger_.c
@@ -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 );
diff --git a/PBLAS/SRC/psnrm2_.c b/PBLAS/SRC/psnrm2_.c
@@ -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_] )
@@ -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++ )
             {
@@ -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++ )
             {
diff --git a/PBLAS/SRC/psscal_.c b/PBLAS/SRC/psscal_.c
@@ -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 );
             }
          }
@@ -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 );
             }
          }
       }

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )`
`233`	`233`	`if( ( ( myrow == Xrow ) \|\| ( Xrow < 0 ) ) &&`
`234`	`234`	`( ( mycol == Xcol ) \|\| ( Xcol < 0 ) ) )`
`235`	`235`	`{`
`236`		`- INDX = JX; AMAX = X[Xii+XjjXd[LLD_]];`
	`236`	`+ INDX = JX; AMAX = Mptr(X,Xii,Xjj,Xd[LLD_],1);`
`237`	`237`	`}`
`238`	`238`	`return;`
`239`	`239`	`}`
`@@ -260,9 +260,9 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )`
`260`	`260`	`{`
`261`	`261`	`Xld = Xd[LLD_];`
`262`	`262`	`Xlindx = Xjj - 1 +`
`263`		`- idamax_( &Xnq, ((char)(X+(Xii+XjjXld))), &Xld );`
	`263`	`+ idamax_( &Xnq, ((char*)Mptr(X,Xii,Xjj,Xld,1)), &Xld );`
`264`	`264`	`Mindxl2g( Xgindx, Xlindx, Xinb, Xnb, mycol, Xsrc, npcol );`
`265`		`- work[0] = X[Xii+Xlindx*Xld];`
	`265`	`+ work[0] = *Mptr(X,Xii,Xlindx,Xld,1);`
`266`	`266`	`work[1] = ((double)( Xgindx+1 ));`
`267`	`267`	`}`
`268`	`268`	`else`
`@@ -343,8 +343,8 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )`
`343`	`343`	`*/`
`344`	`344`	`Xld = Xd[LLD_];`
`345`	`345`	`Xlindx = Xjj - 1 +`
`346`		`- idamax_( &Xnq, ((char)(X+(Xii+XjjXld))), &Xld );`
`347`		`- AMAX = X[Xii+XlindxXld];`
	`346`	`+ idamax_( &Xnq, ((char*)Mptr(X,Xii,Xjj,Xld,1)), &Xld );`
	`347`	`+ AMAX = Mptr(X,Xii,Xlindx,Xld,1);`
`348`	`348`	`}`
`349`	`349`	`else`
`350`	`350`	`{`
`@@ -419,9 +419,9 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )`
`419`	`419`	`{`
`420`	`420`	`Xld = Xd[LLD_];`
`421`	`421`	`Xlindx = Xii - 1 +`
`422`		`- idamax_( &Xnp, ((char)(X+(Xii+XjjXld))), INCX );`
	`422`	`+ idamax_( &Xnp, ((char*)Mptr(X,Xii,Xjj,Xld,1)), INCX );`
`423`	`423`	`Mindxl2g( Xgindx, Xlindx, Ximb, Xmb, myrow, Xsrc, nprow );`
`424`		`- work[0] = X[Xlindx+Xjj*Xld];`
	`424`	`+ work[0] = *Mptr(X,Xlindx,Xjj,Xld,1);`
`425`	`425`	`work[1] = ((double)( Xgindx+1 ));`
`426`	`426`	`}`
`427`	`427`	`else`
`@@ -503,8 +503,8 @@ void pdamax_( N, AMAX, INDX, X, IX, JX, DESCX, INCX )`
`503`	`503`	`*/`
`504`	`504`	`Xld = Xd[LLD_];`
`505`	`505`	`Xlindx = Xii - 1 +`
`506`		`- idamax_( &Xnp, ((char)(X+(Xii+XjjXld))), INCX );`
`507`		`- AMAX = X[Xlindx+XjjXld];`
	`506`	`+ idamax_( &Xnp, ((char*)Mptr(X,Xii,Xjj,Xld,1)), INCX );`
	`507`	`+ AMAX = Mptr(X,Xlindx,Xjj,Xld,1);`
`508`	`508`	`}`
`509`	`509`	`else`
`510`	`510`	`{`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ void pdasum_( N, ASUM, X, IX, JX, DESCX, INCX )`
`225`	`225`	`if( ( ( myrow == Xrow ) \|\| ( Xrow < 0 ) ) &&`
`226`	`226`	`( ( mycol == Xcol ) \|\| ( Xcol < 0 ) ) )`
`227`	`227`	`{`
`228`		`- ASUM = ABS( X[Xii+XjjXd[LLD_]] );`
	`228`	`+ ASUM = ABS( Mptr(X,Xii,Xjj,Xd[LLD_],1) );`
`229`	`229`	`}`
`230`	`230`	`return;`
`231`	`231`	`}`
`@@ -243,7 +243,7 @@ void pdasum_( N, ASUM, X, IX, JX, DESCX, INCX )`
`243`	`243`	`if( Xnq > 0 )`
`244`	`244`	`{`
`245`	`245`	`Xld = Xd[LLD_];`
`246`		`- dvasum_( &Xnq, ((char ) ASUM), ((char )( X+(Xii+Xjj*Xld) )),`
	`246`	`+ dvasum_( &Xnq, ((char ) ASUM), ((char )Mptr( X,Xii,Xjj,Xld,1 )),`
`247`	`247`	`&Xld );`
`248`	`248`	`}`
`249`	`249`	`/*`
`@@ -276,7 +276,7 @@ void pdasum_( N, ASUM, X, IX, JX, DESCX, INCX )`
`276`	`276`	`if( Xnp > 0 )`
`277`	`277`	`{`
`278`	`278`	`dvasum_( &Xnp, ((char *) ASUM),`
`279`		`- ((char )( X+(Xii+XjjXd[LLD_]) )), INCX );`
	`279`	`+ ((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );`
`280`	`280`	`}`
`281`	`281`	`/*`
`282`	`282`	`* If Xnp <= 0, ASUM is zero (see initialization above)`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ void pdger_( M, N, ALPHA, X, IX, JX, DESCX, INCX, Y, IY, JY, DESCY,`
`286`	`286`	`if( ( Amp > 0 ) && ( Anq > 0 ) )`
`287`	`287`	`{`
`288`	`288`	`dger_( &Amp, &Anq, ((char *) ALPHA), XA, &ione, YA, &YAd[LLD_],`
`289`		`- ((char ) (A+(Aii+AjjAld))), &Ald );`
	`289`	`+ ((char *)Mptr(A,Aii,Ajj,Ald,1)), &Ald );`
`290`	`290`	`}`
`291`	`291`	`if( XAfr ) free( XA );`
`292`	`292`	`if( YAfr ) free( YA );`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ void pdnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )`
`224`	`224`	`*/`
`225`	`225`	`if( ( ( myrow == Xrow ) \|\| ( Xrow < 0 ) ) &&`
`226`	`226`	`( ( mycol == Xcol ) \|\| ( Xcol < 0 ) ) )`
`227`		`- NORM2 = ABS( X[Xii+XjjXd[LLD_]] );`
	`227`	`+ NORM2 = ABS( Mptr(X,Xii,Xjj,Xd[LLD_],1) );`
`228`	`228`	`return;`
`229`	`229`	`}`
`230`	`230`	`else if( *INCX == Xd[M_] )`
`@@ -246,7 +246,7 @@ void pdnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )`
`246`	`246`	`if( Xnq > 0 )`
`247`	`247`	`{`
`248`	`248`	`Xld = Xd[LLD_];`
`249`		`- Xptr = X+(Xii+Xjj*Xld);`
	`249`	`+ Xptr = Mptr(X,Xii,Xjj,Xld,1);`
`250`	`250`
`251`	`251`	`for( k = 0; k < Xnq; k++ )`
`252`	`252`	`{`
`@@ -366,7 +366,7 @@ void pdnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )`
`366`	`366`	`Xnp = PB_Cnumroc( *N, Xi, Xd[IMB_], Xd[MB_], myrow, Xd[RSRC_], nprow );`
`367`	`367`	`if( Xnp > 0 )`
`368`	`368`	`{`
`369`		`- Xptr = X+(Xii+Xjj*Xd[LLD_]);`
	`369`	`+ Xptr = Mptr(X,Xii,Xjj,Xd[LLD_],1);`
`370`	`370`
`371`	`371`	`for( k = 0; k < Xnp; k++ )`
`372`	`372`	`{`
Original file line number	Diff line number	Diff line change
`@@ -210,12 +210,12 @@ void pdscal_( N, ALPHA, X, IX, JX, DESCX, INCX )`
`210`	`210`	`Xld = Xd[LLD_];`
`211`	`211`	`if( ALPHA[REAL_PART] == ZERO )`
`212`	`212`	`{`
`213`		`- dset_( &Xnq, ((char ) ALPHA), ((char )(X+(Xii+Xjj*Xld))),`
	`213`	`+ dset_( &Xnq, ((char ) ALPHA), ((char )Mptr(X,Xii,Xjj,Xld,1)),`
`214`	`214`	`&Xld );`
`215`	`215`	`}`
`216`	`216`	`else`
`217`	`217`	`{`
`218`		`- dscal_( &Xnq, ((char ) ALPHA), ((char )(X+(Xii+Xjj*Xld))),`
	`218`	`+ dscal_( &Xnq, ((char ) ALPHA), ((char )Mptr(X,Xii,Xjj,Xld,1)),`
`219`	`219`	`&Xld );`
`220`	`220`	`}`
`221`	`221`	`}`
`@@ -239,12 +239,12 @@ void pdscal_( N, ALPHA, X, IX, JX, DESCX, INCX )`
`239`	`239`	`if( ALPHA[REAL_PART] == ZERO )`
`240`	`240`	`{`
`241`	`241`	`dset_( &Xnp, ((char *) ALPHA),`
`242`		`- ((char )( X+(Xii+XjjXd[LLD_]) )), INCX );`
	`242`	`+ ((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );`
`243`	`243`	`}`
`244`	`244`	`else`
`245`	`245`	`{`
`246`	`246`	`dscal_( &Xnp, ((char *) ALPHA),`
`247`		`- ((char )( X+(Xii+XjjXd[LLD_]) )), INCX );`
	`247`	`+ ((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`}`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ void psasum_( N, ASUM, X, IX, JX, DESCX, INCX )`
`225`	`225`	`if( ( ( myrow == Xrow ) \|\| ( Xrow < 0 ) ) &&`
`226`	`226`	`( ( mycol == Xcol ) \|\| ( Xcol < 0 ) ) )`
`227`	`227`	`{`
`228`		`- ASUM = ABS( X[Xii+XjjXd[LLD_]] );`
	`228`	`+ ASUM = ABS( Mptr(X,Xii,Xjj,Xd[LLD_],1) );`
`229`	`229`	`}`
`230`	`230`	`return;`
`231`	`231`	`}`
`@@ -243,7 +243,7 @@ void psasum_( N, ASUM, X, IX, JX, DESCX, INCX )`
`243`	`243`	`if( Xnq > 0 )`
`244`	`244`	`{`
`245`	`245`	`Xld = Xd[LLD_];`
`246`		`- svasum_( &Xnq, ((char ) ASUM), ((char )( X+(Xii+Xjj*Xld) )),`
	`246`	`+ svasum_( &Xnq, ((char ) ASUM), ((char )Mptr( X,Xii,Xjj,Xld,1) ),`
`247`	`247`	`&Xld );`
`248`	`248`	`}`
`249`	`249`	`/*`
`@@ -276,7 +276,7 @@ void psasum_( N, ASUM, X, IX, JX, DESCX, INCX )`
`276`	`276`	`if( Xnp > 0 )`
`277`	`277`	`{`
`278`	`278`	`svasum_( &Xnp, ((char *) ASUM),`
`279`		`- ((char )( X+(Xii+XjjXd[LLD_]) )), INCX );`
	`279`	`+ ((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );`
`280`	`280`	`}`
`281`	`281`	`/*`
`282`	`282`	`* If Xnp <= 0, ASUM is zero (see initialization above)`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ void psger_( M, N, ALPHA, X, IX, JX, DESCX, INCX, Y, IY, JY, DESCY,`
`286`	`286`	`if( ( Amp > 0 ) && ( Anq > 0 ) )`
`287`	`287`	`{`
`288`	`288`	`sger_( &Amp, &Anq, ((char *) ALPHA), XA, &ione, YA, &YAd[LLD_],`
`289`		`- ((char ) (A+(Aii+AjjAld))), &Ald );`
	`289`	`+ ((char *)Mptr(A,Aii,Ajj,Ald,1)), &Ald );`
`290`	`290`	`}`
`291`	`291`	`if( XAfr ) free( XA );`
`292`	`292`	`if( YAfr ) free( YA );`
Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ void psnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )`
`224`	`224`	`*/`
`225`	`225`	`if( ( ( myrow == Xrow ) \|\| ( Xrow < 0 ) ) &&`
`226`	`226`	`( ( mycol == Xcol ) \|\| ( Xcol < 0 ) ) )`
`227`		`- NORM2 = ABS( X[Xii+XjjXd[LLD_]] );`
	`227`	`+ NORM2 = ABS( Mptr(X,Xii,Xjj,Xd[LLD_],1) );`
`228`	`228`	`return;`
`229`	`229`	`}`
`230`	`230`	`else if( *INCX == Xd[M_] )`
`@@ -246,7 +246,7 @@ void psnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )`
`246`	`246`	`if( Xnq > 0 )`
`247`	`247`	`{`
`248`	`248`	`Xld = Xd[LLD_];`
`249`		`- Xptr = X+(Xii+Xjj*Xld);`
	`249`	`+ Xptr = Mptr(X,Xii,Xjj,Xld,1);`
`250`	`250`
`251`	`251`	`for( k = 0; k < Xnq; k++ )`
`252`	`252`	`{`
`@@ -366,7 +366,7 @@ void psnrm2_( N, NORM2, X, IX, JX, DESCX, INCX )`
`366`	`366`	`Xnp = PB_Cnumroc( *N, Xi, Xd[IMB_], Xd[MB_], myrow, Xd[RSRC_], nprow );`
`367`	`367`	`if( Xnp > 0 )`
`368`	`368`	`{`
`369`		`- Xptr = X+(Xii+Xjj*Xd[LLD_]);`
	`369`	`+ Xptr = Mptr(X,Xii,Xjj,Xd[LLD_],1);`
`370`	`370`
`371`	`371`	`for( k = 0; k < Xnp; k++ )`
`372`	`372`	`{`
Original file line number	Diff line number	Diff line change
`@@ -210,12 +210,12 @@ void psscal_( N, ALPHA, X, IX, JX, DESCX, INCX )`
`210`	`210`	`Xld = Xd[LLD_];`
`211`	`211`	`if( ALPHA[REAL_PART] == ZERO )`
`212`	`212`	`{`
`213`		`- sset_( &Xnq, ((char ) ALPHA), ((char )(X+(Xii+Xjj*Xld))),`
	`213`	`+ sset_( &Xnq, ((char ) ALPHA), ((char )Mptr(X,Xii,Xjj,Xld,1)),`
`214`	`214`	`&Xld );`
`215`	`215`	`}`
`216`	`216`	`else`
`217`	`217`	`{`
`218`		`- sscal_( &Xnq, ((char ) ALPHA), ((char )(X+(Xii+Xjj*Xld))),`
	`218`	`+ sscal_( &Xnq, ((char ) ALPHA), ((char )Mptr(X,Xii,Xjj,Xld,1)),`
`219`	`219`	`&Xld );`
`220`	`220`	`}`
`221`	`221`	`}`
`@@ -239,12 +239,12 @@ void psscal_( N, ALPHA, X, IX, JX, DESCX, INCX )`
`239`	`239`	`if( ALPHA[REAL_PART] == ZERO )`
`240`	`240`	`{`
`241`	`241`	`sset_( &Xnp, ((char *) ALPHA),`
`242`		`- ((char )( X+(Xii+XjjXd[LLD_]) )), INCX );`
	`242`	`+ ((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1) ), INCX );`
`243`	`243`	`}`
`244`	`244`	`else`
`245`	`245`	`{`
`246`	`246`	`sscal_( &Xnp, ((char *) ALPHA),`
`247`		`- ((char )( X+(Xii+XjjXd[LLD_]) )), INCX );`
	`247`	`+ ((char *)Mptr( X,Xii,Xjj,Xd[LLD_],1 )), INCX );`
`248`	`248`	`}`
`249`	`249`	`}`
`250`	`250`	`}`