[Ecm-commits] r2538 - in trunk: . build.vc12

cvs commits ecm-commits at lists.gforge.inria.fr
Mon Jun 16 17:23:11 CEST 2014


Author: brian_gladman
Date: 2014-06-16 17:23:10 +0200 (Mon, 16 Jun 2014)
New Revision: 2538

Removed:
   trunk/build.vc12/test.pm1.save
Modified:
   trunk/build.vc12/
   trunk/ecm-gmp.h
   trunk/ecm-impl.h
Log:
1. remove a file committed in error
2. correct the interface to the new MPIR FFT 


Property changes on: trunk/build.vc12
___________________________________________________________________
Added: svn:ignore
   + test.pm1.save


Deleted: trunk/build.vc12/test.pm1.save
===================================================================
--- trunk/build.vc12/test.pm1.save	2014-04-08 07:55:54 UTC (rev 2537)
+++ trunk/build.vc12/test.pm1.save	2014-06-16 15:23:10 UTC (rev 2538)
@@ -1 +0,0 @@
-METHOD=P-1; B1=100000; N=25591172394760497166702530699464321; X=0x253ea96c26db52439a4462792b216; CHECKSUM=2008842364; PROGRAM=GMP-ECM 7.0-dev; Y=0x0; X0=0xb91d3a9d; Y0=0x0; WHO=brian at MEGA-SLAVE; TIME=Tue Apr 01 23:15:16 2014;

Modified: trunk/ecm-gmp.h
===================================================================
--- trunk/ecm-gmp.h	2014-04-08 07:55:54 UTC (rev 2537)
+++ trunk/ecm-gmp.h	2014-06-16 15:23:10 UTC (rev 2538)
@@ -138,22 +138,20 @@
   void __gmpn_mullo_n (mp_ptr, mp_srcptr, mp_srcptr, mp_size_t);
 #endif
 
-#if defined( __MPIR_RELEASE ) && __MPIR_RELEASE == 20600
+#if defined( __MPIR_RELEASE ) && __MPIR_RELEASE >= 20600
 
-#define mpn_mulmod_Bexpp1_fft __gmpn_mulmod_Bexpp1_fft
-int __gmpn_mulmod_Bexpp1_fft(mp_ptr op, mp_size_t pl, mp_srcptr n, mp_size_t nl, 
-							 mp_srcptr m, mp_size_t ml);
+#if __MPIR_RELEASE == 20600
+#error MPIR 2.6 does not support GMP-ECM, please use an alternative version
+#endif
+/* WARNING - the following two defintions map the internal interface
+   of the new FFT in MPIR 2.6 (and later) to the GMP FFT interface -
+   they work in this context but the parameters for mpn_fft_next_size
+   and fft_adjust_limbs have different semantics, which means that
+   these definitions may fail if used in other circumstances 
+*/
+#  define mpn_fft_best_k(n, k)             (0) 
+#  define mpn_fft_next_size(n, k)          fft_adjust_limbs(n)
 
-/* WARNING - these defintions map the internal interface of the MPIR FFT 
-   to the GMP interface - they work in this context but the parameters for
-   the mpn_fft_next_size and the fft_adjust_limbs functions have different
-   semantics, which means that these definitions may fail if used in other
-   circumstances */
-
-#define mpn_fft_best_k(n, k)             (0) 
-#define mpn_fft_next_size(n, k)          fft_adjust_limbs(n)
-#define mpn_mul_fft(bp,bn,ap,an,cp,cn,k) mpn_mulmod_Bexpp1_fft(bp,bn,ap,an,cp,cn)
-
 #else
 
 #define mpn_mul_fft __gmpn_mul_fft

Modified: trunk/ecm-impl.h
===================================================================
--- trunk/ecm-impl.h	2014-04-08 07:55:54 UTC (rev 2537)
+++ trunk/ecm-impl.h	2014-06-16 15:23:10 UTC (rev 2538)
@@ -180,13 +180,6 @@
                            p == ECM_PARAM_BATCH_2 || \
                            p == ECM_PARAM_BATCH_32BITS_D )
 
-/* for MPIR define GMP internal functions as their MPIR equivalents */
-#if defined( __MPIR_RELEASE ) && __MPIR_RELEASE >= 20600
-#  define mpn_fft_best_k(n,k) (0)
-#  define mpn_fft_next_size(n,k) fft_adjust_limbs(n)
-#  define mpn_mul_fft(bp,bn,ap,an,cp,cn,k) mpn_mulmod_Bexpp1(bp,bn,ap,an,cp,cn)
-#endif
-
 typedef mpz_t mpres_t;
 
 typedef mpz_t* listz_t;



More information about the Ecm-commits mailing list