X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftally%2Ftally.c;h=9775cb4e62a3087e070cf9cd28dab8f4b7e051af;hp=4e8876cc4aa5e2874fa83c1b341783e9811d0927;hb=9dba5bf0cb3f74bf9bcaebd8c63ceaa8c6dcbbab;hpb=bf7539ac82df33522461561b4940600ae41c6e55

diff --git a/ccan/tally/tally.c b/ccan/tally/tally.c
index 4e8876cc..9775cb4e 100644
--- a/ccan/tally/tally.c
+++ b/ccan/tally/tally.c
@@ -219,46 +219,49 @@ static unsigned fls64(uint64_t val)
 /* This is stolen straight from Hacker's Delight. */
 static uint64_t divlu64(uint64_t u1, uint64_t u0, uint64_t v)
 {
-	const uint64_t b = 4294967296ULL; // Number base (32 bits).
-	uint32_t un[4],		  // Dividend and divisor
-		vn[2];		  // normalized and broken
-				  // up into halfwords.
-	uint32_t q[2];		  // Quotient as halfwords.
-	uint64_t un1, un0,	  // Dividend and divisor
-		vn0;		  // as fullwords.
-	uint64_t qhat;		  // Estimated quotient digit.
-	uint64_t rhat;		  // A remainder.
-	uint64_t p;		  // Product of two digits.
+	const uint64_t b = 4294967296ULL; /* Number base (32 bits). */
+	uint32_t un[4],		  /* Dividend and divisor */
+		vn[2];		  /* normalized and broken */
+				  /* up into halfwords. */
+	uint32_t q[2];		  /* Quotient as halfwords. */
+	uint64_t un1, un0,	  /* Dividend and divisor */
+		vn0;		  /* as fullwords. */
+	uint64_t qhat;		  /* Estimated quotient digit. */
+	uint64_t rhat;		  /* A remainder. */
+	uint64_t p;		  /* Product of two digits. */
 	int64_t s, i, j, t, k;
 
-	if (u1 >= v)		  // If overflow, return the largest
-		return (uint64_t)-1; // possible quotient.
+	if (u1 >= v) {		  /* If overflow, return the largest */
+		return (uint64_t)-1; /* possible quotient. */
+	}
 
-	s = 64 - fls64(v);		  // 0 <= s <= 63.
-	vn0 = v << s;		  // Normalize divisor.
-	vn[1] = vn0 >> 32;	  // Break divisor up into
-	vn[0] = vn0 & 0xFFFFFFFF; // two 32-bit halves.
+	s = 64 - fls64(v);		  /* 0 <= s <= 63. */
+	vn0 = v << s;		  /* Normalize divisor. */
+	vn[1] = vn0 >> 32;	  /* Break divisor up into */
+	vn[0] = vn0 & 0xFFFFFFFF; /* two 32-bit halves. */
 
 	// Shift dividend left.
 	un1 = ((u1 << s) | (u0 >> (64 - s))) & (-s >> 63);
 	un0 = u0 << s;
-	un[3] = un1 >> 32;	  // Break dividend up into
-	un[2] = un1;		  // four 32-bit halfwords
-	un[1] = un0 >> 32;	  // Note: storing into
-	un[0] = un0;		  // halfwords truncates.
+	un[3] = un1 >> 32;	  /* Break dividend up into */
+	un[2] = un1;		  /* four 32-bit halfwords */
+	un[1] = un0 >> 32;	  /* Note: storing into */
+	un[0] = un0;		  /* halfwords truncates. */
 
 	for (j = 1; j >= 0; j--) {
-		// Compute estimate qhat of q[j].
+		/* Compute estimate qhat of q[j]. */
 		qhat = (un[j+2]*b + un[j+1])/vn[1];
 		rhat = (un[j+2]*b + un[j+1]) - qhat*vn[1];
 	again:
 		if (qhat >= b || qhat*vn[0] > b*rhat + un[j]) {
 			qhat = qhat - 1;
 			rhat = rhat + vn[1];
-			if (rhat < b) goto again;
+			if (rhat < b) {
+				goto again;
+			}
 		}
 
-		// Multiply and subtract.
+		/* Multiply and subtract. */
 		k = 0;
 		for (i = 0; i < 2; i++) {
 			p = qhat*vn[i];
@@ -269,9 +272,9 @@ static uint64_t divlu64(uint64_t u1, uint64_t u0, uint64_t v)
 		t = un[j+2] - k;
 		un[j+2] = t;
 
-		q[j] = qhat;		  // Store quotient digit.
-		if (t < 0) {		  // If we subtracted too
-			q[j] = q[j] - 1;  // much, add back.
+		q[j] = qhat;		  /* Store quotient digit. */
+		if (t < 0) {		  /* If we subtracted too */
+			q[j] = q[j] - 1;  /* much, add back. */
 			k = 0;
 			for (i = 0; i < 2; i++) {
 				t = un[i+j] + vn[i] + k;
@@ -280,7 +283,7 @@ static uint64_t divlu64(uint64_t u1, uint64_t u0, uint64_t v)
 			}
 			un[j+2] = un[j+2] + k;
 		}
-	} // End j.
+	} /* End j. */
 
 	return q[1]*b + q[0];
 }
@@ -289,26 +292,27 @@ static int64_t divls64(int64_t u1, uint64_t u0, int64_t v)
 {
 	int64_t q, uneg, vneg, diff, borrow;
 
-	uneg = u1 >> 63;	  // -1 if u < 0.
-	if (uneg) {		  // Compute the absolute
-		u0 = -u0;	  // value of the dividend u.
+	uneg = u1 >> 63;	  /* -1 if u < 0. */
+	if (uneg) {		  /* Compute the absolute */
+		u0 = -u0;	  /* value of the dividend u. */
 		borrow = (u0 != 0);
 		u1 = -u1 - borrow;
 	}
 
-	vneg = v >> 63;		  // -1 if v < 0.
-	v = (v ^ vneg) - vneg;	  // Absolute value of v.
+	vneg = v >> 63;		  /* -1 if v < 0. */
+	v = (v ^ vneg) - vneg;	  /* Absolute value of v. */
 
 	if ((uint64_t)u1 >= (uint64_t)v)
 		goto overflow;
 
 	q = divlu64(u1, u0, v);
 
-	diff = uneg ^ vneg;	  // Negate q if signs of
-	q = (q ^ diff) - diff;	  // u and v differed.
+	diff = uneg ^ vneg;	  /* Negate q if signs of */
+	q = (q ^ diff) - diff;	  /* u and v differed. */
 
-	if ((diff ^ q) < 0 && q != 0) {	   // If overflow, return the largest
-	overflow:			   // possible neg. quotient.
+	if ((diff ^ q) < 0 && q != 0) {	   /* If overflow, return the
+					      largest */
+	overflow:			   /* possible neg. quotient. */
 		q = 0x8000000000000000ULL;
 	}
 	return q;