Changeset 863333 in git

Timestamp:

Jan 15, 2015, 11:45:47 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

777f8bb0bd3e850c5c7084702f167df3c1b53113

Parents:

cee2052c592af6805a2f85edda3e0bd517fb1b69

Message:

fix: nlInit, use 64bit if possible

File:

• libpolys/coeffs/longrat.cc (modified) (6 diffs)

libpolys/coeffs/longrat.cc

@@ -81 +81 @@
 #endif
 
-extern number nlOne; // FIXME? TODO? //  move into coeffs?
-
 nMapFunc nlSetMap(const coeffs src, const coeffs dst);
 
@@ -97 +95 @@
 
 // 64 bit version:
-//#if SIZEOF_LONG == 8
-#if 0
+#if SIZEOF_LONG == 8
+//#if 0
 #define MAX_NUM_SIZE 60
 #define POW_2_28 (1L<<60)
@@ -178 +176 @@
 
 
-number nlOne=INT_TO_SR(1);
-
 #if (__GNU_MP_VERSION*10+__GNU_MP_VERSION_MINOR < 31)
 void mpz_mul_si (mpz_ptr r, mpz_srcptr s, long int si)
@@ -331 +327 @@
   //}
   if (mpz_size1(a->z)>MP_SMALL) return TRUE;
-  LONG ui=(int)mpz_get_si(a->z);
+  LONG ui=(LONG)mpz_get_si(a->z);
   if ((((ui<<3)>>3)==ui)
   && (mpz_cmp_si(a->z,(long)ui)==0))
   {
     Print("!!longrat:im int %d in %s:%d\n",ui,f,l);
-    f=NULL;
     return FALSE;
   }
@@ -392 +387 @@
   if (f.isImm())
   {
-    const long lz=f.intval();
-    const int iz=(int)lz;
-    if ((long)iz==lz)
-      return nlInit(f.intval(),r);
-    else
-      return nlRInit(lz);
-//    return nlInit(f.intval(),r);
+    return nlInit(f.intval(),r);
   }
   else
@@ -2367 +2356 @@
 {
   number n;
+  #if MAX_NUM_SIZE == 60
+  if (((i << 3) >> 3) == i) n=INT_TO_SR(i);
+  else                      n=nlRInit(i);
+  #else
   LONG ii=(LONG)i;
-  if ( ((ii << 3) >> 3) == ii ) n=INT_TO_SR(ii);
-  else                          n=nlRInit(ii);
+  if ( (((long)ii==i) && ((ii << 3) >> 3) == ii )) n=INT_TO_SR(ii);
+  else                                             n=nlRInit(i);
+  #endif
   nlTest(n, r);
   return n;