Audit use of lsh and fix glitches
I audited use of lsh in the Lisp source code, and fixed the glitches that I found. While I was at it, I replaced uses of lsh with ash when either will do. Replacement is OK when either argument is known to be nonnegative, or when only the low-order bits of the result matter, and is a (minor) win since ash is a bit more solid than lsh nowadays, and is a bit faster. * lisp/calc/calc-ext.el (math-check-fixnum): Prefer most-positive-fixnum to (lsh -1 -1). * lisp/vc/vc-hg.el (vc-hg-state-fast): When testing fixnum width, prefer (zerop (ash most-positive-fixnum -32)) to (zerop (lsh -1 32)) (Bug#32485#11). * lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode): Tighten sanity-check for bytecode overflow, by checking that the result of (ash pc -8) is nonnegative. Formerly this check was not needed since lsh was used and the number overflowed differently. * lisp/net/dns.el (dns-write): Fix some obvious sign typos in shift counts. Evidently this part of the code has never been exercised. * lisp/progmodes/hideif.el (hif-shiftleft, hif-shiftright): * lisp/term/common-win.el (x-setup-function-keys): Simplify. * admin/unidata/unidata-gen.el, admin/unidata/uvs.el: * doc/lispref/keymaps.texi, doc/lispref/syntax.texi: * doc/misc/calc.texi, doc/misc/cl.texi, etc/NEWS.19: * lisp/arc-mode.el, lisp/calc/calc-bin.el, lisp/calc/calc-comb.el: * lisp/calc/calc-ext.el, lisp/calc/calc-math.el: * lisp/cedet/semantic/wisent/comp.el, lisp/composite.el: * lisp/disp-table.el, lisp/dos-fns.el, lisp/edmacro.el: * lisp/emacs-lisp/bindat.el, lisp/emacs-lisp/byte-opt.el: * lisp/emacs-lisp/bytecomp.el, lisp/emacs-lisp/cl-extra.el: * lisp/erc/erc-dcc.el, lisp/facemenu.el, lisp/gnus/message.el: * lisp/gnus/nndoc.el, lisp/gnus/nnmaildir.el, lisp/image.el: * lisp/international/ccl.el, lisp/international/fontset.el: * lisp/international/mule-cmds.el, lisp/international/mule.el: * lisp/json.el, lisp/mail/binhex.el, lisp/mail/rmail.el: * lisp/mail/uudecode.el, lisp/md4.el, lisp/net/dns.el: * lisp/net/ntlm.el, lisp/net/sasl.el, lisp/net/socks.el: * lisp/net/tramp.el, lisp/obsolete/levents.el: * lisp/obsolete/pgg-parse.el, lisp/org/org.el: * lisp/org/ox-publish.el, lisp/progmodes/cc-defs.el: * lisp/progmodes/ebnf2ps.el, lisp/progmodes/hideif.el: * lisp/ps-bdf.el, lisp/ps-print.el, lisp/simple.el: * lisp/tar-mode.el, lisp/term/common-win.el: * lisp/term/tty-colors.el, lisp/term/xterm.el, lisp/vc/vc-git.el: * lisp/vc/vc-hg.el, lisp/x-dnd.el, test/src/data-tests.el: Prefer ash to lsh when either will do.
This commit is contained in:
parent
81e7eef822
commit
f18af6cd5c
59 changed files with 235 additions and 239 deletions
|
@ -420,7 +420,7 @@ the size of a Calc bignum digit.")
|
|||
(let ((q (math-div-bignum-digit a math-bignum-digit-power-of-two)))
|
||||
(if (<= w math-bignum-logb-digit-size)
|
||||
(list (logand (lognot (cdr q))
|
||||
(1- (lsh 1 w))))
|
||||
(1- (ash 1 w))))
|
||||
(math-mul-bignum-digit (math-not-bignum (math-norm-bignum (car q))
|
||||
(- w math-bignum-logb-digit-size))
|
||||
math-bignum-digit-power-of-two
|
||||
|
@ -529,7 +529,7 @@ the size of a Calc bignum digit.")
|
|||
((and (integerp a) (< a math-small-integer-size))
|
||||
(if (> w (logb math-small-integer-size))
|
||||
a
|
||||
(logand a (1- (lsh 1 w)))))
|
||||
(logand a (1- (ash 1 w)))))
|
||||
(t
|
||||
(math-normalize
|
||||
(cons 'bigpos
|
||||
|
@ -542,7 +542,7 @@ the size of a Calc bignum digit.")
|
|||
(let ((q (math-div-bignum-digit a math-bignum-digit-power-of-two)))
|
||||
(if (<= w math-bignum-logb-digit-size)
|
||||
(list (logand (cdr q)
|
||||
(1- (lsh 1 w))))
|
||||
(1- (ash 1 w))))
|
||||
(math-mul-bignum-digit (math-clip-bignum (math-norm-bignum (car q))
|
||||
(- w math-bignum-logb-digit-size))
|
||||
math-bignum-digit-power-of-two
|
||||
|
|
|
@ -580,7 +580,7 @@
|
|||
;; deduce a better value for RAND_MAX.
|
||||
(let ((i 0))
|
||||
(while (< (setq i (1+ i)) 30)
|
||||
(if (> (lsh (math-abs (random)) math-random-shift) 4095)
|
||||
(if (> (ash (math-abs (random)) math-random-shift) 4095)
|
||||
(setq math-random-shift (1- math-random-shift))))))
|
||||
(setq math-last-RandSeed var-RandSeed
|
||||
math-gaussian-cache nil))
|
||||
|
@ -592,11 +592,11 @@
|
|||
(cdr math-random-table))
|
||||
math-random-ptr2 (or (cdr math-random-ptr2)
|
||||
(cdr math-random-table)))
|
||||
(logand (lsh (setcar math-random-ptr1
|
||||
(logand (ash (setcar math-random-ptr1
|
||||
(logand (- (car math-random-ptr1)
|
||||
(car math-random-ptr2)) 524287))
|
||||
-6) 1023))
|
||||
(logand (lsh (random) math-random-shift) 1023)))
|
||||
(logand (ash (random) math-random-shift) 1023)))
|
||||
|
||||
|
||||
;;; Produce a random digit in the range 0..999.
|
||||
|
|
|
@ -2294,14 +2294,14 @@ calc-kill calc-kill-region calc-yank))))
|
|||
(let ((a (math-trunc a)))
|
||||
(if (integerp a)
|
||||
a
|
||||
(if (or (Math-lessp (lsh -1 -1) a)
|
||||
(Math-lessp a (- (lsh -1 -1))))
|
||||
(if (or (Math-lessp most-positive-fixnum a)
|
||||
(Math-lessp a (- most-positive-fixnum)))
|
||||
(math-reject-arg a 'fixnump)
|
||||
(math-fixnum a)))))
|
||||
((and allow-inf (equal a '(var inf var-inf)))
|
||||
(lsh -1 -1))
|
||||
most-positive-fixnum)
|
||||
((and allow-inf (equal a '(neg (var inf var-inf))))
|
||||
(- (lsh -1 -1)))
|
||||
(- most-positive-fixnum))
|
||||
(t (math-reject-arg a 'fixnump))))
|
||||
|
||||
;;; Verify that A is an integer >= 0 and return A in integer form. [I N; - x]
|
||||
|
|
|
@ -1697,7 +1697,7 @@ If this can't be done, return NIL."
|
|||
(while (not (Math-lessp x pow))
|
||||
(setq pows (cons pow pows)
|
||||
pow (math-sqr pow)))
|
||||
(setq n (lsh 1 (1- (length pows)))
|
||||
(setq n (ash 1 (1- (length pows)))
|
||||
sum n
|
||||
pow (car pows))
|
||||
(while (and (setq pows (cdr pows))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue