Mercurial > hg > xemacs-beta
annotate src/number-mp.c @ 5353:38e24b8be4ea
Improve the lexical scoping in #'block, #'return-from.
lisp/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el:
* bytecomp.el (byte-compile-initial-macro-environment):
Shadow `block', `return-from' here, we implement them differently
when byte-compiling.
* bytecomp.el (byte-compile-active-blocks): New.
* bytecomp.el (byte-compile-block-1): New.
* bytecomp.el (byte-compile-return-from-1): New.
* bytecomp.el (return-from-1): New.
* bytecomp.el (block-1): New.
These are two aliases that exist to have their own associated
byte-compile functions, which functions implement `block' and
`return-from'.
* cl-extra.el (cl-macroexpand-all):
Fix a bug here when macros in the environment have been compiled.
* cl-macs.el (block):
* cl-macs.el (return):
* cl-macs.el (return-from):
Be more careful about lexical scope in these macros.
* cl.el:
* cl.el ('cl-block-wrapper): Removed.
* cl.el ('cl-block-throw): Removed.
These aren't needed in code generated by this XEmacs. They
shouldn't be needed in code generated by XEmacs 21.4, but if it
turns out the packages do need them, we can put them back.
2011-01-30 Mike Sperber <mike@xemacs.org>
* font-lock.el (font-lock-fontify-pending-extents): Don't fail if
`font-lock-mode' is unset, which can happen in the middle of
`revert-buffer'.
2011-01-23 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete):
* cl-macs.el (delq):
* cl-macs.el (remove):
* cl-macs.el (remq):
Don't use the compiler macro if these functions were given the
wrong number of arguments, as happens in lisp-tests.el.
* cl-seq.el (remove, remq): Removed.
I added these to subr.el, and forgot to remove them from here.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
2011-01-22 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
2011-01-15 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
function, handing the sequences over to #'coerce if we don't
understand them here.
* cl-macs.el (inline): Don't proclaim #'concatenate as inline, its
compiler macro is more useful than doing that.
2011-01-11 Aidan Kehoe <kehoea@parhasard.net>
* subr.el (delete, delq, remove, remq): Move #'remove, #'remq
here, they don't belong in cl-seq.el; move #'delete, #'delq here
from fns.c, implement them in terms of #'delete*, allowing support
for sequences generally.
* update-elc.el (do-autoload-commands): Use #'delete*, not #'delq
here, now the latter's no longer dumped.
* cl-macs.el (delete, delq): Add compiler macros transforming
#'delete and #'delq to #'delete* calls.
2011-01-10 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box): Correct a misplaced parenthesis
here, thank you Mats Lidell in 87zkr9gqrh.fsf@mail.contactor.se !
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* dialog.el (make-dialog-box):
* list-mode.el (display-completion-list):
These functions used to use cl-parsing-keywords; change them to
use defun* instead, fixing the build. (Not sure what led to me
not including this change in d1b17a33450b!)
2011-01-02 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (define-star-compiler-macros):
Make sure the form has ITEM and LIST specified before attempting
to change to calls with explicit tests; necessary for some tests
in lisp-tests.el to compile correctly.
(stable-union, stable-intersection): Add compiler macros for these
functions, in the same way we do for most of the other functions
in cl-seq.el.
2011-01-01 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (dolist, dotimes, do-symbols, macrolet)
(symbol-macrolet):
Define these macros with defmacro* instead of parsing the argument
list by hand, for the sake of style and readability; use backquote
where appropriate, instead of calling #'list and and friends, for
the same reason.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* x-misc.el (device-x-display):
Provide this function, documented in the Lispref for years, but
not existing previously. Thank you Julian Bradfield, thank you
Jeff Mincy.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl-seq.el:
Move the heavy lifting from this file to C. Dump the
cl-parsing-keywords macro, but don't use defun* for the functions
we define that do take keywords, dynamic scope lossage makes that
not practical.
* subr.el (sort, fillarray): Move these aliases here.
(map-plist): #'nsublis is now built-in, but at this point #'eql
isn't necessarily available as a test; use #'eq.
* obsolete.el (cl-delete-duplicates): Make this available for old
compiler macros and old code.
(memql): Document that this is equivalent to #'member*, and worse.
* cl.el (adjoin, subst): Removed. These are in C.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (assoc-ignore-case): Remove a duplicate definition of
this function (it's already in subr.el).
* iso8859-1.el (char-width):
On non-Mule, make this function equivalent to that produced by
(constantly 1), but preserve its docstring.
* subr.el (subst-char-in-string): Define this in terms of
#'substitute, #'nsubstitute.
(string-width): Define this using #'reduce and #'char-width.
(char-width): Give this a simpler definition, it makes far more
sense to check for mule at load time and redefine, as we do in
iso8859-1.el.
(store-substring): Implement this in terms of #'replace, now
#'replace is cheap.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* update-elc.el (lisp-files-needed-for-byte-compilation)
(lisp-files-needing-early-byte-compilation):
cl-macs belongs in the former, not the latter, it is as
fundamental as bytecomp.el.
2010-12-30 Aidan Kehoe <kehoea@parhasard.net>
* cl.el:
Provde the Common Lisp program-error, type-error as error
symbols. This doesn't nearly go far enough for anyone using the
Common Lisp errors.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (delete-duplicates):
If the form has an incorrect number of arguments, don't attempt a
compiler macroexpansion.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (cl-safe-expr-p):
Forms that start with the symbol lambda are also safe.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
For these functions' compiler macros, the optimisation is safe
even if the first and the last arguments have side effects, since
they're only used the once.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (inline-side-effect-free-compiler-macros):
Unroll a loop here at macro-expansion time, so these compiler
macros are compiled. Use #'eql instead of #'eq in a couple of
places for better style.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (notany, notevery): Avoid some dynamic scope
stupidity with local variable names in these functions, when they
weren't prefixed with cl-; go into some more detail in the doc
strings.
2010-12-29 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns): #'remove, #'remq are
free of side-effects.
(side-effect-and-error-free-fns):
Drop dot, dot-marker from the list.
2010-11-17 Aidan Kehoe <kehoea@parhasard.net>
* cl-extra.el (coerce):
In the argument list, name the first argument OBJECT, not X; the
former name was always used in the doc string and is clearer.
Handle vector type specifications which include the length of the
target sequence, error if there's a mismatch.
* cl-macs.el (cl-make-type-test): Handle type specifications
starting with the symbol 'eql.
2010-11-14 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (eql): Don't remove the byte-compile property of this
symbol. That was necessary to override a bug in bytecomp.el where
#'eql was confused with #'eq, which bug we no longer have.
If neither expression is constant, don't attempt to handle the
expression in this compiler macro, leave it to byte-compile-eql,
which produces better code anyway.
* bytecomp.el (eq): #'eql is not the function associated with the
byte-eq byte code.
(byte-compile-eql): Add an explicit compile method for this
function, for cases where the cl-macs compiler macro hasn't
reduced it to #'eq or #'equal.
2010-10-25 Aidan Kehoe <kehoea@parhasard.net>
Add compiler macros and compilation sanity-checking for various
functions that take keywords.
* byte-optimize.el (side-effect-free-fns): #'symbol-value is
side-effect free and not error free.
* bytecomp.el (byte-compile-normal-call): Check keyword argument
lists for sanity; store information about the positions where
keyword arguments start using the new byte-compile-keyword-start
property.
* cl-macs.el (cl-const-expr-val): Take a new optional argument,
cl-not-constant, defaulting to nil, in this function; return it if
the expression is not constant.
(cl-non-fixnum-number-p): Make this into a separate function, we
want to pass it to #'every.
(eql): Use it.
(define-star-compiler-macros): Use the same code to generate the
member*, assoc* and rassoc* compiler macros; special-case some
code in #'add-to-list in subr.el.
(remove, remq): Add compiler macros for these two functions, in
preparation for #'remove being in C.
(define-foo-if-compiler-macros): Transform (remove-if-not ...) calls to
(remove ... :if-not) at compile time, which will be a real win
once the latter is in C.
(define-substitute-if-compiler-macros)
(define-subst-if-compiler-macros): Similarly for these functions.
(delete-duplicates): Change this compiler macro to use
#'plists-equal; if we don't have information about the type of
SEQUENCE at compile time, don't bother attempting to inline the
call, the function will be in C soon enough.
(equalp): Remove an old commented-out compiler macro for this, if
we want to see it it's in version control.
(subst-char-in-string): Transform this to a call to nsubstitute or
nsubstitute, if that is appropriate.
* cl.el (ldiff): Don't call setf here, this makes for a load-time
dependency problem in cl-macs.el
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* term/vt100.el:
Refer to XEmacs, not GNU Emacs, in permissions.
* term/bg-mouse.el:
* term/sup-mouse.el:
Put copyright notice in canonical "Copyright DATE AUTHOR" form.
Refer to XEmacs, not GNU Emacs, in permissions.
* site-load.el:
Add permission boilerplate.
* mule/canna-leim.el:
* alist.el:
Refer to XEmacs, not APEL/this program, in permissions.
* mule/canna-leim.el:
Remove my copyright, I've assigned it to the FSF.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* gtk.el:
* gtk-widget-accessors.el:
* gtk-package.el:
* gtk-marshal.el:
* gtk-compose.el:
* gnome.el:
Add copyright notice based on internal evidence.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* easymenu.el: Add reference to COPYING to permission notice.
* gutter.el:
* gutter-items.el:
* menubar-items.el:
Fix typo "Xmacs" in permissions notice.
2010-06-14 Stephen J. Turnbull <stephen@xemacs.org>
* auto-save.el:
* font.el:
* fontconfig.el:
* mule/kinsoku.el:
Add "part of XEmacs" text to permission notice.
2010-10-14 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (side-effect-free-fns):
* cl-macs.el (remf, getf):
* cl-extra.el (tailp, cl-set-getf, cl-do-remf):
* cl.el (ldiff, endp):
Tighten up Common Lisp compatibility for #'ldiff, #'endp, #'tailp;
add circularity checking for the first two.
#'cl-set-getf and #'cl-do-remf were Lisp implementations of
#'plist-put and #'plist-remprop; change the names to aliases,
changes the macros that use them to using #'plist-put and
#'plist-remprop directly.
2010-10-12 Aidan Kehoe <kehoea@parhasard.net>
* abbrev.el (fundamental-mode-abbrev-table, global-abbrev-table):
Create both these abbrev tables using the usual
#'define-abbrev-table calls, rather than attempting to
special-case them.
* cl-extra.el: Force cl-macs to be loaded here, if cl-extra.el is
being loaded interpreted. Previously other, later files would
redundantly call (load "cl-macs") when interpreted, it's more
reasonable to do it here, once.
* cmdloop.el (read-quoted-char-radix): Use defcustom here, we
don't have any dump-order dependencies that would prevent that.
* custom.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling, rely on cl-extra.el in the
former case and the appropriate entry in bytecomp-load-hook in the
latter. Get rid of custom-declare-variable-list, we have no
dump-time dependencies that would require it.
* faces.el (eval-when-compile): Don't load cl-macs when
interpreted or when byte-compiling.
* packages.el: Remove some inaccurate comments.
* post-gc.el (cleanup-simple-finalizers): Use #'delete-if-not
here, now the order of preloaded-file-list has been changed to
make it available.
* subr.el (custom-declare-variable-list): Remove. No need for it.
Also remove a stub define-abbrev-table from this file, given the
current order of preloaded-file-list there's no need for it.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-constp) Forms quoted with FUNCTION are
also constant.
(byte-compile-initial-macro-environment): In #'the, if FORM is
constant and does not match TYPE, warn at byte-compile time.
2010-10-10 Aidan Kehoe <kehoea@parhasard.net>
* backquote.el (bq-vector-contents, bq-list*): Remove; the former
is equivalent to (append VECTOR nil), the latter to (list* ...).
(bq-process-2): Use (append VECTOR nil) instead of using
#'bq-vector-contents to convert to a list.
(bq-process-1): Now we use list* instead of bq-list
* subr.el (list*): Moved from cl.el, since it is now required to
be available the first time a backquoted form is encountered.
* cl.el (list*): Move to subr.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* test-harness.el (Check-Message):
Add an omitted comma here, thank you the buildbot.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* hash-table.el (hash-table-key-list, hash-table-value-list)
(hash-table-key-value-alist, hash-table-key-value-plist):
Remove some useless #'nreverse calls in these files; our hash
tables have no order, it's not helpful to pretend they do.
* behavior.el (read-behavior):
Do the same in this file, in some code evidently copied from
hash-table.el.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* info.el (Info-insert-dir):
* format.el (format-deannotate-region):
* files.el (cd, save-buffers-kill-emacs):
Use #'some, #'every and related functions for applying boolean
operations to lists, instead of rolling our own ones that cons and
don't short-circuit.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-initial-macro-environment):
* cl-macs.el (the):
Rephrase the docstring, make its implementation when compiling
files a little nicer.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* descr-text.el (unidata-initialize-unicodedata-database)
(unidata-initialize-unihan-database, describe-char-unicode-data)
(describe-char-unicode-data):
Wrap calls to the database functions with (with-fboundp ...),
avoiding byte compile warnings on builds without support for the
database functions.
(describe-char): (reduce #'max ...), not (apply #'max ...), no
need to cons needlessly.
(describe-char): Remove a redundant lambda wrapping
#'extent-properties.
(describe-char-unicode-data): Call #'nsubst when replacing "" with
nil in the result of #'split-string, instead of consing inside
mapcar.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* x-faces.el (x-available-font-sizes):
* specifier.el (let-specifier):
* package-ui.el (pui-add-required-packages):
* msw-faces.el (mswindows-available-font-sizes):
* modeline.el (modeline-minor-mode-menu):
* minibuf.el (minibuf-directory-files):
Replace the O2N (delq nil (mapcar (lambda (W) (and X Y)) Z)) with
the ON (mapcan (lambda (W) (and X (list Y))) Z) in these files.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* cl-macs.el (= < > <= >=):
When these functions are handed more than two arguments, and those
arguments have no side effects, transform to a series of two
argument calls, avoiding funcall in the byte-compiled code.
* mule/mule-cmds.el (finish-set-language-environment):
Take advantage of this change in a function called 256 times at
startup.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* bytecomp.el (byte-compile-function-form, byte-compile-quote)
(byte-compile-quote-form):
Warn at compile time, and error at runtime, if a (quote ...) or a
(function ...) form attempts to quote more than one object.
2010-09-16 Aidan Kehoe <kehoea@parhasard.net>
* byte-optimize.el (byte-optimize-apply): Transform (apply 'nconc
(mapcar ...)) to (mapcan ...); warn about use of the first idiom.
* update-elc.el (do-autoload-commands):
* packages.el (packages-find-package-library-path):
* frame.el (frame-list):
* extents.el (extent-descendants):
* etags.el (buffer-tag-table-files):
* dumped-lisp.el (preloaded-file-list):
* device.el (device-list):
* bytecomp-runtime.el (proclaim-inline, proclaim-notinline)
Use #'mapcan, not (apply #'nconc (mapcar ...) in all these files.
* bytecomp-runtime.el (eval-when-compile, eval-and-compile):
In passing, mention that these macros also evaluate the body when
interpreted.
tests/ChangeLog addition:
2011-02-07 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test lexical scope for `block', `return-from'; add a
Known-Bug-Expect-Failure for a contorted example that fails when
byte-compiled.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 07 Feb 2011 12:01:24 +0000 |
| parents | ba07c880114a |
| children | 2aa9cd456ae7 |
| rev | line source |
|---|---|
| 1983 | 1 /* Numeric types for XEmacs using the MP library. |
| 2 Copyright (C) 2004 Jerry James. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
|
5231
ba07c880114a
Fix up FSF's Franklin Street address in many files.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4976
diff
changeset
|
18 the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, |
|
ba07c880114a
Fix up FSF's Franklin Street address in many files.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4976
diff
changeset
|
19 Boston, MA 02110-1301, USA. */ |
| 1983 | 20 |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 #include <config.h> | |
| 24 #include <limits.h> | |
| 25 #include <math.h> | |
| 26 #include "lisp.h" | |
| 27 | |
| 28 static MINT *bignum_bytesize, *bignum_long_sign_bit, *bignum_one, *bignum_two; | |
| 29 MINT *bignum_zero, *intern_bignum; | |
| 30 MINT *bignum_min_int, *bignum_max_int, *bignum_max_uint; | |
| 31 MINT *bignum_min_long, *bignum_max_long, *bignum_max_ulong; | |
| 32 short div_rem; | |
| 33 | |
| 34 char * | |
| 35 bignum_to_string (bignum b, int base) | |
| 36 { | |
| 37 REGISTER unsigned int i; | |
| 38 unsigned int bufsize = 128U, index = 0U; | |
| 39 int sign; | |
| 40 char *buffer = xnew_array (char, 128), *retval; | |
| 41 MINT *quo = MP_ITOM (0); | |
| 42 short rem; | |
| 43 | |
| 44 /* FIXME: signal something if base is < 2 or doesn't fit into a short. */ | |
| 45 | |
| 46 /* Save the sign for later */ | |
| 47 sign = MP_MCMP (b, bignum_zero); | |
| 48 | |
| 49 if (sign == 0) | |
| 50 { | |
| 51 XREALLOC_ARRAY (buffer, char, 2); | |
| 52 buffer[0] = '0'; | |
| 53 buffer[1] = '\0'; | |
| 54 return buffer; | |
| 55 } | |
| 56 /* Copy abs(b) into quo for destructive modification */ | |
| 57 else if (sign < 0) | |
| 58 MP_MSUB (bignum_zero, b, quo); | |
| 59 else | |
| 60 MP_MOVE (b, quo); | |
| 61 | |
| 62 quo = MP_ITOM (0); | |
| 63 | |
| 64 /* Loop over the digits of b (in BASE) and place each one into buffer */ | |
| 65 for (i = 0U; MP_MCMP(quo, bignum_zero) > 0; i++) | |
| 66 { | |
| 67 MP_SDIV (quo, base, quo, &rem); | |
| 68 if (index == bufsize) | |
| 69 { | |
| 70 bufsize <<= 1; | |
| 71 XREALLOC_ARRAY (buffer, char, bufsize); | |
| 72 } | |
| 73 buffer[index++] = rem < 10 ? rem + '0' : rem - 10 + 'a'; | |
| 74 } | |
| 75 MP_MFREE (quo); | |
| 76 | |
| 77 /* Reverse the digits, maybe add a minus sign, and add a null terminator */ | |
| 78 bufsize = index + (sign < 0 ? 1 : 0) + 1; | |
| 79 retval = xnew_array (char, bufsize); | |
| 80 if (sign < 0) | |
| 81 { | |
| 82 retval[0] = '-'; | |
| 83 i = 1; | |
| 84 } | |
| 85 else | |
| 86 i = 0; | |
| 87 for (; i < bufsize - 1; i++) | |
| 88 retval[i] = buffer[--index]; | |
| 89 retval[bufsize - 1] = '\0'; | |
|
4976
16112448d484
Rename xfree(FOO, TYPE) -> xfree(FOO)
Ben Wing <ben@xemacs.org>
parents:
4802
diff
changeset
|
90 xfree (buffer); |
| 1983 | 91 return retval; |
| 92 } | |
| 93 | |
| 94 #define BIGNUM_TO_TYPE(type,accumtype) do { \ | |
| 95 MP_MULT (b, quo, quo); \ | |
| 96 for (i = 0U; i < sizeof(type); i++) \ | |
| 97 { \ | |
| 98 MP_SDIV (quo, 256, quo, &rem); \ | |
| 99 retval |= ((accumtype) rem) << (8 * i); \ | |
| 100 } \ | |
| 101 MP_MFREE (quo); \ | |
| 102 } while (0) | |
| 103 | |
| 104 int | |
| 105 bignum_to_int (bignum b) | |
| 106 { | |
| 107 short rem, sign; | |
| 108 unsigned int retval = 0; | |
| 109 REGISTER unsigned int i; | |
| 110 MINT *quo; | |
| 111 | |
| 112 sign = MP_MCMP (b, bignum_zero) < 0 ? -1 : 1; | |
| 113 quo = MP_ITOM (sign); | |
| 114 BIGNUM_TO_TYPE (int, unsigned int); | |
| 115 return ((int) retval) * sign; | |
| 116 } | |
| 117 | |
| 118 unsigned int | |
| 119 bignum_to_uint (bignum b) | |
| 120 { | |
| 121 short rem; | |
| 122 unsigned int retval = 0U; | |
| 123 REGISTER unsigned int i; | |
| 124 MINT *quo; | |
| 125 | |
| 126 quo = MP_ITOM (MP_MCMP (b, bignum_zero) < 0 ? -1 : 1); | |
| 127 BIGNUM_TO_TYPE (unsigned int, unsigned int); | |
| 128 return retval; | |
| 129 } | |
| 130 | |
| 131 long | |
| 132 bignum_to_long (bignum b) | |
| 133 { | |
| 134 short rem, sign; | |
| 135 unsigned long retval = 0L; | |
| 136 REGISTER unsigned int i; | |
| 137 MINT *quo; | |
| 138 | |
| 139 sign = MP_MCMP (b, bignum_zero) < 0 ? -1 : 1; | |
| 140 quo = MP_ITOM (sign); | |
| 141 BIGNUM_TO_TYPE (long, unsigned long); | |
| 142 return ((long) retval) * sign; | |
| 143 } | |
| 144 | |
| 145 unsigned long | |
| 146 bignum_to_ulong (bignum b) | |
| 147 { | |
| 148 short rem; | |
| 149 unsigned long retval = 0UL; | |
| 150 REGISTER unsigned int i; | |
| 151 MINT *quo; | |
| 152 | |
| 153 quo = MP_ITOM (MP_MCMP (b, bignum_zero) < 0 ? -1 : 1); | |
| 154 BIGNUM_TO_TYPE (unsigned long, unsigned long); | |
| 155 return retval; | |
| 156 } | |
| 157 | |
| 158 double | |
| 159 bignum_to_double (bignum b) | |
| 160 { | |
| 161 short rem, sign; | |
| 1990 | 162 double retval = 0.0, factor = 1.0; |
| 1983 | 163 REGISTER unsigned int i; |
| 164 MINT *quo; | |
| 165 | |
| 166 sign = MP_MCMP (b, bignum_zero) < 0 ? -1 : 1; | |
| 167 quo = MP_ITOM (sign); | |
| 168 MP_MULT (b, quo, quo); | |
| 1990 | 169 for (i = 0U; MP_MCMP (quo, bignum_zero) > 0; i++) |
| 1983 | 170 { |
| 171 MP_SDIV (quo, 256, quo, &rem); | |
| 1990 | 172 retval += rem * factor; |
| 173 factor *= 256.0; | |
| 1983 | 174 } |
| 175 MP_MFREE (quo); | |
| 176 return retval * sign; | |
| 177 } | |
| 178 | |
| 179 static short | |
| 180 char_to_number (char c) | |
| 181 { | |
| 182 if (c >= '0' && c <= '9') | |
| 183 return c - '0'; | |
| 184 if (c >= 'a' && c <= 'z') | |
| 185 return c - 'a' + 10; | |
| 186 if (c >= 'A' && c <= 'Z') | |
| 187 return c - 'A' + 10; | |
| 188 return -1; | |
| 189 } | |
| 190 | |
| 191 int | |
| 192 bignum_set_string (bignum b, const char *s, int base) | |
| 193 { | |
| 194 MINT *mbase; | |
| 195 short digit; | |
| 1993 | 196 int neg = 0; |
| 1983 | 197 |
| 198 if (base == 0) | |
| 199 { | |
| 200 if (s[0] == '0' && (s[1] == 'x' || s[1] == 'X')) | |
| 201 { | |
| 202 base = 16; | |
| 203 s += 2; | |
| 204 } | |
| 205 else if (*s == '0') | |
| 206 { | |
| 207 base = 8; | |
| 208 s++; | |
| 209 } | |
| 210 else | |
| 211 base = 10; | |
| 212 } | |
| 213 | |
| 214 /* FIXME: signal something if base is < 2 or doesn't fit into a short. */ | |
| 215 | |
| 1993 | 216 if (*s == '-') |
| 217 { | |
| 218 s++; | |
| 219 neg = 1; | |
| 220 } | |
| 221 | |
| 1983 | 222 mbase = MP_ITOM ((short) base); |
| 223 MP_MOVE (bignum_zero, b); | |
|
4802
2fc0e2f18322
Don't create any bignums before pdumping. Add bignum, ratio, and bigfloat
Jerry James <james@xemacs.org>
parents:
1993
diff
changeset
|
224 |
| 1983 | 225 for (digit = char_to_number (*s); digit >= 0 && digit < base; |
| 226 digit = char_to_number (*++s)) | |
| 227 { | |
| 228 MINT *temp; | |
| 229 | |
| 230 MP_MULT (b, mbase, b); | |
| 231 temp = MP_ITOM (digit); | |
| 232 MP_MADD (b, temp, b); | |
| 233 MP_MFREE (temp); | |
| 234 } | |
| 235 | |
| 1993 | 236 if (neg) |
| 237 MP_MSUB (bignum_zero, b, b); | |
| 238 | |
| 1983 | 239 return (digit >= 0) ? -1 : 0; |
| 240 } | |
| 241 | |
| 242 void | |
| 243 bignum_set_long (MINT *b, long l) | |
| 244 { | |
| 245 /* Negative l is hard, not least because -LONG_MIN == LONG_MIN. We pretend | |
| 246 that l is unsigned, then subtract off the amount equal to the sign bit. */ | |
| 247 bignum_set_ulong (b, (unsigned long) l); | |
| 248 if (l < 0L) | |
| 249 MP_MSUB (b, bignum_long_sign_bit, b); | |
| 250 } | |
| 251 | |
| 252 void | |
| 253 bignum_set_ulong (bignum b, unsigned long l) | |
| 254 { | |
| 255 REGISTER unsigned int i; | |
| 256 MINT *multiplier = MP_ITOM (1); | |
| 257 | |
| 258 MP_MOVE (bignum_zero, b); | |
| 259 for (i = 0UL; l > 0UL; l >>= 8, i++) | |
| 260 { | |
| 261 MINT *temp = MP_ITOM ((short) (l & 255)); | |
| 262 MP_MULT (multiplier, temp, temp); | |
| 263 MP_MADD (b, temp, b); | |
| 264 MP_MULT (multiplier, bignum_bytesize, multiplier); | |
| 265 MP_MFREE (temp); | |
| 266 } | |
| 267 MP_MFREE (multiplier); | |
| 268 } | |
| 269 | |
| 270 void | |
| 271 bignum_set_double (bignum b, double d) | |
| 272 { | |
| 273 REGISTER unsigned int i; | |
| 274 int negative = (d < 0) ? 1 : 0; | |
| 275 MINT *multiplier = MP_ITOM (1); | |
| 276 | |
| 277 MP_MOVE (bignum_zero, b); | |
| 278 if (negative) | |
| 279 d = -d; | |
| 280 for (i = 0UL; d > 0.0; d /= 256, i++) | |
| 281 { | |
| 282 MINT *temp = MP_ITOM ((short) fmod (d, 256.0)); | |
| 283 MP_MULT (multiplier, temp, temp); | |
| 284 MP_MADD (b, temp, b); | |
| 285 MP_MULT (multiplier, bignum_bytesize, multiplier); | |
| 286 MP_MFREE (temp); | |
| 287 } | |
| 288 MP_MFREE (multiplier); | |
| 289 if (negative) | |
| 290 MP_MSUB (bignum_zero, b, b); | |
| 291 } | |
| 292 | |
| 293 /* Return nonzero if b1 is exactly divisible by b2 */ | |
| 294 int | |
| 295 bignum_divisible_p (bignum b1, bignum b2) | |
| 296 { | |
| 297 int retval; | |
| 298 MINT *rem = MP_ITOM (0); | |
| 299 MP_MDIV (b1, b2, intern_bignum, rem); | |
| 300 retval = (MP_MCMP (rem, bignum_zero) == 0); | |
| 301 MP_MFREE (rem); | |
| 302 return retval; | |
| 303 } | |
| 304 | |
| 305 void bignum_ceil (bignum quotient, bignum N, bignum D) | |
| 306 { | |
| 307 MP_MDIV (N, D, quotient, intern_bignum); | |
| 308 if (MP_MCMP (intern_bignum, bignum_zero) > 0 && | |
| 309 MP_MCMP (quotient, bignum_zero) > 0) | |
| 310 MP_MADD (quotient, bignum_one, quotient); | |
| 311 } | |
| 312 | |
| 313 void bignum_floor (bignum quotient, bignum N, bignum D) | |
| 314 { | |
| 315 MP_MDIV (N, D, quotient, intern_bignum); | |
| 316 if (MP_MCMP (intern_bignum, bignum_zero) > 0 && | |
| 317 MP_MCMP (quotient, bignum_zero) < 0) | |
| 318 MP_MSUB (quotient, bignum_one, quotient); | |
| 319 } | |
| 320 | |
| 321 /* RESULT = N to the POWth power */ | |
| 322 void | |
| 323 bignum_pow (bignum result, bignum n, unsigned long pow) | |
| 324 { | |
| 325 MP_MOVE (bignum_one, result); | |
| 326 for ( ; pow > 0UL; pow--) | |
| 327 MP_MULT (result, n, result); | |
| 328 } | |
| 329 | |
| 330 /* lcm(b1,b2) = b1 * b2 / gcd(b1, b2) */ | |
| 331 void | |
| 332 bignum_lcm (bignum result, bignum b1, bignum b2) | |
| 333 { | |
| 334 MP_MULT (b1, b2, result); | |
| 335 MP_GCD (b1, b2, intern_bignum); | |
| 336 MP_MDIV (result, intern_bignum, result, intern_bignum); | |
| 337 } | |
| 338 | |
| 339 /* FIXME: We can't handle negative args, so right now we just make them | |
| 340 positive before doing anything else. How should we really handle negative | |
| 341 args? */ | |
| 342 #define bignum_bit_op(result, b1, b2, op) \ | |
| 343 REGISTER unsigned int i; \ | |
| 344 MINT *multiplier = MP_ITOM (1), *n1 = MP_ITOM (0), *n2 = MP_ITOM (0); \ | |
| 345 \ | |
| 346 if (MP_MCMP (bignum_zero, b1) > 0) \ | |
| 347 MP_MSUB (bignum_zero, b1, n1); \ | |
| 348 else \ | |
| 349 MP_MOVE (b1, n1); \ | |
| 350 if (MP_MCMP (bignum_zero, b2) > 0) \ | |
| 351 MP_MSUB (bignum_zero, b2, n2); \ | |
| 352 else \ | |
| 353 MP_MOVE (b2, n2); \ | |
| 354 \ | |
| 355 MP_MOVE (bignum_zero, result); \ | |
| 356 \ | |
| 357 for (i = 0UL; MP_MCMP (bignum_zero, n1) < 0 && \ | |
| 358 MP_MCMP (bignum_zero, n2) < 0; i++) \ | |
| 359 { \ | |
| 360 short byte1, byte2; \ | |
| 361 MINT *temp; \ | |
| 362 \ | |
| 363 MP_SDIV (n1, 256, n1, &byte1); \ | |
| 364 MP_SDIV (n2, 256, n2, &byte2); \ | |
| 365 temp = MP_ITOM (byte1 op byte2); \ | |
| 366 MP_MULT (multiplier, temp, temp); \ | |
| 367 MP_MADD (result, temp, result); \ | |
| 368 MP_MULT (multiplier, bignum_bytesize, multiplier); \ | |
| 369 MP_MFREE (temp); \ | |
| 370 } \ | |
| 371 MP_MFREE (n2); \ | |
| 372 MP_MFREE (n1); \ | |
| 373 MP_MFREE (multiplier) | |
| 374 | |
| 375 void | |
| 376 bignum_and (bignum result, bignum b1, bignum b2) | |
| 377 { | |
| 378 bignum_bit_op (result, b1, b2, &); | |
| 379 } | |
| 380 | |
| 381 void | |
| 382 bignum_ior (bignum result, bignum b1, bignum b2) | |
| 383 { | |
| 384 bignum_bit_op (result, b1, b2, |); | |
| 385 } | |
| 386 | |
| 387 void | |
| 388 bignum_xor (bignum result, bignum b1, bignum b2) | |
| 389 { | |
| 390 bignum_bit_op (result, b1, b2, ^); | |
| 391 } | |
| 392 | |
| 393 /* NOT is not well-defined for bignums ... where do you stop flipping bits? | |
| 394 We just flip until we see the last one. This is probably a bad idea. */ | |
| 395 void | |
| 396 bignum_not (bignum result, bignum b) | |
| 397 { | |
| 398 REGISTER unsigned int i; | |
| 399 MINT *multiplier = MP_ITOM (1), *n = MP_ITOM (0); | |
| 400 | |
| 401 if (MP_MCMP (bignum_zero, b) > 0) | |
| 402 MP_MSUB (bignum_zero, b, n); | |
| 403 else | |
| 404 MP_MOVE (b, n); | |
| 405 | |
| 406 MP_MOVE (bignum_zero, result); | |
| 407 | |
| 408 for (i = 0UL; MP_MCMP (bignum_zero, n) < 0; i++) | |
| 409 { | |
| 410 short byte; | |
| 411 MINT *temp; | |
| 412 | |
| 413 MP_SDIV (n, 256, n, &byte); | |
| 414 temp = MP_ITOM (~byte); | |
| 415 MP_MULT (multiplier, temp, temp); | |
| 416 MP_MADD (result, temp, result); | |
| 417 MP_MULT (multiplier, bignum_bytesize, multiplier); | |
| 418 MP_MFREE (temp); | |
| 419 } | |
| 420 MP_MFREE (n); | |
| 421 MP_MFREE (multiplier); | |
| 422 } | |
| 423 | |
| 424 void | |
| 425 bignum_setbit (bignum b, unsigned long bit) | |
| 426 { | |
| 427 bignum_pow (intern_bignum, bignum_two, bit); | |
| 428 bignum_ior (b, b, intern_bignum); | |
| 429 } | |
| 430 | |
| 431 /* This is so evil, even I feel queasy. */ | |
| 432 void | |
| 433 bignum_clrbit (bignum b, unsigned long bit) | |
| 434 { | |
| 435 MINT *num = MP_ITOM (0); | |
| 436 | |
| 437 /* See if the bit is already set, and subtract it off if not */ | |
| 438 MP_MOVE (b, intern_bignum); | |
| 439 bignum_pow (num, bignum_two, bit); | |
| 440 bignum_ior (intern_bignum, intern_bignum, num); | |
| 441 if (MP_MCMP (b, intern_bignum) == 0) | |
| 442 MP_MSUB (b, num, b); | |
| 443 MP_MFREE (num); | |
| 444 } | |
| 445 | |
| 446 int | |
| 447 bignum_testbit (bignum b, unsigned long bit) | |
| 448 { | |
| 449 bignum_pow (intern_bignum, bignum_two, bit); | |
| 450 bignum_and (intern_bignum, b, intern_bignum); | |
| 451 return MP_MCMP (intern_bignum, bignum_zero); | |
| 452 } | |
| 453 | |
| 454 void | |
| 455 bignum_lshift (bignum result, bignum b, unsigned long bits) | |
| 456 { | |
| 457 bignum_pow (intern_bignum, bignum_two, bits); | |
| 458 MP_MULT (b, intern_bignum, result); | |
| 459 } | |
| 460 | |
| 461 void | |
| 462 bignum_rshift (bignum result, bignum b, unsigned long bits) | |
| 463 { | |
| 464 bignum_pow (intern_bignum, bignum_two, bits); | |
| 465 MP_MDIV (b, intern_bignum, result, intern_bignum); | |
| 466 } | |
| 467 | |
| 468 void bignum_random_seed(unsigned long seed) | |
| 469 { | |
| 470 /* FIXME: Implement me */ | |
| 471 } | |
| 472 | |
| 473 void bignum_random(bignum result, bignum limit) | |
| 474 { | |
| 475 /* FIXME: Implement me */ | |
| 476 MP_MOVE (bignum_zero, result); | |
| 477 } | |
| 478 | |
| 479 void | |
| 480 init_number_mp () | |
| 481 { | |
| 482 REGISTER unsigned int i; | |
| 483 | |
| 484 bignum_zero = MP_ITOM (0); | |
| 485 bignum_one = MP_ITOM (1); | |
| 486 bignum_two = MP_ITOM (2); | |
| 487 | |
| 488 /* intern_bignum holds throwaway values from macro expansions in | |
| 489 number-mp.h. Its value is immaterial. */ | |
| 490 intern_bignum = MP_ITOM (0); | |
| 491 | |
| 492 /* bignum_bytesize holds the number of bits in a byte. */ | |
| 493 bignum_bytesize = MP_ITOM (256); | |
| 494 | |
| 495 /* bignum_long_sign_bit holds an adjustment for negative longs. */ | |
| 496 bignum_long_sign_bit = MP_ITOM (256); | |
| 497 for (i = 1UL; i < sizeof (long); i++) | |
| 498 MP_MULT (bignum_bytesize, bignum_long_sign_bit, bignum_long_sign_bit); | |
| 499 | |
| 500 /* The MP interface only supports turning short ints into MINTs, so we have | |
| 501 to set these the hard way. */ | |
| 502 | |
| 503 bignum_min_int = MP_ITOM (0); | |
| 504 bignum_set_long (bignum_min_int, INT_MIN); | |
| 505 | |
| 506 bignum_max_int = MP_ITOM (0); | |
| 507 bignum_set_long (bignum_max_int, INT_MAX); | |
| 508 | |
| 509 bignum_max_uint = MP_ITOM (0); | |
| 510 bignum_set_ulong (bignum_max_uint, UINT_MAX); | |
| 511 | |
| 512 bignum_min_long = MP_ITOM (0); | |
| 513 bignum_set_long (bignum_min_long, LONG_MIN); | |
| 514 | |
| 515 bignum_max_long = MP_ITOM (0); | |
| 516 bignum_set_long (bignum_max_long, LONG_MAX); | |
| 517 | |
| 518 bignum_max_ulong = MP_ITOM (0); | |
| 519 bignum_set_ulong (bignum_max_ulong, ULONG_MAX); | |
| 520 } |