Changeset 27b3cf in git for factory/ffops.h

Timestamp:

Jul 18, 2006, 4:30:25 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dd73043aece50a3b540b469cacfe1e7bb5712915

Parents:

c89c574998a1ffa7816eb2b5e388287e16b1a4b0

Message:

*hannes: re-use NTL optimizations


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

File:

• factory/ffops.h (modified) (6 diffs)

factory/ffops.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: ffops.h,v 1.9 2005-11-08 18:08:58 Singular Exp $ */
+/* $Id: ffops.h,v 1.10 2006-07-18 14:30:25 Singular Exp $ */
 
 #ifndef INCL_FFOPS_H
@@ -8 +8 @@
 
 #include "cf_globals.h"
+#ifdef HAVE_NTL
+#include <NTL/config.h>
+#endif
 
 extern int ff_prime;
@@ -21 +24 @@
 {
     int n = a % ff_prime;
-    if ( n < 0 )
-        return n + ff_prime;
-    else
-        return n;
+#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+    n += (n >> 31) & ff_prime; 
+    return n;
+#else
+    if (n <0) n += ff_prime;
+    return n;
+#endif
 }
 
@@ -38 +44 @@
 {
     int n = (int)(a % (long)ff_prime);
-    if ( n < 0 )
-        return n + ff_prime;
-    else
-        return n;
+#if defined(i386) || defined(NTL_AVOID_BRANCHING)
+    n += (n >> 31) & ff_prime; 
+    return n;
+#else
+    if (n <0) n += ff_prime;
+    return n;
+#endif
 }
 
@@ -56 +65 @@
 {
     //return ff_norm( a + b );
-#ifdef i386
+#if defined(i386) || defined(NTL_AVOID_BRANCHING)
     int r=( a + b );
     r -= ff_prime;
@@ -71 +80 @@
 {
     //return ff_norm( a - b );
-#ifdef i386
+#if defined(i386) || defined(NTL_AVOID_BRANCHING)
     int r=( a - b );
     r += (r >> 31) & ff_prime;