Changeset 09171bd in git for factory/ffops.h

Timestamp:

Nov 8, 2005, 7:08:58 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

c91fefd86fa767380ec3afd51615cf5943a61c88

Parents:

79cf7d0d7efe4df23244844b4fcd1285ef913580

Message:

*hannes: removed MWERKS support
         optimized ffops with idea from Singular/kernel/modulop.h


git-svn-id: file:///usr/local/Singular/svn/trunk@8793 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.8 2005-11-08 16:03:18 Singular Exp $ */
+/* $Id: ffops.h,v 1.9 2005-11-08 18:08:58 Singular Exp $ */
 
 #ifndef INCL_FFOPS_H
@@ -44 +44 @@
 }
 
-#ifndef __MWERKS__
 inline int ff_bignorm ( const INT64 a )
 {
@@ -53 +52 @@
         return n;
 }
-#endif
 
 inline int ff_add ( const int a, const int b )
 {
     //return ff_norm( a + b );
+#ifdef i386
+    int r=( a + b );
+    r -= ff_prime;
+    r += (r >> 31) & ff_prime; 
+    return r;
+#else
     int r=( a + b );
     if (r >= ff_prime) r -= ff_prime;
     return r;
+#endif
 }
 
@@ -66 +71 @@
 {
     //return ff_norm( a - b );
+#ifdef i386
+    int r=( a - b );
+    r += (r >> 31) & ff_prime; 
+    return r;
+#else
     int r=( a - b );
     if (r <0) r += ff_prime;
     return r;
+#endif
 }
 
@@ -74 +85 @@
 {
     //return ff_norm( -a );
-    if (a==0) return 0;
-    return ff_prime-a;
+    return ( a == 0 ? 0 : ff_prime-a );
 }
 
-#ifdef __MWERKS__
-int ff_mul ( const int a, const int b );
-#else
 inline int ff_mul ( const int a, const int b )
 {
@@ -88 +95 @@
         return ff_longnorm ( (long)a * (long)b );
 }
-#endif
 
 inline int ff_inv ( const int a )