diff options
author | Richard Henderson <richard.henderson@linaro.org> | 2024-04-12 00:33:23 -0700 |
---|---|---|
committer | Richard Henderson <richard.henderson@linaro.org> | 2024-06-05 12:14:18 -0700 |
commit | c49d1c37d89a2ea994861600859b7dcd3ffa4ede (patch) | |
tree | 7ffa4ab7e75b882876970e23a54d391aefc97407 /util | |
parent | 53ee5f551e5743516c90a662425276cae4cf0aeb (diff) | |
download | qemu-c49d1c37d89a2ea994861600859b7dcd3ffa4ede.zip qemu-c49d1c37d89a2ea994861600859b7dcd3ffa4ede.tar.gz qemu-c49d1c37d89a2ea994861600859b7dcd3ffa4ede.tar.bz2 |
util/hexdump: Add unit_len and block_len to qemu_hexdump_line
Generalize the current 1 byte unit and 4 byte blocking
within the output.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240412073346.458116-5-richard.henderson@linaro.org>
Diffstat (limited to 'util')
-rw-r--r-- | util/hexdump.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/util/hexdump.c b/util/hexdump.c index 521e346..b29326b 100644 --- a/util/hexdump.c +++ b/util/hexdump.c @@ -1,5 +1,5 @@ /* - * Helper to hexdump a buffer +* Helper to hexdump a buffer * * Copyright (c) 2013 Red Hat, Inc. * Copyright (c) 2013 Gerd Hoffmann <kraxel@redhat.com> @@ -16,22 +16,34 @@ #include "qemu/osdep.h" #include "qemu/cutils.h" -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) { const uint8_t *buf = vbuf; - size_t i; + size_t u, b; if (str == NULL) { /* Estimate the length of the output to avoid reallocs. */ - i = len * 3 + len / 4; - str = g_string_sized_new(i + 1); + size_t est = len * 2; + if (unit_len) { + est += len / unit_len; + } + if (block_len) { + est += len / block_len; + } + str = g_string_sized_new(est + 1); } - for (i = 0; i < len; i++) { - if (i != 0 && (i % 4) == 0) { + for (u = 0, b = 0; len; u++, b++, len--, buf++) { + if (unit_len && u == unit_len) { + g_string_append_c(str, ' '); + u = 0; + } + if (block_len && b == block_len) { g_string_append_c(str, ' '); + b = 0; } - g_string_append_printf(str, " %02x", buf[i]); + g_string_append_printf(str, "%02x", *buf); } return str; @@ -67,7 +79,7 @@ void qemu_hexdump(FILE *fp, const char *prefix, len = MIN(size - b, QEMU_HEXDUMP_LINE_BYTES); g_string_truncate(str, 0); - qemu_hexdump_line(str, bufptr + b, len); + qemu_hexdump_line(str, bufptr + b, len, 1, 4); asciidump_line(ascii, bufptr + b, len); fprintf(fp, "%s: %04zx: %-*s %s\n", |