From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 03/16] util/hexdump: Inline g_string_append_printf "%02x"
Date: Wed, 5 Jun 2024 14:15:08 -0700 [thread overview]
Message-ID: <20240605211521.577094-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240605211521.577094-1-richard.henderson@linaro.org>
Trivial arithmetic can be used for emitting the nibbles,
rather than full-blown printf formatting.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240412073346.458116-6-richard.henderson@linaro.org>
---
util/hexdump.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/util/hexdump.c b/util/hexdump.c
index b29326b7f2..ae0d4992dc 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -16,6 +16,11 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
+static inline char hexdump_nibble(unsigned x)
+{
+ return (x < 10 ? '0' : 'a' - 10) + x;
+}
+
GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len,
size_t unit_len, size_t block_len)
{
@@ -35,6 +40,8 @@ GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len,
}
for (u = 0, b = 0; len; u++, b++, len--, buf++) {
+ uint8_t c;
+
if (unit_len && u == unit_len) {
g_string_append_c(str, ' ');
u = 0;
@@ -43,7 +50,10 @@ GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len,
g_string_append_c(str, ' ');
b = 0;
}
- g_string_append_printf(str, "%02x", *buf);
+
+ c = *buf;
+ g_string_append_c(str, hexdump_nibble(c / 16));
+ g_string_append_c(str, hexdump_nibble(c % 16));
}
return str;
--
2.34.1
next prev parent reply other threads:[~2024-06-05 21:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
2024-06-05 21:15 ` [PULL 01/16] util/hexdump: Use a GString for qemu_hexdump_line Richard Henderson
2024-06-05 21:15 ` [PULL 02/16] util/hexdump: Add unit_len and block_len to qemu_hexdump_line Richard Henderson
2024-06-05 21:15 ` Richard Henderson [this message]
2024-06-05 21:15 ` [PULL 04/16] hw/mips/malta: Add re-usable rng_seed_hex_new() method Richard Henderson
2024-06-05 21:15 ` [PULL 05/16] system/qtest: Replace sprintf by qemu_hexdump_line Richard Henderson
2024-06-05 21:15 ` [PULL 06/16] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf Richard Henderson
2024-06-05 21:15 ` [PULL 07/16] hw/ide/atapi: " Richard Henderson
2024-06-05 21:15 ` [PULL 08/16] hw/dma/pl330: " Richard Henderson
2024-06-05 21:15 ` [PULL 09/16] disas/microblaze: Split out print_immval_addr Richard Henderson
2024-06-05 21:15 ` [PULL 10/16] disas/microblaze: Re-indent print_insn_microblaze Richard Henderson
2024-06-05 21:15 ` [PULL 11/16] disas/microblaze: Merge op->name output into each fprintf Richard Henderson
2024-06-05 21:15 ` [PULL 12/16] disas/microblaze: Print registers directly with PRIreg Richard Henderson
2024-06-05 21:15 ` [PULL 13/16] disas/microblaze: Print immediates directly with PRIimm Richard Henderson
2024-06-05 21:15 ` [PULL 14/16] disas/microblaze: Print registers directly with PRIrfsl Richard Henderson
2024-06-05 21:15 ` [PULL 15/16] disas/microblaze: Split get_field_special Richard Henderson
2024-06-05 21:15 ` [PULL 16/16] disas/riscv: Use GString in format_inst Richard Henderson
2024-06-05 23:53 ` [PULL 00/16] sprintf fixes Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240605211521.577094-4-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).