More GMP work

lib/integer.gd

@@ -799,7 +799,7 @@ DeclareGlobalFunction( "NextPrimeInt" );
 ##
 ##  <Description>
 ##  returns <M><A>r</A>^{<A>e</A>} \pmod{<A>m</A>}</M> for integers <A>r</A>,
-##  <A>e</A> and <A>m</A> (<M><A>e</A> \geq 0</M>).
+##  <A>e</A> and <A>m</A>.
 ##  <P/>
 ##  Note that <Ref Func="PowerModInt"/> can reduce intermediate results and
 ##  thus will generally be faster than using

lib/integer.gi

@@ -1161,40 +1161,7 @@ end);
 ##
 #F  PowerModInt(<r>,<e>,<m>)  . . . . . . power of one integer modulo another
 ##
-InstallGlobalFunction(PowerModInt,function ( r, e, m )
-    local   pow, f;
-
-    # handle special cases
-    if m = 1  then
-        return 0;
-    elif e = 0 then
-        return 1;
-    fi;
-
-    # reduce `r' initially
-    r := r mod m;
-
-    # if `e' is negative then invert `r' modulo `m' with Euclids algorithm
-    if e < 0  then
-        r := 1/r mod m;
-        e := -e;
-    fi;
-
-    # now use the repeated squaring method (right-to-left)
-    pow := 1;
-    f := 2 ^ (LogInt( e, 2 ) + 1);
-    while 1 < f  do
-        pow := (pow * pow) mod m;
-        f := QuoInt( f, 2 );
-        if f <= e  then
-            pow := (pow * r) mod m;
-            e := e - f;
-        fi;
-    od;
-
-    # return the power
-    return pow;
-end);
+InstallGlobalFunction(PowerModInt, POWERMODINT);
 
 
 #############################################################################
@@ -1805,24 +1772,13 @@ InstallMethod( StandardAssociateUnit,
 InstallOtherMethod( Valuation,
     "for two integers",
     IsIdenticalObj,
-    [ IsInt,
-      IsInt ],
+    [ IsInt, IsInt ],
     0,
-
 function( n, m )
-    local val;
-
     if n = 0  then
-        val := infinity;
-    else
-        val := 0;
-        while n mod m = 0  do
-            val := val + 1;
-            n   := n / m;
-        od;
+        return infinity;
     fi;
-    return val;
-
+    return PVALUATION_INT( n, m );
 end );
 
 

lib/numtheor.gi

@@ -333,45 +333,7 @@ end );
 #F  Jacobi( <n>, <m> ) . . . . . . . . . . . . . . . . . . . .  Jacobi symbol
 ##
 ##
-InstallGlobalFunction( Jacobi, function ( n, m )
-    local  jac, t;
-
-    # check the argument
-    if m <= 0  then Error("<m> must be positive");  fi;
-
-    # compute the Jacobi symbol similar to Euclid's algorithm
-    jac := 1;
-    while m <> 1  do
-
-        # if the gcd of $n$ and $m$ is $>1$ Jacobi returns $0$
-        if n = 0 or (n mod 2 = 0 and m mod 2 = 0)  then
-            jac := 0;  m := 1;
-
-        # $J(n,2*m) = J(n,m) * J(n,2) = J(n,m) * (-1)^{(n^2-1)/8}$
-        elif m mod 2 = 0  then
-            if n mod 8 = 3  or  n mod 8 = 5  then jac := -jac;  fi;
-            m := m / 2;
-
-        # $J(2*n,m) = J(n,m) * J(2,m) = J(n,m) * (-1)^{(m^2-1)/8}$
-        elif n mod 2 = 0  then
-            if m mod 8 = 3  or  m mod 8 = 5  then jac := -jac;  fi;
-            n := n / 2;
-
-        # $J(-n,m) = J(n,m) * J(-1,m) = J(n,m) * (-1)^{(m-1)/2}$
-        elif n < 0  then
-            if m mod 4 = 3  then jac := -jac;  fi;
-            n := -n;
-
-        # $J(n,m) = J(m,n) * (-1)^{(n-1)*(m-1)/4}$ (quadratic reciprocity)
-        else
-            if n mod 4 = 3  and m mod 4 = 3  then jac := -jac;  fi;
-            t := n;  n := m mod n;  m := t;
-
-        fi;
-    od;
-
-    return jac;
-end );
+InstallGlobalFunction( Jacobi, JACOBI_INT );
 
 
 #############################################################################
@@ -1385,24 +1347,16 @@ end );
 
 
 InstallGlobalFunction(PValuation,function(n,p)
-local a,v;
-  if not IsPrimeInt(p) or not IsRat(n) then
+local v;
+  if not IsInt(p) or not IsRat(n) or p = 0 then
     Error("wrong parameters");
   fi;
-  if IsZero(n) then 
+  if n = 0 then
     return infinity;
-  elif not IsInt(n) then
-    return PValuation(NumeratorRat(n),p)-PValuation(DenominatorRat(n),p);
-  elif n<0 then n:=-n;
+  elif IsInt(n) then
+    return PVALUATION_INT(n,p);
   fi;
-  a:=1;
-  v:=0;
-  while n mod p=0 do
-    a:=a*p;
-    v:=v+1;
-    n:=n/p;
-  od;
-  return v;
+  return PVALUATION_INT(NumeratorRat(n),p) - PVALUATION_INT(DenominatorRat(n),p);
 end);
 
 #T ##########################################################################

src/code.c

@@ -1763,7 +1763,6 @@ void CodeLongIntExpr (
     }
 
     /* otherwise stuff the value into the values list                      */
-    /* Need to fix this up for GMP integers */
     else {
         expr = NewExpr( T_INT_EXPR, sizeof(UInt) + SIZE_OBJ(val) );
         ((UInt *)ADDR_EXPR(expr))[0] = (UInt)TNUM_OBJ(val);

src/compiled.h

@@ -334,9 +334,9 @@ extern  Obj             GF_NEXT_ITER;
    due to limb size or other aspects of the representation */
 
 static inline  Obj C_MAKE_INTEGER_BAG( UInt size, UInt type)  {
-  /* Round size up to nearest multiple of INTEGER_ALLOCATION_SIZE */
-  return NewBag(type,INTEGER_ALLOCATION_SIZE*
-                ((size + INTEGER_ALLOCATION_SIZE-1)/INTEGER_ALLOCATION_SIZE));
+  /* Round size up to nearest multiple of INTEGER_UNIT_SIZE */
+  return NewBag(type,INTEGER_UNIT_SIZE*
+                ((size + INTEGER_UNIT_SIZE-1)/INTEGER_UNIT_SIZE));
 }