Changeset 55b747 in git for libpolys/coeffs/modulop.h

Timestamp:

Apr 4, 2018, 6:55:03 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

15d6bf96cee82d224cc98ac91b2ee533a290e13a

Parents:

d795761c5157c077e2f8451be201ede9fd36fb3f

Message:

opt: Z/p arithm.

File:

• libpolys/coeffs/modulop.h (modified) (1 diff)

libpolys/coeffs/modulop.h

@@ -56 +56 @@
 {
   long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
-  return (number)(long)r->npExpTable[x<=r->npPminus1M ? x : x- r->npPminus1M];
+  #ifdef HAVE_GENERIC_ADD
+  if (x>r->npPminus1M) x-=r->npPminus1M;
+  #else
+    x-=r->npPminus1M;
+    #if SIZEOF_LONG == 8
+     x += (x >> 63) & r->npPminus1M;
+    #else
+     x += (x >> 31) & r->npPminus1M;
+    #endif
+  #endif
+  return (number)(long)r->npExpTable[x];
 }
 static inline void npInpMultM(number &a, number b, const coeffs r)
 {
   long x = (long)r->npLogTable[(long)a]+ r->npLogTable[(long)b];
-  a=(number)(long)r->npExpTable[x<=r->npPminus1M ? x : x- r->npPminus1M];
+  #ifdef HAVE_GENERIC_ADD
+  if (x>r->npPminus1M) x-=r->npPminus1M;
+  #else
+    x-=r->npPminus1M;
+    #if SIZEOF_LONG == 8
+     x += (x >> 63) & r->npPminus1M;
+    #else
+     x += (x >> 31) & r->npPminus1M;
+    #endif
+  #endif
+  a=(number)(long)r->npExpTable[x];
 }
 #endif