Changeset d322f7 in git

Timestamp:

Oct 4, 2010, 11:31:51 AM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

9257fe4f6b84d0ceb446c0c736dc18646bb92432

Parents:

e0cb6c27360dbf0c972201dd6f5136ef5a791f4f

Message:

64bit stuff

git-svn-id: file:///usr/local/Singular/svn/trunk@13382 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/misc_ip.cc (modified) (6 diffs)

Singular/misc_ip.cc

@@ -110 +110 @@
 }
 
-void setListEntry_ui(lists L, int index, long ui)
+void setListEntry_ui(lists L, int index, unsigned long ui)
 { /* assumes n > 0 */
   /* try to fit nn into an int: */
-  if (((ui<<3)>>3)==ui)
-  {
-    L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)ui;
+  int i=(int)ui;
+  if ((((unsigned long)i)==ui) && (((i<<3)>>3)==i))
+  {
+    L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)i;
   }
   else
   {
-    number nn = nlInit(ui,NULL);
+    number nn = nlRInit(ui);
+    mpz_set_ui(nn->z,ui);
     L->m[index].rtyp = BIGINT_CMD; L->m[index].data = (void*)nn;
   }
@@ -197 +199 @@
   if (!nlIsZero(n))
   {
-    if (!nlGreaterZero(n)) 
+    if (!nlGreaterZero(n))
     {
       positive=-1;
@@ -219 +221 @@
     mpz_sqrt(sr, nn);
     if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
-    int limit=mpz_get_ui(pb);
+    unsigned long  limit=mpz_get_ui(pb);
     if ((limit==0)||(mpz_cmp_ui(pb,limit)!=0)) limit=1<<31;
     while (p_ui <=limit)
@@ -230 +232 @@
         //mpz_sqrt(sr, nn);
         //if ((mpz_cmp_ui(b, 0) == 0) || (mpz_cmp(pb, sr) > 0)) mpz_set(pb, sr);
-        if (mpz_size1(nn)<=2) 
+        if (mpz_size1(nn)<=2)
         {
           mpz_sqrt(sr, nn);
@@ -236 +238 @@
           unsigned long l=mpz_get_ui(sr);
           if (l<limit) limit=l;
-          if (mpz_size1(nn)<=1)
-          {
-            unsigned long nn_ui=mpz_get_ui(nn);
-            while ((p_ui <=limit)&&(nn_ui>1))
-            {
+          if (mpz_size1(nn)<=1)
+          {
+            unsigned long nn_ui=mpz_get_ui(nn);
+            while ((p_ui <=limit)&&(nn_ui>1))
+            {
               divTimes_ui_ui(&nn_ui, p_ui, &tt);
               if (tt > 0)
@@ -246 +248 @@
                 setListEntry_ui(primes, index, p_ui);
                 multiplicities[index++] = tt;
-                if (nn_ui>(limit/6)) limit=nn_ui/6;
+                if (nn_ui>(limit/6)) limit=nn_ui/6;
               }
               p_ui +=add;
               add += 2; if (add == 6) add = 2;
-            }
-            mpz_set_ui(nn,nn_ui);
-            break;
-          }
+            }
+            mpz_set_ui(nn,nn_ui);
+            break;
+          }
         }
       }