use the right type (Limb) instead of Culong for limbs

Author: rfourquet

base/gmp.jl

@@ -19,11 +19,21 @@ end
 typealias CdoubleMax Union(Float16, Float32, Float64)
 
 const GMP_VERSION = VersionNumber(bytestring(unsafe_load(cglobal((:__gmp_version, :libgmp), Ptr{Cchar}))))
+const GMP_BITS_PER_LIMB = Int(unsafe_load(cglobal((:__gmp_bits_per_limb, :libgmp), Cint)))
+
+if GMP_BITS_PER_LIMB == 32
+    typealias Limb UInt32
+elseif GMP_BITS_PER_LIMB == 64
+    typealias Limb UInt64
+else
+    error("GMP: cannot determine the type mp_limb_t")
+end
+
 
 type BigInt <: Integer
     alloc::Cint
     size::Cint
-    d::Ptr{Culong}
+    d::Ptr{Limb}
     function BigInt()
         b = new(zero(Cint), zero(Cint), C_NULL)
         ccall((:__gmpz_init,:libgmp), Void, (Ptr{BigInt},), &b)

base/random.jl

@@ -1,6 +1,7 @@
 module Random
 
-using Base: dSFMT, Base.GMP.GMP_VERSION
+using Base.dSFMT
+using Base.GMP: GMP_VERSION, Limb
 
 export srand,
        rand, rand!,
@@ -391,17 +392,17 @@ if GMP_VERSION.major >= 6
         a::BigInt             # first
         m::BigInt             # range length - 1
         nlimbs::Int           # number of limbs in generated BigInt's
-        mask::Culong          # applied to the highest limb
+        mask::Limb            # applied to the highest limb
     end
 
 else
     immutable RangeGeneratorBigInt <: RangeGenerator
         a::BigInt             # first
         m::BigInt             # range length - 1
-        limbs::Array{Culong}  # buffer to be copied into generated BigInt's
-        mask::Culong          # applied to the highest limb
+        limbs::Array{Limb}    # buffer to be copied into generated BigInt's
+        mask::Limb            # applied to the highest limb
 
-        RangeGeneratorBigInt(a, m, nlimbs, mask) = new(a, m, Array(Culong, nlimbs), mask)
+        RangeGeneratorBigInt(a, m, nlimbs, mask) = new(a, m, Array(Limb, nlimbs), mask)
     end
 end
 
@@ -411,9 +412,9 @@ function RangeGenerator(r::UnitRange{BigInt})
     m = last(r) - first(r)
     m < 0 && error("range must be non-empty")
     nd = ndigits(m, 2)
-    nlimbs, highbits = divrem(nd, 8*sizeof(Culong))
+    nlimbs, highbits = divrem(nd, 8*sizeof(Limb))
     highbits > 0 && (nlimbs += 1)
-    mask = highbits == 0 ? ~zero(Culong) : one(Culong)<<highbits - one(Culong)
+    mask = highbits == 0 ? ~zero(Limb) : one(Limb)<<highbits - one(Limb)
     return RangeGeneratorBigInt(first(r), m, nlimbs, mask)
 end
 
@@ -450,7 +451,7 @@ if GMP_VERSION.major >= 6
         x = BigInt()
         while true
             # note: on CRAY computers, the second argument may be of type Cint (48 bits) and not Clong
-            xd = ccall((:__gmpz_limbs_write, :libgmp), Ptr{Culong}, (Ptr{BigInt}, Clong), &x, g.nlimbs)
+            xd = ccall((:__gmpz_limbs_write, :libgmp), Ptr{Limb}, (Ptr{BigInt}, Clong), &x, g.nlimbs)
             limbs = pointer_to_array(xd, g.nlimbs)
             rand!(rng, limbs)
             limbs[end] &= g.mask
@@ -468,7 +469,7 @@ else
             g.limbs[end] &= g.mask
             ccall((:__gmpz_import, :libgmp), Void,
                   (Ptr{BigInt}, Csize_t, Cint, Csize_t, Cint, Csize_t, Ptr{Void}),
-                  &x, length(g.limbs), -1, sizeof(Culong), 0, 0, &g.limbs)
+                  &x, length(g.limbs), -1, sizeof(Limb), 0, 0, &g.limbs)
             x <= g.m && break
         end
         ccall((:__gmpz_add, :libgmp), Void, (Ptr{BigInt}, Ptr{BigInt}, Ptr{BigInt}), &x, &x, &g.a)