X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=mood.c;h=bbe3a8ae08c65748c1414b6f16fe91bda669b32e;hb=ee7c57f8dc4edfdc91f2f8657b6429d90ab13e79;hp=40228be515678effb04587f61d0fbc75acbc44c1;hpb=fe3d9cd155b5eac8706015854c343440823e12da;p=paraslash.git

diff --git a/mood.c b/mood.c
index 40228be5..bbe3a8ae 100644
--- a/mood.c
+++ b/mood.c
@@ -81,32 +81,60 @@ struct mood {
  */
 static struct mood *current_mood;
 
-/**
- * Rough approximation to sqrt.
+/*
+ * Find the position of the most-significant set bit.
  *
- * \param x Integer of which to calculate the sqrt.
+ * Copied and slightly adapted from the linux source tree, version 4.9.39
+ * (2017-07).
+ */
+__a_const static uint32_t fls64(uint64_t v)
+{
+	int n = 63;
+	const uint64_t ones = ~(uint64_t)0U;
+
+	if ((v & (ones << 32)) == 0) {
+		n -= 32;
+		v <<= 32;
+	}
+	if ((v & (ones << (64 - 16))) == 0) {
+		n -= 16;
+		v <<= 16;
+	}
+	if ((v & (ones << (64 - 8))) == 0) {
+		n -= 8;
+		v <<= 8;
+	}
+	if ((v & (ones << (64 - 4))) == 0) {
+		n -= 4;
+		v <<= 4;
+	}
+	if ((v & (ones << (64 - 2))) == 0) {
+		n -= 2;
+		v <<= 2;
+	}
+	if ((v & (ones << (64 - 1))) == 0)
+		n -= 1;
+	return n;
+}
+
+/*
+ * Compute the integer square root floor(sqrt(x)).
  *
- * \return An integer res with res * res <= x.
+ * Taken 2007 from the linux source tree.
  */
 __a_const static uint64_t int_sqrt(uint64_t x)
 {
-	uint64_t op, res, one = 1;
-	op = x;
-	res = 0;
-
-	one = one << 62;
-	while (one > op)
-		one >>= 2;
+	uint64_t op = x, res = 0, one = 1;
 
+	one = one << (fls64(x) & ~one);
 	while (one != 0) {
 		if (op >= res + one) {
 			op = op - (res + one);
-			res = res +  2 * one;
+			res = res + 2 * one;
 		}
 		res /= 2;
 		one /= 4;
 	}
-//	PARA_NOTICE_LOG("sqrt(%llu) = %llu\n", x, res);
 	return res;
 }