Use dynamic arrays, get rid of TMP_*.

5 files changed, 15 insertions, 45 deletions

diff --git a/mpn/cray/add_n.c b/mpn/cray/add_n.c
index 87feb0655..2422a7528 100644
--- a/mpn/cray/add_n.c
+++ b/mpn/cray/add_n.c
@@ -40,25 +40,20 @@ mpn_add_n (c, a, b, n)
 
   if (a == c || b == c)
     {
-      TMP_DECL (marker);
-      TMP_MARK (marker);
-      if (c == a)
+      if (a == c)
 	{
 	  /* allocate temp space for a */
-	  mp_ptr ax = (mp_ptr) TMP_ALLOC (n * BYTES_PER_MP_LIMB);
+	  mp_limb_t ax[n];
 	  MPN_COPY (ax, a, n);
-	  a = (mp_srcptr) ax;
+	  return mpn_add_n (c, ax, b, n);
 	}
-      if (c == b)
+      if (b == c)
 	{
 	  /* allocate temp space for b */
-	  mp_ptr bx = (mp_ptr) TMP_ALLOC (n * BYTES_PER_MP_LIMB);
+	  mp_limb_t bx[n];
 	  MPN_COPY (bx, b, n);
-	  b = (mp_srcptr) bx;
+	  return mpn_add_n (c, a, bx, n);
 	}
-      carry_out = mpn_add_n (c, a, b, n);
-      TMP_FREE (marker);
-      return carry_out;
     }
 
   carry_out = a[nm1] + b[nm1] < a[nm1];
diff --git a/mpn/cray/addmul_1.c b/mpn/cray/addmul_1.c
index 4f1b6201d..c3b34a393 100644
--- a/mpn/cray/addmul_1.c
+++ b/mpn/cray/addmul_1.c
@@ -26,14 +26,8 @@ MA 02111-1307, USA.  */
 mp_limb_t
 mpn_addmul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t limb)
 {
-  mp_ptr p0, p1, tp;
+  mp_limb_t p0[n], p1[n], tp[n];
   mp_limb_t cy_limb;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
-
-  p1 = TMP_ALLOC (n * BYTES_PER_MP_LIMB);
-  p0 = TMP_ALLOC (n * BYTES_PER_MP_LIMB);
-  tp = TMP_ALLOC (n * BYTES_PER_MP_LIMB);
 
   GMPN_MULWW (p1, p0, up, &n, &limb);
   cy_limb = mpn_add_n (tp, rp, p0, n);
@@ -41,6 +35,5 @@ mpn_addmul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t limb)
   cy_limb += mpn_add_n (rp + 1, tp + 1, p1, n - 1);
   cy_limb += p1[n - 1];
 
-  TMP_FREE (marker);
   return cy_limb;
 }
diff --git a/mpn/cray/mul_1.c b/mpn/cray/mul_1.c
index ce467c640..d085aebbb 100644
--- a/mpn/cray/mul_1.c
+++ b/mpn/cray/mul_1.c
@@ -26,19 +26,13 @@ MA 02111-1307, USA.  */
 mp_limb_t
 mpn_mul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t limb)
 {
-  mp_ptr p0, p1;
+  mp_limb_t p0[n], p1[n];
   mp_limb_t cy_limb;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
-
-  p1 = TMP_ALLOC (n * BYTES_PER_MP_LIMB);
-  p0 = TMP_ALLOC (n * BYTES_PER_MP_LIMB);
 
   GMPN_MULWW (p1, p0, up, &n, &limb);
   rp[0] = p0[0];
   cy_limb = mpn_add_n (rp + 1, p0 + 1, p1, n - 1);
   cy_limb += p1[n - 1];
 
-  TMP_FREE (marker);
   return cy_limb;
 }
diff --git a/mpn/cray/sub_n.c b/mpn/cray/sub_n.c
index 01ae9c61b..9355f9e3e 100644
--- a/mpn/cray/sub_n.c
+++ b/mpn/cray/sub_n.c
@@ -40,25 +40,20 @@ mpn_sub_n (c, a, b, n)
 
   if (a == c || b == c)
     {
-      TMP_DECL (marker);
-      TMP_MARK (marker);
-      if (c == a)
+      if (a == c)
 	{
 	  /* allocate temp space for a */
-	  mp_ptr ax = (mp_ptr) TMP_ALLOC (n * BYTES_PER_MP_LIMB);
+	  mp_limb_t ax[n];
 	  MPN_COPY (ax, a, n);
-	  a = (mp_srcptr) ax;
+	  return mpn_sub_n (c, ax, b, n);
 	}
-      if (c == b)
+      if (b == c)
 	{
 	  /* allocate temp space for b */
-	  mp_ptr bx = (mp_ptr) TMP_ALLOC (n * BYTES_PER_MP_LIMB);
+	  mp_limb_t bx[n];
 	  MPN_COPY (bx, b, n);
-	  b = (mp_srcptr) bx;
+	  return mpn_sub_n (c, a, bx, n);
 	}
-      carry_out = mpn_sub_n (c, a, b, n);
-      TMP_FREE (marker);
-      return carry_out;
     }
 
   carry_out = a[nm1] < b[nm1];
diff --git a/mpn/cray/submul_1.c b/mpn/cray/submul_1.c
index 4f255b236..08159aa24 100644
--- a/mpn/cray/submul_1.c
+++ b/mpn/cray/submul_1.c
@@ -26,14 +26,8 @@ MA 02111-1307, USA.  */
 mp_limb_t
 mpn_submul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t limb)
 {
-  mp_ptr p0, p1, tp;
+  mp_limb_t p0[n], p1[n], tp[n];
   mp_limb_t cy_limb;
-  TMP_DECL (marker);
-  TMP_MARK (marker);
-
-  p1 = TMP_ALLOC (n * BYTES_PER_MP_LIMB);
-  p0 = TMP_ALLOC (n * BYTES_PER_MP_LIMB);
-  tp = TMP_ALLOC (n * BYTES_PER_MP_LIMB);
 
   GMPN_MULWW (p1, p0, up, &n, &limb);
   cy_limb = mpn_sub_n (tp, rp, p0, n);
@@ -41,6 +35,5 @@ mpn_submul_1 (mp_ptr rp, mp_srcptr up, mp_size_t n, mp_limb_t limb)
   cy_limb += mpn_sub_n (rp + 1, tp + 1, p1, n - 1);
   cy_limb += p1[n - 1];
 
-  TMP_FREE (marker);
   return cy_limb;
 }