Unconditionally include string.h

[libfirm] / ir / adt / gaussjordan.c

diff --git a/ir/adt/gaussjordan.c b/ir/adt/gaussjordan.c
index 8d71d4d..34cd9b6 100644 (file)
--- a/ir/adt/gaussjordan.c
+++ b/ir/adt/gaussjordan.c
@@ -32,9 +32,7 @@
 /* returns 0 if successful                              */
 /* returns -1 if ill-conditioned matrix                 */
 /*------------------------------------------------------*/
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <math.h>
 #include <stdlib.h>
@@ -46,8 +44,8 @@ int firm_gaussjordansolve(double *A, double *vec, int nsize)
 {
        int i, j, row, col, col2, biggest_r = 0, biggest_c = 0, t;
        double big, temp, sum;
-       double *scramvec = xmalloc(nsize * sizeof(*scramvec));
-       int *x = xmalloc(nsize * sizeof(*x));
+       double *scramvec = XMALLOCN(double, nsize);
+       int    *x        = XMALLOCN(int,    nsize);
        int res = 0;
 
 #define _A(row,col) A[(row)*nsize + (col)]
@@ -72,60 +70,64 @@ int firm_gaussjordansolve(double *A, double *vec, int nsize)
                }
                if (big < SMALL) {
                        res = -1;
-               } else {
-                       /* swap rows */
-                       for(i=0;i<nsize;i++) {
-                               temp = _A(col,i);
-                               _A(col,i) = _A(biggest_r,i);
-                               _A(biggest_r,i) = temp;
-                       }
-                       /* swap vec elements */
-                       temp = vec[col];
-                       vec[col] = vec[biggest_r];
-                       vec[biggest_r] = temp;
-
-                       /* swap columns */
-                       for(i=0;i<nsize;i++) {
-                               temp = _A(i,col);
-                               _A(i,col) = _A(i,biggest_c);
-                               _A(i,biggest_c) = temp;
-                       }
-                       /* swap unknowns */
-                       t = x[col];
-                       x[col] = x[biggest_c];
-                       x[biggest_c] = t;
+                       goto end;
+               }
 
-                       /* partially annihilate this col */
-                       /* zero columns below diag */
-                       for(row=col+1;row<nsize;row++) {
+               /* swap rows */
+               for(i=0;i<nsize;i++) {
+                       temp = _A(col,i);
+                       _A(col,i) = _A(biggest_r,i);
+                       _A(biggest_r,i) = temp;
+               }
+               /* swap vec elements */
+               temp = vec[col];
+               vec[col] = vec[biggest_r];
+               vec[biggest_r] = temp;
 
-                               /* changes during calc */
-                               temp = _A(row,col) / _A(col,col);
+               /* swap columns */
+               for(i=0;i<nsize;i++) {
+                       temp = _A(i,col);
+                       _A(i,col) = _A(i,biggest_c);
+                       _A(i,biggest_c) = temp;
+               }
+               /* swap unknowns */
+               t = x[col];
+               x[col] = x[biggest_c];
+               x[biggest_c] = t;
 
-                               /* annihilates A[][] */
-                               for(i=col;i<nsize;i++)
-                                       _A(row,i) = _A(row,i) - temp * _A(col,i);
+               /* partially annihilate this col */
+               /* zero columns below diag */
+               for(row=col+1;row<nsize;row++) {
 
-                               /* same op on vec */
-                               vec[row] = vec[row] - temp * vec[col];
-                       }
-               }
-               /* back-solve, store solution in scramvec */
-               scramvec[nsize - 1] = vec[nsize - 1] / _A(nsize - 1,nsize - 1);
-
-               /* answer needs sorting */
-               for(i=nsize-2;i>=0;i--) {
-                       sum = 0;
-                       for(j=i+1;j<nsize;j++)
-                               sum = sum + _A(i,j) * scramvec[j];
-                       scramvec[i] = (vec[i] - sum) / _A(i,i);
-               }
-               /* reorder unknowns--return in vec */
-               for(i=0;i<nsize;i++) {
-                       j = x[i];
-                       vec[j] = scramvec[i];
+                       /* changes during calc */
+                       temp = _A(row,col) / _A(col,col);
+
+                       /* annihilates A[][] */
+                       for(i=col;i<nsize;i++)
+                               _A(row,i) = _A(row,i) - temp * _A(col,i);
+
+                       /* same op on vec */
+                       vec[row] = vec[row] - temp * vec[col];
                }
        }
+
+       /* back-solve, store solution in scramvec */
+       scramvec[nsize - 1] = vec[nsize - 1] / _A(nsize - 1,nsize - 1);
+
+       /* answer needs sorting */
+       for(i=nsize-2;i>=0;i--) {
+               sum = 0;
+               for(j=i+1;j<nsize;j++)
+                       sum = sum + _A(i,j) * scramvec[j];
+               scramvec[i] = (vec[i] - sum) / _A(i,i);
+       }
+       /* reorder unknowns--return in vec */
+       for(i=0;i<nsize;i++) {
+               j = x[i];
+               vec[j] = scramvec[i];
+       }
+
+end:
        free(x);
        free(scramvec);