Fix build breakage on Sparc.

[cln.git] / src / base / digitseq / cl_2DS_recip.cc

diff --git a/src/base/digitseq/cl_2DS_recip.cc b/src/base/digitseq/cl_2DS_recip.cc
index 73a9ef35e12f7d7d903e9809645d85eec5bacdd7..8d615ecbc21c55a7b9fd8632a653dfb670b7dde7 100644 (file)
--- a/src/base/digitseq/cl_2DS_recip.cc
+++ b/src/base/digitseq/cl_2DS_recip.cc
@@ -1,19 +1,26 @@
 // recip2adic().
 
 // General includes.
-#include "cl_sysdep.h"
+#include "base/cl_sysdep.h"
 
 // Specification.
-#include "cl_2DS.h"
+#include "base/digitseq/cl_2DS.h"
 
 
 // Implementation.
 
-#include "cl_2D.h"
-#include "cl_DS.h"
+#include "base/digit/cl_2D.h"
+#include "base/digitseq/cl_DS.h"
 
 // Break-even point of the Newton iteration vs. standard div2adic.
+#if CL_USE_GMP
+const unsigned int recip2adic_threshold = 620;
+#else
+// Use the old default values from CLN version <= 1.0.3 as a crude estimate.
 const unsigned int recip2adic_threshold = 380;
+#endif
+
+namespace cln {
 
 void recip2adic (uintC len, const uintD* a_LSDptr, uintD* dest_LSDptr)
 {
@@ -24,7 +31,7 @@ void recip2adic (uintC len, const uintD* a_LSDptr, uintD* dest_LSDptr)
        //   return 2*b-a*b^2 mod 2^(intDsize*2*n).
        CL_ALLOCA_STACK;
        var uintL k = 0; // number of Newton steps
-       var uintL n = len;
+       var uintC n = len;
        while (n >= recip2adic_threshold) {
                n = ceiling(n,2);
                k++;
@@ -40,13 +47,13 @@ void recip2adic (uintC len, const uintD* a_LSDptr, uintD* dest_LSDptr)
                var uintD* b2_LSDptr;
                var uintD* prod_LSDptr;
                num_stack_alloc(len+1,,b2_LSDptr=);
-               num_stack_alloc(2*(uintL)len,,prod_LSDptr=);
+               num_stack_alloc(2*len,,prod_LSDptr=);
                do {
                        // n = ceiling(len/2^k)
                        // Compute n2 = ceiling(len/2^(k-1)),
                        // then n = ceiling(n2/2).
                        k--;
-                       var uintL n2 = ((len-1)>>k)+1; // = 2*n or = 2*n-1
+                       var uintC n2 = ((len-1)>>k)+1; // = 2*n or = 2*n-1
                        // Set b := 2*b-a*b^2 mod 2^(intDsize*n2)
                        cl_UDS_mul_square(dest_LSDptr,n,b2_LSDptr); // b^2
                        cl_UDS_mul(b2_LSDptr,n2,a_LSDptr,n2,prod_LSDptr); // a*b^2
@@ -59,3 +66,4 @@ void recip2adic (uintC len, const uintD* a_LSDptr, uintD* dest_LSDptr)
 }
 // Bit complexity (N := len): O(M(N)).
 
+}  // namespace cln