fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util/hexdump: fix QEMU_HEXDUMP_LINE_WIDTH logic

Browse source 
QEMU_HEXDUMP_LINE_WIDTH calculation doesn't correspond to
qemu_hexdump_line(). This leads to last line of the dump (when
length is not multiply of 16) has badly aligned ASCII part.

Let's calculate length the same way.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20251031190246.257153-2-vsementsov@yandex-team.ru>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2025-10-31 22:02:45 +03:00 • committed by Philippe Mathieu-Daudé
parent 91634cc331
commit 20aa05edc2
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
util/hexdump.c
View file

@ -22,6 +22,19 @@ static inline char hexdump_nibble(unsigned x)
return (x < 10 ? '0' : 'a' - 10) + x; return (x < 10 ? '0' : 'a' - 10) + x;
} }
static size_t hexdump_line_length(size_t buf_len, size_t unit_len,
size_t block_len)
{
size_t est = buf_len * 2;
if (unit_len) {
est += buf_len / unit_len;
}
if (block_len) {
est += buf_len / block_len;
}
return est;
}
GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len, GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len,
size_t unit_len, size_t block_len) size_t unit_len, size_t block_len)
{ {
@ -30,14 +43,8 @@ GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len,
if (str == NULL) { if (str == NULL) {
/* Estimate the length of the output to avoid reallocs. */ /* Estimate the length of the output to avoid reallocs. */
size_t est = len * 2; str = g_string_sized_new(hexdump_line_length(len, unit_len, block_len)
if (unit_len) { + 1);
est += len / unit_len;
}
if (block_len) {
est += len / block_len;
}
str = g_string_sized_new(est + 1);
} }
for (u = 0, b = 0; len; u++, b++, len--, buf++) { for (u = 0, b = 0; len; u++, b++, len--, buf++) {
@ -76,13 +83,16 @@ static void asciidump_line(char *line, const void *bufptr, size_t len)
} }
#define QEMU_HEXDUMP_LINE_BYTES 16 #define QEMU_HEXDUMP_LINE_BYTES 16
#define QEMU_HEXDUMP_LINE_WIDTH \ #define QEMU_HEXDUMP_UNIT 1
(QEMU_HEXDUMP_LINE_BYTES * 2 + QEMU_HEXDUMP_LINE_BYTES / 4) #define QEMU_HEXDUMP_BLOCK 4
void qemu_hexdump(FILE *fp, const char *prefix, void qemu_hexdump(FILE *fp, const char *prefix,
const void *bufptr, size_t size) const void *bufptr, size_t size)
{ {
g_autoptr(GString) str = g_string_sized_new(QEMU_HEXDUMP_LINE_WIDTH + 1); int width = hexdump_line_length(QEMU_HEXDUMP_LINE_BYTES,
QEMU_HEXDUMP_UNIT,
QEMU_HEXDUMP_BLOCK);
g_autoptr(GString) str = g_string_sized_new(width + 1);
char ascii[QEMU_HEXDUMP_LINE_BYTES + 1]; char ascii[QEMU_HEXDUMP_LINE_BYTES + 1];
size_t b, len; size_t b, len;
@ -90,11 +100,11 @@ void qemu_hexdump(FILE *fp, const char *prefix,
len = MIN(size - b, QEMU_HEXDUMP_LINE_BYTES); len = MIN(size - b, QEMU_HEXDUMP_LINE_BYTES);
g_string_truncate(str, 0); g_string_truncate(str, 0);
qemu_hexdump_line(str, bufptr + b, len, 1, 4); qemu_hexdump_line(str, bufptr + b, len,
QEMU_HEXDUMP_UNIT, QEMU_HEXDUMP_BLOCK);
asciidump_line(ascii, bufptr + b, len); asciidump_line(ascii, bufptr + b, len);
fprintf(fp, "%s: %04zx: %-*s %s\n", fprintf(fp, "%s: %04zx: %-*s %s\n", prefix, b, width, str->str, ascii);
prefix, b, QEMU_HEXDUMP_LINE_WIDTH, str->str, ascii);
} }
} }