[PATCH] reduce branches for size class calculation

[Eric Wong <e@80x24.org>]

We can use bit twiddling to find the next power-of-two without
branching for each iteration of the loop (since the new loop
is simple enough for a compiler to unroll).
---
 mwrap_core.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/mwrap_core.h b/mwrap_core.h
index 78c14e3..2a50e66 100644
--- a/mwrap_core.h
+++ b/mwrap_core.h
@@ -676,17 +676,13 @@ static inline size_t size_class_pad(size_t bytes)
 	 * minimize fragmentation.  This means we pay a 0-20% overhead on
 	 * the initial allocations to improve the likelyhood of reuse.
 	 */
-	size_t max = sizeof(void *) << 5;
-	size_t nxt;
-	do {
-		if (bytes <= max) {
-			size_t sc_bytes = size_align(bytes, max >> 3);
-			return sc_bytes <= mm_thresh ? sc_bytes : bytes;
-		}
-		nxt = max << 1;
-	} while (nxt > max && nxt < mm_thresh && (max = nxt));
+	size_t np2 = bytes - 1;
+	for (size_t i = 1; i < sizeof(size_t) * CHAR_BIT; i <<= 1)
+		np2 |= np2 >> i;
+	++np2; // next power-of-two
 
-	return bytes;
+	size_t sc_bytes = size_align(bytes, np2 >> 3);
+	return sc_bytes < mm_thresh ? sc_bytes : mm_thresh;
 }
 
 void *malloc(size_t size)