[Gmp-commit] /var/hg/gmp: 3 new changesets

[mercurial at gmplib.org]

details:   /var/hg/gmp/rev/93fe6630dd8f
changeset: 15788:93fe6630dd8f
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Fri May 03 02:21:46 2013 +0200
description:
Amend last change.

details:   /var/hg/gmp/rev/bf48f8d92429
changeset: 15789:bf48f8d92429
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Fri May 03 02:22:13 2013 +0200
description:
(choice_array): Don't try to table addlsh1_n etc if a macro.

details:   /var/hg/gmp/rev/3348495813e9
changeset: 15790:3348495813e9
user:      Torbjorn Granlund <tege at gmplib.org>
date:      Fri May 03 02:22:26 2013 +0200
description:
ChangeLog

diffstat:

 ChangeLog         |   6 ++++++
 gmp-impl.h        |  16 +++++++++-------
 tests/devel/try.c |  12 ++++++------
 3 files changed, 21 insertions(+), 13 deletions(-)

diffs (110 lines):

diff -r 80437a229f4d -r 3348495813e9 ChangeLog
--- a/ChangeLog	Thu May 02 21:38:47 2013 +0200
+++ b/ChangeLog	Fri May 03 02:22:26 2013 +0200
@@ -1,3 +1,9 @@
+2013-05-03  Torbjorn Granlund  <tege at gmplib.org>
+
+	* gmp-impl.h: Amend last change.
+	* tests/devel/try.c (choice_array): Don't try to table addlsh1_n etc if
+	a macro.
+
 2013-05-02  Torbjorn Granlund  <tege at gmplib.org>
 
 	* mpn/arm/copyd.asm: Suppress dead pointer update.
diff -r 80437a229f4d -r 3348495813e9 gmp-impl.h
--- a/gmp-impl.h	Thu May 02 21:38:47 2013 +0200
+++ b/gmp-impl.h	Fri May 03 02:22:26 2013 +0200
@@ -1567,42 +1567,44 @@
 
 
 /* Override mpn_addlsh1_n, mpn_addlsh2_n, mpn_sublsh1_n, etc with mpn_addlsh_n,
-   etc when !HAVE_NATIVE the former but HAVE_NATIVE_ the latter.  */
+   etc when !HAVE_NATIVE the former but HAVE_NATIVE_ the latter.  We then lie
+   and say these macros represent native functions, but leave a trace by using
+   the value 2 rather than 1.  */
 
 #if HAVE_NATIVE_mpn_addlsh_n && ! HAVE_NATIVE_mpn_addlsh1_n
 #undef mpn_addlsh1_n
 #define mpn_addlsh1_n(a,b,c,d) mpn_addlsh_n(a,b,c,d,1)
-#define HAVE_NATIVE_mpn_addlsh1_n 1
+#define HAVE_NATIVE_mpn_addlsh1_n 2
 #endif
 
 #if HAVE_NATIVE_mpn_addlsh_n && ! HAVE_NATIVE_mpn_addlsh2_n
 #undef mpn_addlsh2_n
 #define mpn_addlsh2_n(a,b,c,d) mpn_addlsh_n(a,b,c,d,2)
-#define HAVE_NATIVE_mpn_addlsh2_n 1
+#define HAVE_NATIVE_mpn_addlsh2_n 2
 #endif
 
 #if HAVE_NATIVE_mpn_sublsh_n && ! HAVE_NATIVE_mpn_sublsh1_n
 #undef mpn_sublsh1_n
 #define mpn_sublsh1_n(a,b,c,d) mpn_sublsh_n(a,b,c,d,1)
-#define HAVE_NATIVE_mpn_sublsh1_n 1
+#define HAVE_NATIVE_mpn_sublsh1_n 2
 #endif
 
 #if HAVE_NATIVE_mpn_sublsh_n && ! HAVE_NATIVE_mpn_sublsh2_n
 #undef mpn_sublsh2_n
 #define mpn_sublsh2_n(a,b,c,d) mpn_sublsh_n(a,b,c,d,2)
-#define HAVE_NATIVE_mpn_sublsh2_n 1
+#define HAVE_NATIVE_mpn_sublsh2_n 2
 #endif
 
 #if HAVE_NATIVE_mpn_rsblsh_n && ! HAVE_NATIVE_mpn_rsblsh1_n
 #undef mpn_rsblsh1_n
 #define mpn_rsblsh1_n(a,b,c,d) mpn_rsblsh_n(a,b,c,d,1)
-#define HAVE_NATIVE_mpn_rsblsh1_n 1
+#define HAVE_NATIVE_mpn_rsblsh1_n 2
 #endif
 
 #if HAVE_NATIVE_mpn_rsblsh_n && ! HAVE_NATIVE_mpn_rsblsh2_n
 #undef mpn_rsblsh2_n
 #define mpn_rsblsh2_n(a,b,c,d) mpn_rsblsh_n(a,b,c,d,2)
-#define HAVE_NATIVE_mpn_rsblsh2_n 1
+#define HAVE_NATIVE_mpn_rsblsh2_n 2
 #endif
 
 
diff -r 80437a229f4d -r 3348495813e9 tests/devel/try.c
--- a/tests/devel/try.c	Thu May 02 21:38:47 2013 +0200
+++ b/tests/devel/try.c	Fri May 03 02:22:26 2013 +0200
@@ -1718,10 +1718,10 @@
 
   { TRY(mpn_cnd_add_n), TYPE_ADDCND_N },
   { TRY(mpn_cnd_sub_n), TYPE_SUBCND_N },
-#if HAVE_NATIVE_mpn_addlsh1_n
+#if HAVE_NATIVE_mpn_addlsh1_n == 1
   { TRY(mpn_addlsh1_n), TYPE_ADDLSH1_N },
 #endif
-#if HAVE_NATIVE_mpn_addlsh2_n
+#if HAVE_NATIVE_mpn_addlsh2_n == 1
   { TRY(mpn_addlsh2_n), TYPE_ADDLSH2_N },
 #endif
 #if HAVE_NATIVE_mpn_addlsh_n
@@ -1745,10 +1745,10 @@
 #if HAVE_NATIVE_mpn_addlsh_n_ip2
   { TRY_FUNFUN(mpn_addlsh_n_ip2), TYPE_ADDLSH_N_IP2 },
 #endif
-#if HAVE_NATIVE_mpn_sublsh1_n
+#if HAVE_NATIVE_mpn_sublsh1_n == 1
   { TRY(mpn_sublsh1_n), TYPE_SUBLSH1_N },
 #endif
-#if HAVE_NATIVE_mpn_sublsh2_n
+#if HAVE_NATIVE_mpn_sublsh2_n == 1
   { TRY(mpn_sublsh2_n), TYPE_SUBLSH2_N },
 #endif
 #if HAVE_NATIVE_mpn_sublsh_n
@@ -1763,10 +1763,10 @@
 #if HAVE_NATIVE_mpn_sublsh_n_ip1
   { TRY_FUNFUN(mpn_sublsh_n_ip1), TYPE_SUBLSH_N_IP1 },
 #endif
-#if HAVE_NATIVE_mpn_rsblsh1_n
+#if HAVE_NATIVE_mpn_rsblsh1_n == 1
   { TRY(mpn_rsblsh1_n), TYPE_RSBLSH1_N },
 #endif
-#if HAVE_NATIVE_mpn_rsblsh2_n
+#if HAVE_NATIVE_mpn_rsblsh2_n == 1
   { TRY(mpn_rsblsh2_n), TYPE_RSBLSH2_N },
 #endif
 #if HAVE_NATIVE_mpn_rsblsh_n