From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 21 Mar 2018 23:08:27 +0000 (-0700)
Subject: Port data-tests-popcnt to 32-bit Emacs
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e3bcd115d2ac7d9574cf94635f109e326a08d70a;p=emacs.git

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.
---

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)