From 54465b08f1ad0695bc01f27cb4d923314dd652b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Manuel=20de=20Morais=20Santos=20Costa?=
 <vsc@xato.(none)>
Date: Tue, 20 Oct 2009 10:03:10 +0100
Subject: [PATCH] support ISO extension popcount/1

---
 C/arith1.c   | 40 ++++++++++++++++++++++++++++++++++++++++
 H/eval.h     |  1 +
 docs/yap.tex |  8 ++++++--
 3 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/C/arith1.c b/C/arith1.c
index f0e8b22ef..be765abe0 100644
--- a/C/arith1.c
+++ b/C/arith1.c
@@ -184,6 +184,26 @@ lsb(Int inp)	/* calculate the least significant bit for an integer */
   return out;
 }
 
+static Int
+popcount(Int inp)	/* calculate the least significant bit for an integer */
+{
+  /* the obvious solution: do it by using binary search */
+  Int c = 0, j = 0, m = 1L;
+
+  if (inp < 0) {
+    return Yap_ArithError(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, MkIntegerTerm(inp),
+	      "popcount/1 received %d", inp);
+  }
+  if (inp==0)
+    return 0L;
+  for(j=0,c=0; j<sizeof(inp)*8; j++, m<<=1)
+    { if ( inp&m )
+	c++;
+    }
+
+  return c;
+}
+
 static Term
 eval1(Int fi, Term t) {
   arith1_op f = fi;
@@ -614,6 +634,25 @@ eval1(Int fi, Term t) {
 	}
 	RINT(mpz_scan1(big,0));
       }
+#endif
+    case db_ref_e:
+      RERROR();
+    }
+  case op_popcount:
+    switch (ETypeOfTerm(t)) {
+    case long_int_e:
+      RINT(popcount(IntegerOfTerm(t)));
+    case double_e:
+      return Yap_ArithError(TYPE_ERROR_INTEGER, t, "popcount(%f)", FloatOfTerm(t));
+    case big_int_e:
+#ifdef USE_GMP
+      { MP_INT *big = Yap_BigIntOfTerm(t);
+	if ( mpz_sgn(big) <= 0 ) {
+	  return Yap_ArithError(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t,
+	      "popcount/1 received negative bignum");
+	}
+	RINT(mpz_popcount(big));
+      }
 #endif
     case db_ref_e:
       RERROR();
@@ -739,6 +778,7 @@ static InitUnEntry InitUnTab[] = {
   {"abs", op_abs},
   {"msb", op_msb},
   {"lsb", op_lsb},
+  {"popcount", op_popcount},
   {"float_fractional_part", op_ffracp},
   {"float_integer_part", op_fintp},
   {"sign", op_sign},
diff --git a/H/eval.h b/H/eval.h
index 9dd281fde..5e6bb8001 100644
--- a/H/eval.h
+++ b/H/eval.h
@@ -88,6 +88,7 @@ typedef enum {
   op_abs,
   op_lsb,
   op_msb,
+  op_popcount,
   op_ffracp,
   op_fintp,
   op_sign,
diff --git a/docs/yap.tex b/docs/yap.tex
index 198f912cd..0a4082f5b 100644
--- a/docs/yap.tex
+++ b/docs/yap.tex
@@ -3900,10 +3900,14 @@ Integer bitwise negation.
 The greatest common divisor of the two integers @var{X} and @var{Y}.
 
 @item msb(@var{X})
-The most significant bit of the positive integer @var{X}.
+The most significant bit of the non-negative integer @var{X}.
 
 @item lsb(@var{X})
-The least significant bit of the positive integer @var{X}.
+The least significant bit of the non-negative integer @var{X}.
+
+@item popcount(@var{X})
+The number of bits set to @code{1} in the binary representation of the
+non-negative integer @var{X}.
 
 @item [@var{X}]
 Evaluates to @var{X} for expression @var{X}. Useful because character