emacs: lisp/calc/calc-bin.el comparison

comparison lisp/calc/calc-bin.el @ 90979:988f1edc9674

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 803-805) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227

author	Miles Bader <miles@gnu.org>
date	Mon, 09 Jul 2007 08:00:55 +0000
parents	e6fdae9180d4 95cbb77aca81
children	f55f9811f5d7

comparison

equal deleted inserted replaced

-:f866074aedc4
+:988f1edc9674
 ;; This file is autoloaded from calc-ext.el.
 (require 'calc-ext)
 (require 'calc-macs)
+;;; Some useful numbers
+(defconst math-bignum-logb-digit-size
+(eval-when-compile (logb math-bignum-digit-size))
+"The logb of the size of a bignum digit.
+This is the largest value of B such that 2^B is less than
+the size of a Calc bignum digit.")
+(defconst math-bignum-digit-power-of-two
+(eval-when-compile (expt 2 (logb math-bignum-digit-size)))
+"The largest power of 2 less than the size of a Calc bignum digit.")
 ;;; b-prefix binary commands.
 (defun calc-and (n)
 (interactive "P")
 		       (funcall f a w))
 		     mod))))
 (defun math-and-bignum (a b)   ; [l l l]
 (and a b
-(let ((qa (math-div-bignum-digit a 512))
+(let ((qa (math-div-bignum-digit a math-bignum-digit-power-of-two))
-	     (qb (math-div-bignum-digit b 512)))
+	     (qb (math-div-bignum-digit b math-bignum-digit-power-of-two)))
 	 (math-mul-bignum-digit (math-and-bignum (math-norm-bignum (car qa))
 						  (math-norm-bignum (car qb)))
-				 512
+				 math-bignum-digit-power-of-two
 				 (logand (cdr qa) (cdr qb))))))
 (defun calcFunc-or (a b &optional w)   ; [I I I] [Public]
 (cond ((Math-messy-integerp w)
 	 (calcFunc-or a b (math-trunc w)))
 					    (math-binary-arg b w)))
 		      w))))
 (defun math-or-bignum (a b)   ; [l l l]
 (and (or a b)
-(let ((qa (math-div-bignum-digit a 512))
+(let ((qa (math-div-bignum-digit a math-bignum-digit-power-of-two))
-	     (qb (math-div-bignum-digit b 512)))
+	     (qb (math-div-bignum-digit b math-bignum-digit-power-of-two)))
 	 (math-mul-bignum-digit (math-or-bignum (math-norm-bignum (car qa))
 						 (math-norm-bignum (car qb)))
-				 512
+				 math-bignum-digit-power-of-two
 				 (logior (cdr qa) (cdr qb))))))
 (defun calcFunc-xor (a b &optional w)   ; [I I I] [Public]
 (cond ((Math-messy-integerp w)
 	 (calcFunc-xor a b (math-trunc w)))
 					     (math-binary-arg b w)))
 		      w))))
 (defun math-xor-bignum (a b)   ; [l l l]
 (and (or a b)
-(let ((qa (math-div-bignum-digit a 512))
+(let ((qa (math-div-bignum-digit a math-bignum-digit-power-of-two))
-	     (qb (math-div-bignum-digit b 512)))
+	     (qb (math-div-bignum-digit b math-bignum-digit-power-of-two)))
 	 (math-mul-bignum-digit (math-xor-bignum (math-norm-bignum (car qa))
 						  (math-norm-bignum (car qb)))
-				 512
+				 math-bignum-digit-power-of-two
 				 (logxor (cdr qa) (cdr qb))))))
 (defun calcFunc-diff (a b &optional w)   ; [I I I] [Public]
 (cond ((Math-messy-integerp w)
 	 (calcFunc-diff a b (math-trunc w)))
 					      (math-binary-arg b w)))
 		      w))))
 (defun math-diff-bignum (a b)   ; [l l l]
 (and a
-(let ((qa (math-div-bignum-digit a 512))
+(let ((qa (math-div-bignum-digit a math-bignum-digit-power-of-two))
-	     (qb (math-div-bignum-digit b 512)))
+	     (qb (math-div-bignum-digit b math-bignum-digit-power-of-two)))
 	 (math-mul-bignum-digit (math-diff-bignum (math-norm-bignum (car qa))
 						   (math-norm-bignum (car qb)))
-				 512
+				 math-bignum-digit-power-of-two
 				 (logand (cdr qa) (lognot (cdr qb)))))))
 (defun calcFunc-not (a &optional w)   ; [I I] [Public]
 (cond ((Math-messy-integerp w)
 	 (calcFunc-not a (math-trunc w)))
 	    (cons 'bigpos
 		  (math-not-bignum (math-binary-arg a w)
 				   w))))))
 (defun math-not-bignum (a w)   ; [l l]
-(let ((q (math-div-bignum-digit a 512)))
+(let ((q (math-div-bignum-digit a math-bignum-digit-power-of-two)))
-(if (<= w 9)
+(if (<= w math-bignum-logb-digit-size)
 	(list (logand (lognot (cdr q))
 		      (1- (lsh 1 w))))
 (math-mul-bignum-digit (math-not-bignum (math-norm-bignum (car q))
-					       (- w 9))
+					       (- w math-bignum-logb-digit-size))
-			      512
+			      math-bignum-digit-power-of-two
-			      (logxor (cdr q) 511)))))
+			      (logxor (cdr q)
+(1- math-bignum-digit-power-of-two))))))
 (defun calcFunc-lsh (a &optional n w)   ; [I I] [Public]
 (setq a (math-trunc a)
 	n (if n (math-trunc n) 1))
 (if (eq (car-safe a) 'mod)
 	 (if (Math-natnum-lessp a (math-power-of-2 (- -1 w)))
 	     a
 	   (math-sub a (math-power-of-2 (- w)))))
 	((Math-negp a)
 	 (math-normalize (cons 'bigpos (math-binary-arg a w))))
-	((and (integerp a) (< a 1000000))
+	((and (integerp a) (< a math-small-integer-size))
-	 (if (>= w 20)
+	 (if (> w (logb math-small-integer-size))
 	     a
 	   (logand a (1- (lsh 1 w)))))
 	(t
 	 (math-normalize
 	  (cons 'bigpos
 				  w))))))
 (defalias 'calcFunc-clip 'math-clip)
 (defun math-clip-bignum (a w)   ; [l l]
-(let ((q (math-div-bignum-digit a 512)))
+(let ((q (math-div-bignum-digit a math-bignum-digit-power-of-two)))
-(if (<= w 9)
+(if (<= w math-bignum-logb-digit-size)
 	(list (logand (cdr q)
 		      (1- (lsh 1 w))))
 (math-mul-bignum-digit (math-clip-bignum (math-norm-bignum (car q))
-						(- w 9))
+						(- w math-bignum-logb-digit-size))
-			      512
+			      math-bignum-digit-power-of-two
 			      (cdr q)))))
 (defvar math-max-digits-cache nil)
 (defun math-compute-max-digits (w r)
 (let* ((pair (+ (* r 100000) w))

Mercurial > emacs

comparison lisp/calc/calc-bin.el @ 90979:988f1edc9674