mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-24 14:00:58 +07:00
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@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
6f6f3fcb87
commit
5d909c8d54
@ -103,6 +103,7 @@ void hex_dump_to_buffer(const void *buf, size_t len, int rowsize,
|
|||||||
bool ascii)
|
bool ascii)
|
||||||
{
|
{
|
||||||
const u8 *ptr = buf;
|
const u8 *ptr = buf;
|
||||||
|
int ngroups;
|
||||||
u8 ch;
|
u8 ch;
|
||||||
int j, lx = 0;
|
int j, lx = 0;
|
||||||
int ascii_column;
|
int ascii_column;
|
||||||
@ -114,45 +115,33 @@ void hex_dump_to_buffer(const void *buf, size_t len, int rowsize,
|
|||||||
goto nil;
|
goto nil;
|
||||||
if (len > rowsize) /* limit to one line at a time */
|
if (len > rowsize) /* limit to one line at a time */
|
||||||
len = rowsize;
|
len = rowsize;
|
||||||
|
if (!is_power_of_2(groupsize) || groupsize > 8)
|
||||||
|
groupsize = 1;
|
||||||
if ((len % groupsize) != 0) /* no mixed size output */
|
if ((len % groupsize) != 0) /* no mixed size output */
|
||||||
groupsize = 1;
|
groupsize = 1;
|
||||||
|
|
||||||
switch (groupsize) {
|
ngroups = len / groupsize;
|
||||||
case 8: {
|
ascii_column = rowsize * 2 + rowsize / groupsize + 1;
|
||||||
|
if (groupsize == 8) {
|
||||||
const u64 *ptr8 = buf;
|
const u64 *ptr8 = buf;
|
||||||
int ngroups = len / groupsize;
|
|
||||||
|
|
||||||
for (j = 0; j < ngroups; j++)
|
for (j = 0; j < ngroups; j++)
|
||||||
lx += scnprintf(linebuf + lx, linebuflen - lx,
|
lx += scnprintf(linebuf + lx, linebuflen - lx,
|
||||||
"%s%16.16llx", j ? " " : "",
|
"%s%16.16llx", j ? " " : "",
|
||||||
(unsigned long long)*(ptr8 + j));
|
(unsigned long long)*(ptr8 + j));
|
||||||
ascii_column = rowsize * 2 + rowsize / 8 + 2;
|
} else if (groupsize == 4) {
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 4: {
|
|
||||||
const u32 *ptr4 = buf;
|
const u32 *ptr4 = buf;
|
||||||
int ngroups = len / groupsize;
|
|
||||||
|
|
||||||
for (j = 0; j < ngroups; j++)
|
for (j = 0; j < ngroups; j++)
|
||||||
lx += scnprintf(linebuf + lx, linebuflen - lx,
|
lx += scnprintf(linebuf + lx, linebuflen - lx,
|
||||||
"%s%8.8x", j ? " " : "", *(ptr4 + j));
|
"%s%8.8x", j ? " " : "", *(ptr4 + j));
|
||||||
ascii_column = rowsize * 2 + rowsize / 4 + 2;
|
} else if (groupsize == 2) {
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case 2: {
|
|
||||||
const u16 *ptr2 = buf;
|
const u16 *ptr2 = buf;
|
||||||
int ngroups = len / groupsize;
|
|
||||||
|
|
||||||
for (j = 0; j < ngroups; j++)
|
for (j = 0; j < ngroups; j++)
|
||||||
lx += scnprintf(linebuf + lx, linebuflen - lx,
|
lx += scnprintf(linebuf + lx, linebuflen - lx,
|
||||||
"%s%4.4x", j ? " " : "", *(ptr2 + j));
|
"%s%4.4x", j ? " " : "", *(ptr2 + j));
|
||||||
ascii_column = rowsize * 2 + rowsize / 2 + 2;
|
} else {
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
for (j = 0; (j < len) && (lx + 3) <= linebuflen; j++) {
|
for (j = 0; (j < len) && (lx + 3) <= linebuflen; j++) {
|
||||||
ch = ptr[j];
|
ch = ptr[j];
|
||||||
linebuf[lx++] = hex_asc_hi(ch);
|
linebuf[lx++] = hex_asc_hi(ch);
|
||||||
@ -161,14 +150,11 @@ void hex_dump_to_buffer(const void *buf, size_t len, int rowsize,
|
|||||||
}
|
}
|
||||||
if (j)
|
if (j)
|
||||||
lx--;
|
lx--;
|
||||||
|
|
||||||
ascii_column = 3 * rowsize + 2;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
if (!ascii)
|
if (!ascii)
|
||||||
goto nil;
|
goto nil;
|
||||||
|
|
||||||
while (lx < (linebuflen - 1) && lx < (ascii_column - 1))
|
while (lx < (linebuflen - 1) && lx < ascii_column)
|
||||||
linebuf[lx++] = ' ';
|
linebuf[lx++] = ' ';
|
||||||
for (j = 0; (j < len) && (lx + 2) < linebuflen; j++) {
|
for (j = 0; (j < len) && (lx + 2) < linebuflen; j++) {
|
||||||
ch = ptr[j];
|
ch = ptr[j];
|
||||||
|
Loading…
Reference in New Issue
Block a user