* Cumulative patch including Bruno's work on large fixnums on 64 bit machines.

[cln.git] / src / integer / bitwise / cl_I_ilength.cc

diff --git a/src/integer/bitwise/cl_I_ilength.cc b/src/integer/bitwise/cl_I_ilength.cc
index 8dbfb5eeeef014e3fc86d55ea75d0b536f5234ad..4bebae0264c9c045cbe12fcaa7780150b7f4e1e5 100644 (file)
--- a/src/integer/bitwise/cl_I_ilength.cc
+++ b/src/integer/bitwise/cl_I_ilength.cc
@@ -18,10 +18,16 @@ uintL integer_length (const cl_I& x)
 {
        if (fixnump(x))
          { var uintL bitcount = 0;
-           var uint32 x_ = FN_to_L(x); // x als 32-Bit-Zahl
-           if (FN_L_minusp(x,(sint32)x_)) { x_ = ~ x_; } // falls <0, komplementieren
-           if (!(x_==0)) { integerlength32(x_,bitcount=); }
-           return bitcount; // 0 <= bitcount < 32.
+           var uintV x_ = FN_to_V(x); // x als intVsize-Bit-Zahl
+           if (FN_V_minusp(x,(sintV)x_)) { x_ = ~ x_; } // falls <0, komplementieren
+           if (!(x_==0)) {
+              #if (intVsize>32)
+              integerlength64(x_,bitcount=);
+              #else
+              integerlength32(x_,bitcount=);
+              #endif
+            }
+           return bitcount; // 0 <= bitcount < intVsize.
          }
           else
           { var const uintD* MSDptr;