From: Tom Tromey <tom@tromey.com>
To: Tom Tromey <tom@tromey.com>
Cc: Andy Moreton <andrewjmoreton@gmail.com>, emacs-devel@gnu.org
Subject: Re: bignum branch
Date: Mon, 16 Jul 2018 08:35:56 -0600 [thread overview]
Message-ID: <87a7qr8cz7.fsf@tromey.com> (raw)
In-Reply-To: <87efg4a9xc.fsf@tromey.com> (Tom Tromey's message of "Sun, 15 Jul 2018 07:46:39 -0600")
>>>>> "Tom" == Tom Tromey <tom@tromey.com> writes:
Tom> I was thinking this is what I' have emacs do when
Tom> sizeof(EMACS_INT) > sizeof(long).
Please try this patch.
Unfortunately I don't know how I can test it locally
Tom
diff --git a/src/alloc.c b/src/alloc.c
index b775948fd9..1dc1bbb031 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3824,6 +3824,36 @@ make_number (mpz_t value)
return obj;
}
+void
+mpz_set_intmax_slow (mpz_t result, intmax_t v)
+{
+ /* If long is larger then a faster path is taken. */
+ eassert (sizeof (intmax_t) > sizeof (long));
+
+ bool negate = false;
+ if (v < 0)
+ {
+ v = -v;
+ negate = true;
+ }
+ mpz_set_uintmax_slow (result, (uintmax_t) v);
+ if (negate)
+ mpz_neg (result, result);
+}
+
+void
+mpz_set_uintmax_slow (mpz_t result, uintmax_t v)
+{
+ /* If long is larger then a faster path is taken. */
+ eassert (sizeof (uintmax_t) > sizeof (unsigned long));
+ /* This restriction could be lifted if needed. */
+ eassert (sizeof (uintmax_t) <= 2 * sizeof (unsigned long));
+
+ mpz_set_ui (result, v >> (CHAR_BIT * sizeof (unsigned long)));
+ mpz_mul_2exp (result, result, CHAR_BIT * sizeof (unsigned long));
+ mpz_add_ui (result, result, v & -1ul);
+}
+
\f
/* Return a newly created vector or string with specified arguments as
elements. If all the arguments are characters that can fit
diff --git a/src/data.c b/src/data.c
index 862381229d..0deebdca1a 100644
--- a/src/data.c
+++ b/src/data.c
@@ -2882,7 +2882,7 @@ arith_driver (enum arithop code, ptrdiff_t nargs, Lisp_Object *args)
if (BIGNUMP (val))
mpz_set (accum, XBIGNUM (val)->value);
else
- mpz_set_si (accum, XINT (val));
+ mpz_set_intmax (accum, XINT (val));
if (nargs == 1)
mpz_neg (accum, accum);
}
@@ -2905,7 +2905,7 @@ arith_driver (enum arithop code, ptrdiff_t nargs, Lisp_Object *args)
if (BIGNUMP (val))
mpz_set (accum, XBIGNUM (val)->value);
else
- mpz_set_si (accum, XINT (val));
+ mpz_set_intmax (accum, XINT (val));
}
else
{
@@ -2933,7 +2933,8 @@ arith_driver (enum arithop code, ptrdiff_t nargs, Lisp_Object *args)
else
{
mpz_t tem;
- mpz_init_set_ui (tem, XUINT (val));
+ mpz_init (tem);
+ mpz_set_uintmax (tem, XUINT (val));
mpz_and (accum, accum, tem);
mpz_clear (tem);
}
@@ -2944,7 +2945,8 @@ arith_driver (enum arithop code, ptrdiff_t nargs, Lisp_Object *args)
else
{
mpz_t tem;
- mpz_init_set_ui (tem, XUINT (val));
+ mpz_init (tem);
+ mpz_set_uintmax (tem, XUINT (val));
mpz_ior (accum, accum, tem);
mpz_clear (tem);
}
@@ -2955,7 +2957,8 @@ arith_driver (enum arithop code, ptrdiff_t nargs, Lisp_Object *args)
else
{
mpz_t tem;
- mpz_init_set_ui (tem, XUINT (val));
+ mpz_init (tem);
+ mpz_set_uintmax (tem, XUINT (val));
mpz_xor (accum, accum, tem);
mpz_clear (tem);
}
@@ -3092,7 +3095,8 @@ Both must be integers or markers. */)
xmp = &XBIGNUM (x)->value;
else
{
- mpz_init_set_si (xm, XINT (x));
+ mpz_init (xm);
+ mpz_set_intmax (xm, XINT (x));
xmp = &xm;
}
@@ -3100,7 +3104,8 @@ Both must be integers or markers. */)
ymp = &XBIGNUM (y)->value;
else
{
- mpz_init_set_si (ym, XINT (y));
+ mpz_init (ym);
+ mpz_set_intmax (ym, XINT (y));
ymp = &ym;
}
@@ -3163,7 +3168,8 @@ Both X and Y must be numbers or markers. */)
xmp = &XBIGNUM (x)->value;
else
{
- mpz_init_set_si (xm, XINT (x));
+ mpz_init (xm);
+ mpz_set_intmax (xm, XINT (x));
xmp = &xm;
}
@@ -3171,7 +3177,8 @@ Both X and Y must be numbers or markers. */)
ymp = &XBIGNUM (y)->value;
else
{
- mpz_init_set_si (ym, XINT (y));
+ mpz_init (ym);
+ mpz_set_intmax (ym, XINT (y));
ymp = &ym;
}
@@ -3317,10 +3324,11 @@ ash_lsh_impl (Lisp_Object value, Lisp_Object count, bool lsh)
/* Just do the work as bignums to make the code simpler. */
mpz_t result;
eassume (FIXNUMP (value));
+ mpz_init (result);
if (lsh)
- mpz_init_set_ui (result, XUINT (value));
+ mpz_set_uintmax (result, XUINT (value));
else
- mpz_init_set_si (result, XINT (value));
+ mpz_set_intmax (result, XINT (value));
if (XINT (count) >= 0)
mpz_mul_2exp (result, result, XINT (count));
else
@@ -3376,7 +3384,8 @@ Markers are converted to integers. */)
else
{
mpz_t num;
- mpz_init_set_si (num, XINT (number) + 1);
+ mpz_init (num);
+ mpz_set_intmax (num, XINT (number) + 1);
number = make_number (num);
mpz_clear (num);
}
@@ -3410,7 +3419,8 @@ Markers are converted to integers. */)
else
{
mpz_t num;
- mpz_init_set_si (num, XINT (number) - 1);
+ mpz_init (num);
+ mpz_set_intmax (num, XINT (number) - 1);
number = make_number (num);
mpz_clear (num);
}
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 7709eeca94..83eccae1f7 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -536,7 +536,8 @@ module_make_integer (emacs_env *env, intmax_t n)
if (FIXNUM_OVERFLOW_P (n))
{
mpz_t val;
- mpz_init_set_si (val, n);
+ mpz_init (val);
+ mpz_set_uintmax (val, n);
obj = make_number (val);
mpz_clear (val);
}
diff --git a/src/floatfns.c b/src/floatfns.c
index 9a5f0a3ad2..563c65f827 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -288,7 +288,8 @@ DEFUN ("abs", Fabs, Sabs, 1, 1, 0,
else if (FIXNUMP (arg) && XINT (arg) == MOST_NEGATIVE_FIXNUM)
{
mpz_t val;
- mpz_init_set_si (val, - MOST_NEGATIVE_FIXNUM);
+ mpz_init (val);
+ mpz_set_intmax (val, - MOST_NEGATIVE_FIXNUM);
arg = make_number (val);
mpz_clear (val);
}
diff --git a/src/lisp.h b/src/lisp.h
index e046429c1b..4208634fa9 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3655,6 +3655,32 @@ extern Lisp_Object listn (enum constype, ptrdiff_t, Lisp_Object, ...);
extern Lisp_Object make_bignum_str (const char *num, int base);
extern Lisp_Object make_number (mpz_t value);
+extern void mpz_set_intmax_slow (mpz_t result, intmax_t v);
+extern void mpz_set_uintmax_slow (mpz_t result, uintmax_t v);
+
+INLINE void
+mpz_set_intmax (mpz_t result, intmax_t v)
+{
+ /* mpz_set_si works in terms of long, but Emacs may use a wider
+ integer type, and so sometimes will have to construct the mpz_t
+ by hand. */
+ if (sizeof (intmax_t) > sizeof (long) && (long) v != v)
+ mpz_set_intmax_slow (result, v);
+ else
+ mpz_set_si (result, v);
+}
+
+INLINE void
+mpz_set_uintmax (mpz_t result, uintmax_t v)
+{
+ /* mpz_set_ui works in terms of unsigned long, but Emacs may use a
+ wider integer type, and so sometimes will have to construct the
+ mpz_t by hand. */
+ if (sizeof (uintmax_t) > sizeof (unsigned long) && (unsigned long) v != v)
+ mpz_set_uintmax_slow (result, v);
+ else
+ mpz_set_ui (result, v);
+}
/* Build a frequently used 2/3/4-integer lists. */
next prev parent reply other threads:[~2018-07-16 14:35 UTC|newest]
Thread overview: 205+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 4:26 bignum branch Tom Tromey
2018-07-13 7:38 ` Eli Zaretskii
2018-07-13 8:45 ` Robert Pluim
2018-07-13 9:51 ` Robert Pluim
2018-07-13 11:59 ` Eli Zaretskii
2018-07-13 13:31 ` Robert Pluim
2018-07-13 18:06 ` Tom Tromey
2018-07-13 12:04 ` Eli Zaretskii
2018-07-13 12:14 ` Eli Zaretskii
2018-07-13 13:02 ` Robert Pluim
2018-07-13 13:50 ` Eli Zaretskii
2018-07-15 16:29 ` Andy Moreton
2018-07-17 18:10 ` Robert Pluim
2018-07-17 18:24 ` Eli Zaretskii
2018-07-17 19:06 ` Eli Zaretskii
2018-07-17 20:00 ` Robert Pluim
2018-07-17 21:17 ` Clément Pit-Claudel
2018-07-18 1:01 ` Stefan Monnier
2018-07-18 9:28 ` Andy Moreton
2018-07-18 13:21 ` Robert Pluim
2018-07-18 13:32 ` Stefan Monnier
2018-07-18 16:01 ` Eli Zaretskii
2018-07-18 16:21 ` Robert Pluim
2018-07-18 16:47 ` Eli Zaretskii
2018-07-13 12:34 ` Robert Pluim
2018-07-13 14:28 ` Andy Moreton
2018-07-13 14:42 ` Eli Zaretskii
2018-07-13 14:53 ` Andy Moreton
2018-07-13 15:03 ` Eli Zaretskii
2018-07-13 15:30 ` Andy Moreton
2018-07-13 19:35 ` Andy Moreton
2018-07-14 16:20 ` Eli Zaretskii
2018-07-14 20:04 ` Andy Moreton
2018-07-15 13:46 ` Tom Tromey
2018-07-15 15:01 ` Eli Zaretskii
2018-07-16 12:19 ` Stefan Monnier
2018-07-16 14:40 ` Eli Zaretskii
2018-07-16 16:09 ` Stefan Monnier
2018-07-16 18:06 ` Eli Zaretskii
2018-07-16 18:32 ` Stefan Monnier
2018-07-16 18:42 ` Eli Zaretskii
2018-07-16 14:35 ` Tom Tromey [this message]
2018-07-16 22:28 ` Andy Moreton
2018-07-21 15:35 ` Andy Moreton
2018-07-22 16:43 ` Tom Tromey
2018-07-22 17:41 ` Andy Moreton
2018-08-03 0:43 ` Andy Moreton
2018-08-03 6:23 ` Eli Zaretskii
2018-08-03 9:01 ` Andy Moreton
2018-08-03 9:47 ` Eli Zaretskii
2018-08-03 10:07 ` Andy Moreton
2018-08-03 13:16 ` Eli Zaretskii
2018-08-03 14:05 ` Andy Moreton
2018-08-03 17:44 ` Eli Zaretskii
2018-08-03 19:54 ` Andy Moreton
2018-08-04 6:11 ` Eli Zaretskii
2018-08-04 11:14 ` Andy Moreton
2018-08-04 11:29 ` Eli Zaretskii
2018-08-03 20:17 ` Tom Tromey
2018-08-03 21:02 ` Paul Eggert
2018-08-03 21:19 ` Tom Tromey
2018-08-04 1:22 ` Paul Eggert
2018-08-04 6:18 ` Eli Zaretskii
2018-08-04 10:49 ` Achim Gratz
2018-08-04 11:07 ` Eli Zaretskii
2018-08-04 10:43 ` Achim Gratz
2018-08-04 16:33 ` Tom Tromey
2018-08-04 18:28 ` Achim Gratz
2018-08-04 6:20 ` Eli Zaretskii
2018-08-04 11:17 ` Andy Moreton
2018-08-04 16:41 ` Tom Tromey
2018-08-06 10:18 ` Robert Pluim
2018-08-07 0:36 ` Tom Tromey
2018-08-07 8:38 ` Andy Moreton
2018-08-08 0:25 ` Tom Tromey
2018-08-04 17:10 ` Tom Tromey
2018-08-03 17:30 ` Tom Tromey
2018-08-03 19:16 ` Andy Moreton
2018-08-04 6:07 ` Eli Zaretskii
2018-08-05 11:36 ` Andy Moreton
2018-08-05 15:18 ` Eli Zaretskii
2018-08-06 18:12 ` Andy Moreton
2018-08-07 0:41 ` Tom Tromey
2018-08-07 2:03 ` Paul Eggert
2018-08-07 3:59 ` Tom Tromey
2018-08-07 4:02 ` Tom Tromey
2018-08-07 11:22 ` Andy Moreton
2018-08-07 16:53 ` Paul Eggert
2018-08-07 17:12 ` Eli Zaretskii
2018-08-07 17:52 ` Paul Eggert
2018-08-08 0:23 ` Tom Tromey
2018-08-07 11:17 ` Andy Moreton
2018-08-08 0:26 ` Tom Tromey
2018-08-08 14:24 ` Andy Moreton
2018-08-08 16:35 ` Andy Moreton
2018-08-08 23:14 ` Tom Tromey
2018-08-09 2:33 ` Eli Zaretskii
2018-08-09 7:59 ` Michael Albinus
2018-08-09 13:01 ` Eli Zaretskii
2018-08-09 17:31 ` Paul Eggert
2018-08-09 18:32 ` Eli Zaretskii
2018-08-09 19:22 ` Stefan Monnier
2018-08-09 16:34 ` Tom Tromey
2018-08-09 18:28 ` Eli Zaretskii
2018-08-09 19:30 ` Tom Tromey
2018-08-08 23:37 ` Tom Tromey
2018-08-09 0:07 ` Andy Moreton
2018-08-09 2:03 ` Tom Tromey
2018-08-09 9:19 ` Andy Moreton
2018-08-09 20:49 ` Andy Moreton
2018-08-10 5:45 ` Eli Zaretskii
2018-08-10 7:43 ` Andy Moreton
2018-08-10 7:59 ` Paul Eggert
2018-08-10 9:48 ` Eli Zaretskii
2018-08-10 20:58 ` Paul Eggert
2018-08-11 7:08 ` Eli Zaretskii
2018-08-11 8:02 ` Paul Eggert
2018-08-11 10:50 ` Eli Zaretskii
2018-08-11 12:57 ` Stefan Monnier
2018-08-11 19:38 ` Paul Eggert
2018-08-10 11:18 ` Andy Moreton
2018-08-10 11:56 ` Andreas Schwab
2018-08-10 12:25 ` Eli Zaretskii
2018-08-10 12:27 ` Andy Moreton
2018-08-10 18:37 ` Achim Gratz
2018-08-10 12:26 ` Eli Zaretskii
2018-08-10 12:46 ` Andy Moreton
2018-08-10 9:46 ` Eli Zaretskii
2018-08-10 11:39 ` Andy Moreton
2018-08-10 12:33 ` Eli Zaretskii
2018-08-10 14:05 ` Andy Moreton
2018-08-10 19:57 ` Eli Zaretskii
2018-08-11 15:21 ` Andy Moreton
2018-08-11 15:25 ` Tom Tromey
2018-08-11 16:04 ` Eli Zaretskii
2018-08-11 16:16 ` Eli Zaretskii
2018-08-11 16:54 ` Andy Moreton
2018-08-11 17:34 ` Eli Zaretskii
2018-08-11 17:56 ` Andy Moreton
2018-08-11 18:10 ` Eli Zaretskii
2018-08-11 18:15 ` Andy Moreton
2018-08-11 19:08 ` Eli Zaretskii
2018-08-11 22:15 ` Andy Moreton
2018-08-12 18:54 ` Eli Zaretskii
2018-08-12 19:44 ` Andy Moreton
2018-08-13 15:02 ` Eli Zaretskii
2018-08-13 23:13 ` Andy Moreton
2018-08-14 14:55 ` Eli Zaretskii
2018-08-14 15:11 ` Andy Moreton
2018-08-14 15:19 ` Eli Zaretskii
2018-08-14 16:16 ` Andy Moreton
2018-08-15 17:01 ` Eli Zaretskii
2018-08-11 17:00 ` Andy Moreton
2018-08-10 15:25 ` Stefan Monnier
2018-08-10 16:45 ` Andy Moreton
2018-08-10 19:34 ` Eli Zaretskii
2018-08-09 3:49 ` Stefan Monnier
2018-08-09 9:21 ` Andy Moreton
2018-08-09 2:37 ` Eli Zaretskii
2018-08-03 20:13 ` Tom Tromey
2018-08-04 16:39 ` Tom Tromey
2018-08-04 17:24 ` Tom Tromey
2018-08-05 10:46 ` Andy Moreton
2018-08-05 18:59 ` Tom Tromey
2018-08-06 18:17 ` Andy Moreton
2018-07-15 15:00 ` Eli Zaretskii
2018-07-15 17:31 ` Paul Eggert
2018-07-15 18:27 ` Eli Zaretskii
2018-07-16 19:02 ` Paul Eggert
2018-07-17 2:42 ` Eli Zaretskii
2018-07-17 15:53 ` Paul Eggert
2018-07-17 17:03 ` Eli Zaretskii
2018-07-17 17:24 ` Paul Eggert
2018-07-17 17:38 ` Eli Zaretskii
2018-07-17 17:41 ` Paul Eggert
2018-07-17 17:53 ` Eli Zaretskii
2018-07-17 18:55 ` Paul Eggert
2018-07-17 19:04 ` Eli Zaretskii
2018-07-17 22:39 ` Paul Eggert
2018-07-18 2:41 ` Eli Zaretskii
2018-07-18 7:39 ` Paul Eggert
2018-07-18 11:14 ` Andy Moreton
2018-07-18 11:57 ` Paul Eggert
2018-07-18 13:09 ` Clément Pit-Claudel
2018-07-18 13:18 ` Stefan Monnier
2018-07-18 13:43 ` Clément Pit-Claudel
2018-07-18 14:06 ` Andy Moreton
2018-07-18 19:25 ` Achim Gratz
2018-07-18 20:41 ` Stefan Monnier
2018-07-19 2:36 ` Eli Zaretskii
2018-07-19 20:32 ` Paul Eggert
2018-07-20 20:02 ` Achim Gratz
2018-07-20 20:58 ` Paul Eggert
2018-07-20 21:48 ` Stefan Monnier
2018-07-22 19:49 ` Achim Gratz
2018-07-18 18:29 ` Paul Eggert
2018-07-18 11:10 ` Andy Moreton
2018-07-18 18:34 ` Paul Eggert
2018-07-25 21:02 ` Andy Moreton
2018-08-09 14:26 ` Charles A. Roelli
2018-08-09 15:17 ` Andy Moreton
2018-08-09 16:23 ` Charles A. Roelli
2018-08-09 16:25 ` Tom Tromey
2018-08-09 17:08 ` Andy Moreton
2018-08-09 19:29 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a7qr8cz7.fsf@tromey.com \
--to=tom@tromey.com \
--cc=andrewjmoreton@gmail.com \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.