summaryrefslogtreecommitdiff
path: root/test/src/data-tests.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-03-21 16:08:27 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2018-03-21 16:08:53 -0700
commitcae9e0fa0358d6323b57a288b5661dc72d36356d (patch)
treef4eec6361449e6c78624652cde29817c8f26d26e /test/src/data-tests.el
parent3b42c083b658649a300594a5499db73b0a49152f (diff)
downloademacs-cae9e0fa0358d6323b57a288b5661dc72d36356d.tar.gz
Port data-tests-popcnt to 32-bit Emacs
* test/src/data-tests.el (data-tests-popcnt): Don’t assume Emacs integers can represent 32-bit quantities. Change to a simple and straightforward approach, since runtime performance is not important here.
Diffstat (limited to 'test/src/data-tests.el')
-rw-r--r--test/src/data-tests.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/src/data-tests.el b/test/src/data-tests.el
index 3b88dbca9a2..33b00d6c9ad 100644
--- a/test/src/data-tests.el
+++ b/test/src/data-tests.el
@@ -111,9 +111,9 @@
"Calculate the Hamming weight of BYTE."
(if (< byte 0)
(setq byte (lognot byte)))
- (setq byte (- byte (logand (lsh byte -1) #x55555555)))
- (setq byte (+ (logand byte #x33333333) (logand (lsh byte -2) #x33333333)))
- (lsh (* (logand (+ byte (lsh byte -4)) #x0f0f0f0f) #x01010101) -24))
+ (if (zerop byte)
+ 0
+ (+ (logand byte 1) (data-tests-popcnt (lsh byte -1)))))
(ert-deftest data-tests-logcount ()
(should (cl-loop for n in (number-sequence -255 255)