The patch titled Subject: hexdump: do a few calculations ahead has been added to the -mm tree. Its filename is hexdump-do-few-calculations-ahead.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/hexdump-do-few-calculations-ahead.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/hexdump-do-few-calculations-ahead.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Subject: hexdump: do a few calculations ahead Instead of doing calculations in each case of different groupsize let's do them beforehand. While there, change the switch to an if-else-if construction. Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- lib/hexdump.c | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff -puN lib/hexdump.c~hexdump-do-few-calculations-ahead lib/hexdump.c --- a/lib/hexdump.c~hexdump-do-few-calculations-ahead +++ a/lib/hexdump.c @@ -103,6 +103,7 @@ void hex_dump_to_buffer(const void *buf, bool ascii) { const u8 *ptr = buf; + int ngroups; u8 ch; int j, lx = 0; int ascii_column; @@ -114,45 +115,33 @@ void hex_dump_to_buffer(const void *buf, goto nil; if (len > rowsize) /* limit to one line at a time */ len = rowsize; + if (!is_power_of_2(groupsize) || groupsize > 8) + groupsize = 1; if ((len % groupsize) != 0) /* no mixed size output */ groupsize = 1; - switch (groupsize) { - case 8: { + ngroups = len / groupsize; + ascii_column = rowsize * 2 + rowsize / groupsize + 1; + if (groupsize == 8) { const u64 *ptr8 = buf; - int ngroups = len / groupsize; for (j = 0; j < ngroups; j++) lx += scnprintf(linebuf + lx, linebuflen - lx, "%s%16.16llx", j ? " " : "", (unsigned long long)*(ptr8 + j)); - ascii_column = rowsize * 2 + rowsize / 8 + 2; - break; - } - - case 4: { + } else if (groupsize == 4) { const u32 *ptr4 = buf; - int ngroups = len / groupsize; for (j = 0; j < ngroups; j++) lx += scnprintf(linebuf + lx, linebuflen - lx, "%s%8.8x", j ? " " : "", *(ptr4 + j)); - ascii_column = rowsize * 2 + rowsize / 4 + 2; - break; - } - - case 2: { + } else if (groupsize == 2) { const u16 *ptr2 = buf; - int ngroups = len / groupsize; for (j = 0; j < ngroups; j++) lx += scnprintf(linebuf + lx, linebuflen - lx, "%s%4.4x", j ? " " : "", *(ptr2 + j)); - ascii_column = rowsize * 2 + rowsize / 2 + 2; - break; - } - - default: + } else { for (j = 0; (j < len) && (lx + 3) <= linebuflen; j++) { ch = ptr[j]; linebuf[lx++] = hex_asc_hi(ch); @@ -161,14 +150,11 @@ void hex_dump_to_buffer(const void *buf, } if (j) lx--; - - ascii_column = 3 * rowsize + 2; - break; } if (!ascii) goto nil; - while (lx < (linebuflen - 1) && lx < (ascii_column - 1)) + while (lx < (linebuflen - 1) && lx < ascii_column) linebuf[lx++] = ' '; for (j = 0; (j < len) && (lx + 2) < linebuflen; j++) { ch = ptr[j]; _ Patches currently in -mm which might be from andriy.shevchenko@xxxxxxxxxxxxxxx are hexdump-introduce-test-suite.patch hexdump-fix-ascii-column-for-the-tail-of-a-dump.patch hexdump-do-few-calculations-ahead.patch hexdump-makes-it-return-amount-of-bytes-placed-in-buffer.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html