diff options
Diffstat (limited to 'buf.c')
| -rw-r--r-- | buf.c | 45 |
1 files changed, 31 insertions, 14 deletions
@@ -1770,22 +1770,31 @@ val buf_count_ones(val buf) for (i = 0; i < l / sizeof (ucnum); i++) { ucnum d = ucdata[i]; + + if (d == 0) { + continue; + } else if (d == convert(ucnum, -1)) { + d = sizeof(ucnum) * 8; + } else if ((d & (d - 1)) == 0) { + d = 1; + } else { #if SIZEOF_PTR == 8 - d = ((d & 0xAAAAAAAAAAAAAAAA) >> 1) + (d & 0x5555555555555555); - d = ((d & 0xCCCCCCCCCCCCCCCC) >> 2) + (d & 0x3333333333333333); - d = ((d & 0xF0F0F0F0F0F0F0F0) >> 4) + (d & 0x0F0F0F0F0F0F0F0F); - d = ((d & 0xFF00FF00FF00FF00) >> 8) + (d & 0x00FF00FF00FF00FF); - d = ((d & 0xFFFF0000FFFF0000) >> 16) + (d & 0x0000FFFF0000FFFF); - d = ((d & 0xFFFFFFFF00000000) >> 32) + (d & 0x00000000FFFFFFFF); + d = ((d & 0xAAAAAAAAAAAAAAAA) >> 1) + (d & 0x5555555555555555); + d = ((d & 0xCCCCCCCCCCCCCCCC) >> 2) + (d & 0x3333333333333333); + d = ((d & 0xF0F0F0F0F0F0F0F0) >> 4) + (d & 0x0F0F0F0F0F0F0F0F); + d = ((d & 0xFF00FF00FF00FF00) >> 8) + (d & 0x00FF00FF00FF00FF); + d = ((d & 0xFFFF0000FFFF0000) >> 16) + (d & 0x0000FFFF0000FFFF); + d = ((d & 0xFFFFFFFF00000000) >> 32) + (d & 0x00000000FFFFFFFF); #elif SIZEOF_PTR == 4 - d = ((d & 0xAAAAAAAA) >> 1) + (d & 0x55555555); - d = ((d & 0xCCCCCCCC) >> 2) + (d & 0x33333333); - d = ((d & 0xF0F0F0F0) >> 4) + (d & 0x0F0F0F0F); - d = ((d & 0xFF00FF00) >> 8) + (d & 0x00FF00FF); - d = ((d & 0xFFFF0000) >> 16) + (d & 0x0000FFFF); + d = ((d & 0xAAAAAAAA) >> 1) + (d & 0x55555555); + d = ((d & 0xCCCCCCCC) >> 2) + (d & 0x33333333); + d = ((d & 0xF0F0F0F0) >> 4) + (d & 0x0F0F0F0F); + d = ((d & 0xFF00FF00) >> 8) + (d & 0x00FF00FF); + d = ((d & 0xFFFF0000) >> 16) + (d & 0x0000FFFF); #else #error portme #endif + } total[1] += d; if (total[1] < d) total[0]++; @@ -1794,9 +1803,17 @@ val buf_count_ones(val buf) for (i = l / sizeof (ucnum) * sizeof (ucnum); i < l; i++) { unsigned d = b->data[i]; - d = ((d & 0xAA) >> 1) + (d & 0x55); - d = ((d & 0xCC) >> 2) + (d & 0x33); - d = ((d & 0xF0) >> 4) + (d & 0x0F); + if (!d) { + continue; + } else if (d == 255) { + d = 8; + } else if ((d & (d - 1)) == 0) { + d = 1; + } else { + d = ((d & 0xAA) >> 1) + (d & 0x55); + d = ((d & 0xCC) >> 2) + (d & 0x33); + d = ((d & 0xF0) >> 4) + (d & 0x0F); + } total[1] += d; if (total[1] < d) |