* [PULL 00/16] sprintf fixes
@ 2024-06-05 21:15 Richard Henderson
2024-06-05 21:15 ` [PULL 01/16] util/hexdump: Use a GString for qemu_hexdump_line Richard Henderson
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel
The following changes since commit f1572ab94738bd5787b7badcd4bd93a3657f0680:
Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-06-05 07:45:23 -0700)
are available in the Git repository at:
https://gitlab.com/rth7680/qemu.git tags/pull-misc-20240605
for you to fetch changes up to b89fb575fd467ed5dfde4608d51c47c2aa427f30:
disas/riscv: Use GString in format_inst (2024-06-05 12:29:54 -0700)
----------------------------------------------------------------
util/hexdump: Use a GString for qemu_hexdump_line.
system/qtest: Replace sprintf by qemu_hexdump_line
hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf
hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf
hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf
disas/microblaze: Reorg to avoid intermediate sprintf
disas/riscv: Use GString in format_inst
----------------------------------------------------------------
Philippe Mathieu-Daudé (5):
hw/mips/malta: Add re-usable rng_seed_hex_new() method
system/qtest: Replace sprintf by qemu_hexdump_line
hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf
hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf
hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf
Richard Henderson (11):
util/hexdump: Use a GString for qemu_hexdump_line
util/hexdump: Add unit_len and block_len to qemu_hexdump_line
util/hexdump: Inline g_string_append_printf "%02x"
disas/microblaze: Split out print_immval_addr
disas/microblaze: Re-indent print_insn_microblaze
disas/microblaze: Merge op->name output into each fprintf
disas/microblaze: Print registers directly with PRIreg
disas/microblaze: Print immediates directly with PRIimm
disas/microblaze: Print registers directly with PRIrfsl
disas/microblaze: Split get_field_special
disas/riscv: Use GString in format_inst
include/qemu/cutils.h | 19 +-
disas/microblaze.c | 551 +++++++++++++++++++++----------------------------
disas/riscv.c | 209 +++++++++----------
hw/dma/pl330.c | 23 +--
hw/ide/atapi.c | 12 +-
hw/mips/malta.c | 25 +--
hw/scsi/scsi-disk.c | 13 +-
hw/virtio/vhost-vdpa.c | 14 +-
system/qtest.c | 12 +-
util/hexdump.c | 57 +++--
10 files changed, 418 insertions(+), 517 deletions(-)
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PULL 01/16] util/hexdump: Use a GString for qemu_hexdump_line
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 02/16] util/hexdump: Add unit_len and block_len to qemu_hexdump_line Richard Henderson
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel
Allocate a new, or append to an existing GString instead of
using a fixed sized buffer. Require the caller to determine
the length of the line -- do not bound len here.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240412073346.458116-4-richard.henderson@linaro.org>
---
include/qemu/cutils.h | 15 ++++++++++-----
hw/virtio/vhost-vdpa.c | 14 ++++++++------
util/hexdump.c | 27 ++++++++++++++++-----------
3 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index c5dea63742..14a3285343 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -282,12 +282,17 @@ static inline const char *yes_no(bool b)
*/
int parse_debug_env(const char *name, int max, int initial);
-/*
- * Hexdump a line of a byte buffer into a hexadecimal/ASCII buffer
+/**
+ * qemu_hexdump_line:
+ * @str: GString into which to append
+ * @buf: buffer to dump
+ * @len: number of bytes to dump
+ *
+ * Append @len bytes of @buf as hexadecimal into @str.
+ * If @str is NULL, allocate a new string and return it;
+ * otherwise return @str.
*/
-#define QEMU_HEXDUMP_LINE_BYTES 16 /* Number of bytes to dump */
-#define QEMU_HEXDUMP_LINE_LEN 75 /* Number of characters in line */
-void qemu_hexdump_line(char *line, const void *bufptr, size_t len);
+GString *qemu_hexdump_line(GString *str, const void *buf, size_t len);
/*
* Hexdump a buffer to a file. An optional string prefix is added to every line
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 7368b71902..419463c154 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -944,13 +944,15 @@ static int vhost_vdpa_set_config_call(struct vhost_dev *dev,
static void vhost_vdpa_dump_config(struct vhost_dev *dev, const uint8_t *config,
uint32_t config_len)
{
- int b, len;
- char line[QEMU_HEXDUMP_LINE_LEN];
+ g_autoptr(GString) str = g_string_sized_new(4 * 16);
+ size_t b, len;
- for (b = 0; b < config_len; b += 16) {
- len = config_len - b;
- qemu_hexdump_line(line, config + b, len);
- trace_vhost_vdpa_dump_config(dev, b, line);
+ for (b = 0; b < config_len; b += len) {
+ len = MIN(config_len - b, 16);
+
+ g_string_truncate(str, 0);
+ qemu_hexdump_line(str, config + b, len);
+ trace_vhost_vdpa_dump_config(dev, b, str->str);
}
}
diff --git a/util/hexdump.c b/util/hexdump.c
index 0f943e31e5..521e346bc6 100644
--- a/util/hexdump.c
+++ b/util/hexdump.c
@@ -16,22 +16,25 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
-void qemu_hexdump_line(char *line, const void *bufptr, size_t len)
+GString *qemu_hexdump_line(GString *str, const void *vbuf, size_t len)
{
- const char *buf = bufptr;
- int i;
+ const uint8_t *buf = vbuf;
+ size_t i;
- if (len > QEMU_HEXDUMP_LINE_BYTES) {
- len = QEMU_HEXDUMP_LINE_BYTES;
+ if (str == NULL) {
+ /* Estimate the length of the output to avoid reallocs. */
+ i = len * 3 + len / 4;
+ str = g_string_sized_new(i + 1);
}
for (i = 0; i < len; i++) {
if (i != 0 && (i % 4) == 0) {
- *line++ = ' ';
+ g_string_append_c(str, ' ');
}
- line += sprintf(line, " %02x", (unsigned char)buf[i]);
+ g_string_append_printf(str, " %02x", buf[i]);
}
- *line = '\0';
+
+ return str;
}
static void asciidump_line(char *line, const void *bufptr, size_t len)
@@ -49,24 +52,26 @@ static void asciidump_line(char *line, const void *bufptr, size_t len)
*line = '\0';
}
+#define QEMU_HEXDUMP_LINE_BYTES 16
#define QEMU_HEXDUMP_LINE_WIDTH \
(QEMU_HEXDUMP_LINE_BYTES * 2 + QEMU_HEXDUMP_LINE_BYTES / 4)
void qemu_hexdump(FILE *fp, const char *prefix,
const void *bufptr, size_t size)
{
- char line[QEMU_HEXDUMP_LINE_LEN];
+ g_autoptr(GString) str = g_string_sized_new(QEMU_HEXDUMP_LINE_WIDTH + 1);
char ascii[QEMU_HEXDUMP_LINE_BYTES + 1];
size_t b, len;
for (b = 0; b < size; b += len) {
len = MIN(size - b, QEMU_HEXDUMP_LINE_BYTES);
- qemu_hexdump_line(line, bufptr + b, len);
+ g_string_truncate(str, 0);
+ qemu_hexdump_line(str, bufptr + b, len);
asciidump_line(ascii, bufptr + b, len);
fprintf(fp, "%s: %04zx: %-*s %s\n",
- prefix, b, QEMU_HEXDUMP_LINE_WIDTH, line, ascii);
+ prefix, b, QEMU_HEXDUMP_LINE_WIDTH, str->str, ascii);
}
}
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 02/16] util/hexdump: Add unit_len and block_len to qemu_hexdump_line
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 ` Richard Henderson
2024-06-05 21:15 ` [PULL 03/16] util/hexdump: Inline g_string_append_printf "%02x" Richard Henderson
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé
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>
---
include/qemu/cutils.h | 6 +++++-
hw/virtio/vhost-vdpa.c | 2 +-
util/hexdump.c | 30 +++++++++++++++++++++---------
3 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h
index 14a3285343..da15547bfb 100644
--- a/include/qemu/cutils.h
+++ b/include/qemu/cutils.h
@@ -287,12 +287,16 @@ int parse_debug_env(const char *name, int max, int initial);
* @str: GString into which to append
* @buf: buffer to dump
* @len: number of bytes to dump
+ * @unit_len: add a space between every @unit_len bytes
+ * @block_len: add an extra space between every @block_len bytes
*
* Append @len bytes of @buf as hexadecimal into @str.
+ * Add spaces between every @unit_len and @block_len bytes.
* If @str is NULL, allocate a new string and return it;
* otherwise return @str.
*/
-GString *qemu_hexdump_line(GString *str, const void *buf, size_t len);
+GString *qemu_hexdump_line(GString *str, const void *buf, size_t len,
+ size_t unit_len, size_t block_len);
/*
* Hexdump a buffer to a file. An optional string prefix is added to every line
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 419463c154..3cdaa12ed5 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -951,7 +951,7 @@ static void vhost_vdpa_dump_config(struct vhost_dev *dev, const uint8_t *config,
len = MIN(config_len - b, 16);
g_string_truncate(str, 0);
- qemu_hexdump_line(str, config + b, len);
+ qemu_hexdump_line(str, config + b, len, 1, 4);
trace_vhost_vdpa_dump_config(dev, b, str->str);
}
}
diff --git a/util/hexdump.c b/util/hexdump.c
index 521e346bc6..b29326b7f2 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;
}
- g_string_append_printf(str, " %02x", buf[i]);
+ if (block_len && b == block_len) {
+ g_string_append_c(str, ' ');
+ b = 0;
+ }
+ 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",
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 03/16] util/hexdump: Inline g_string_append_printf "%02x"
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
2024-06-05 21:15 ` [PULL 04/16] hw/mips/malta: Add re-usable rng_seed_hex_new() method Richard Henderson
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 04/16] hw/mips/malta: Add re-usable rng_seed_hex_new() method
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (2 preceding siblings ...)
2024-06-05 21:15 ` [PULL 03/16] util/hexdump: Inline g_string_append_printf "%02x" Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 05/16] system/qtest: Replace sprintf by qemu_hexdump_line Richard Henderson
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Pierrick Bouvier
From: Philippe Mathieu-Daudé <philmd@linaro.org>
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1.
Extract common code from reinitialize_rng_seed and load_kernel
to rng_seed_hex_new. Using qemu_hexdump_line both fixes the
deprecation warning and simplifies the code base.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[rth: Use qemu_hexdump_line.]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-7-richard.henderson@linaro.org>
---
hw/mips/malta.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index af74008c82..664a2ae0a9 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -26,6 +26,7 @@
#include "qemu/units.h"
#include "qemu/bitops.h"
#include "qemu/datadir.h"
+#include "qemu/cutils.h"
#include "qemu/guest-random.h"
#include "hw/clock.h"
#include "hw/southbridge/piix.h"
@@ -850,15 +851,18 @@ static void G_GNUC_PRINTF(3, 4) prom_set(uint32_t *prom_buf, int index,
va_end(ap);
}
-static void reinitialize_rng_seed(void *opaque)
+static GString *rng_seed_hex_new(void)
{
- char *rng_seed_hex = opaque;
uint8_t rng_seed[32];
qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed));
- for (size_t i = 0; i < sizeof(rng_seed); ++i) {
- sprintf(rng_seed_hex + i * 2, "%02x", rng_seed[i]);
- }
+ return qemu_hexdump_line(NULL, rng_seed, sizeof(rng_seed), 0, 0);
+}
+
+static void reinitialize_rng_seed(void *opaque)
+{
+ g_autoptr(GString) hex = rng_seed_hex_new();
+ memcpy(opaque, hex->str, hex->len);
}
/* Kernel */
@@ -870,8 +874,6 @@ static uint64_t load_kernel(void)
uint32_t *prom_buf;
long prom_size;
int prom_index = 0;
- uint8_t rng_seed[32];
- char rng_seed_hex[sizeof(rng_seed) * 2 + 1];
size_t rng_seed_prom_offset;
kernel_size = load_elf(loaderparams.kernel_filename, NULL,
@@ -946,14 +948,13 @@ static uint64_t load_kernel(void)
prom_set(prom_buf, prom_index++, "modetty0");
prom_set(prom_buf, prom_index++, "38400n8r");
- qemu_guest_getrandom_nofail(rng_seed, sizeof(rng_seed));
- for (size_t i = 0; i < sizeof(rng_seed); ++i) {
- sprintf(rng_seed_hex + i * 2, "%02x", rng_seed[i]);
- }
prom_set(prom_buf, prom_index++, "rngseed");
rng_seed_prom_offset = prom_index * ENVP_ENTRY_SIZE +
sizeof(uint32_t) * ENVP_NB_ENTRIES;
- prom_set(prom_buf, prom_index++, "%s", rng_seed_hex);
+ {
+ g_autoptr(GString) hex = rng_seed_hex_new();
+ prom_set(prom_buf, prom_index++, "%s", hex->str);
+ }
prom_set(prom_buf, prom_index++, NULL);
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 05/16] system/qtest: Replace sprintf by qemu_hexdump_line
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (3 preceding siblings ...)
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 ` Richard Henderson
2024-06-05 21:15 ` [PULL 06/16] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf Richard Henderson
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@linaro.org>
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1.
Using qemu_hexdump_line both fixes the deprecation warning and
simplifies the code base.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>`
[rth: Use qemu_hexdump_line]
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240412073346.458116-8-richard.henderson@linaro.org>
---
system/qtest.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/system/qtest.c b/system/qtest.c
index 6da58b3874..507a358f3b 100644
--- a/system/qtest.c
+++ b/system/qtest.c
@@ -601,9 +601,9 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
qtest_send_prefix(chr);
qtest_sendf(chr, "OK 0x%016" PRIx64 "\n", value);
} else if (strcmp(words[0], "read") == 0) {
- uint64_t addr, len, i;
+ g_autoptr(GString) enc = NULL;
+ uint64_t addr, len;
uint8_t *data;
- char *enc;
int ret;
g_assert(words[1] && words[2]);
@@ -618,16 +618,12 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
address_space_read(first_cpu->as, addr, MEMTXATTRS_UNSPECIFIED, data,
len);
- enc = g_malloc(2 * len + 1);
- for (i = 0; i < len; i++) {
- sprintf(&enc[i * 2], "%02x", data[i]);
- }
+ enc = qemu_hexdump_line(NULL, data, len, 0, 0);
qtest_send_prefix(chr);
- qtest_sendf(chr, "OK 0x%s\n", enc);
+ qtest_sendf(chr, "OK 0x%s\n", enc->str);
g_free(data);
- g_free(enc);
} else if (strcmp(words[0], "b64read") == 0) {
uint64_t addr, len;
uint8_t *data;
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 06/16] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (4 preceding siblings ...)
2024-06-05 21:15 ` [PULL 05/16] system/qtest: Replace sprintf by qemu_hexdump_line Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 07/16] hw/ide/atapi: " Richard Henderson
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@linaro.org>
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1.
Using qemu_hexdump_line both fixes the deprecation warning and
simplifies the code base.
Note that this drops the "0x" prefix to every byte, which should
be of no consequence to tracing.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240412073346.458116-9-richard.henderson@linaro.org>
---
hw/scsi/scsi-disk.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 4bd7af9d0c..f386a2f01c 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -2648,19 +2648,12 @@ static const SCSIReqOps *const scsi_disk_reqops_dispatch[256] = {
static void scsi_disk_new_request_dump(uint32_t lun, uint32_t tag, uint8_t *buf)
{
- int i;
int len = scsi_cdb_length(buf);
- char *line_buffer, *p;
+ g_autoptr(GString) str = NULL;
assert(len > 0 && len <= 16);
- line_buffer = g_malloc(len * 5 + 1);
-
- for (i = 0, p = line_buffer; i < len; i++) {
- p += sprintf(p, " 0x%02x", buf[i]);
- }
- trace_scsi_disk_new_request(lun, tag, line_buffer);
-
- g_free(line_buffer);
+ str = qemu_hexdump_line(NULL, buf, len, 1, 0);
+ trace_scsi_disk_new_request(lun, tag, str->str);
}
static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun,
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 07/16] hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (5 preceding siblings ...)
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 ` Richard Henderson
2024-06-05 21:15 ` [PULL 08/16] hw/dma/pl330: " Richard Henderson
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Pierrick Bouvier
From: Philippe Mathieu-Daudé <philmd@linaro.org>
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1.
Using qemu_hexdump_line both fixes the deprecation warning and
simplifies the code base.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-10-richard.henderson@linaro.org>
---
hw/ide/atapi.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c
index 73ec373184..fcb6cca157 100644
--- a/hw/ide/atapi.c
+++ b/hw/ide/atapi.c
@@ -24,6 +24,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include "hw/scsi/scsi.h"
#include "sysemu/block-backend.h"
#include "scsi/constants.h"
@@ -1309,14 +1310,9 @@ void ide_atapi_cmd(IDEState *s)
trace_ide_atapi_cmd(s, s->io_buffer[0]);
if (trace_event_get_state_backends(TRACE_IDE_ATAPI_CMD_PACKET)) {
- /* Each pretty-printed byte needs two bytes and a space; */
- char *ppacket = g_malloc(ATAPI_PACKET_SIZE * 3 + 1);
- int i;
- for (i = 0; i < ATAPI_PACKET_SIZE; i++) {
- sprintf(ppacket + (i * 3), "%02x ", buf[i]);
- }
- trace_ide_atapi_cmd_packet(s, s->lcyl | (s->hcyl << 8), ppacket);
- g_free(ppacket);
+ g_autoptr(GString) str =
+ qemu_hexdump_line(NULL, buf, ATAPI_PACKET_SIZE, 1, 0);
+ trace_ide_atapi_cmd_packet(s, s->lcyl | (s->hcyl << 8), str->str);
}
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 08/16] hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (6 preceding siblings ...)
2024-06-05 21:15 ` [PULL 07/16] hw/ide/atapi: " Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 09/16] disas/microblaze: Split out print_immval_addr Richard Henderson
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé, Pierrick Bouvier
From: Philippe Mathieu-Daudé <philmd@linaro.org>
sprintf() is deprecated on Darwin since macOS 13.0 / XCode 14.1.
Using qemu_hexdump_line both fixes the deprecation warning and
simplifies the code base.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-11-richard.henderson@linaro.org>
---
hw/dma/pl330.c | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 70a502d245..5f89295af3 100644
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -15,6 +15,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/cutils.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
@@ -317,22 +318,14 @@ typedef struct PL330InsnDesc {
static void pl330_hexdump(uint8_t *buf, size_t size)
{
- unsigned int b, i, len;
- char tmpbuf[80];
+ g_autoptr(GString) str = g_string_sized_new(64);
+ size_t b, len;
- for (b = 0; b < size; b += 16) {
- len = size - b;
- if (len > 16) {
- len = 16;
- }
- tmpbuf[0] = '\0';
- for (i = 0; i < len; i++) {
- if ((i % 4) == 0) {
- strcat(tmpbuf, " ");
- }
- sprintf(tmpbuf + strlen(tmpbuf), " %02x", buf[b + i]);
- }
- trace_pl330_hexdump(b, tmpbuf);
+ for (b = 0; b < size; b += len) {
+ len = MIN(16, size - b);
+ g_string_truncate(str, 0);
+ qemu_hexdump_line(str, buf + b, len, 1, 4);
+ trace_pl330_hexdump(b, str->str);
}
}
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 09/16] disas/microblaze: Split out print_immval_addr
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (7 preceding siblings ...)
2024-06-05 21:15 ` [PULL 08/16] hw/dma/pl330: " Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 10/16] disas/microblaze: Re-indent print_insn_microblaze Richard Henderson
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Pierrick Bouvier
Unify the code blocks that try to print a symbolic address.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-15-richard.henderson@linaro.org>
---
disas/microblaze.c | 89 +++++++++++++++-------------------------------
1 file changed, 29 insertions(+), 60 deletions(-)
diff --git a/disas/microblaze.c b/disas/microblaze.c
index 49a4c0fd40..3473c94164 100644
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@@ -767,6 +767,24 @@ read_insn_microblaze (bfd_vma memaddr,
return inst;
}
+static void print_immval_addr(struct disassemble_info *info, bool immfound,
+ int immval, unsigned inst, int addend)
+{
+ if (info->print_address_func && info->symbol_at_address_func) {
+ if (immfound) {
+ immval |= get_int_field_imm(inst) & 0x0000ffff;
+ } else {
+ immval = (int16_t)get_int_field_imm(inst);
+ }
+ immval += addend;
+ if (immval != 0 && info->symbol_at_address_func(immval, info)) {
+ info->fprintf_func(info->stream, "\t// ");
+ info->print_address_func (immval, info);
+ } else if (addend) {
+ info->fprintf_func(info->stream, "\t// %x", immval);
+ }
+ }
+}
int
print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
@@ -821,18 +839,8 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
break;
case INST_TYPE_RD_R1_IMM:
fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(inst), get_field_imm(inst));
- if (info->print_address_func && get_int_field_r1(inst) == 0 && info->symbol_at_address_func) {
- if (immfound)
- immval |= (get_int_field_imm(inst) & 0x0000ffff);
- else {
- immval = get_int_field_imm(inst);
- if (immval & 0x8000)
- immval |= 0xFFFF0000;
- }
- if (immval > 0 && info->symbol_at_address_func(immval, info)) {
- fprintf_func (stream, "\t// ");
- info->print_address_func (immval, info);
- }
+ if (get_int_field_r1(inst) == 0) {
+ print_immval_addr(info, immfound, immval, inst, 0);
}
break;
case INST_TYPE_RD_R1_IMM5:
@@ -860,61 +868,22 @@ print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_imm(inst));
/* The non-pc relative instructions are returns, which shouldn't
have a label printed */
- if (info->print_address_func && op->inst_offset_type == INST_PC_OFFSET && info->symbol_at_address_func) {
- if (immfound)
- immval |= (get_int_field_imm(inst) & 0x0000ffff);
- else {
- immval = get_int_field_imm(inst);
- if (immval & 0x8000)
- immval |= 0xFFFF0000;
- }
- immval += memaddr;
- if (immval > 0 && info->symbol_at_address_func(immval, info)) {
- fprintf_func (stream, "\t// ");
- info->print_address_func (immval, info);
- } else {
- fprintf_func (stream, "\t\t// ");
- fprintf_func (stream, "%x", immval);
- }
+ if (op->inst_offset_type == INST_PC_OFFSET) {
+ print_immval_addr(info, immfound, immval, inst, memaddr);
}
break;
case INST_TYPE_RD_IMM:
fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm(inst));
- if (info->print_address_func && info->symbol_at_address_func) {
- if (immfound)
- immval |= (get_int_field_imm(inst) & 0x0000ffff);
- else {
- immval = get_int_field_imm(inst);
- if (immval & 0x8000)
- immval |= 0xFFFF0000;
- }
- if (op->inst_offset_type == INST_PC_OFFSET)
- immval += (int) memaddr;
- if (info->symbol_at_address_func(immval, info)) {
- fprintf_func (stream, "\t// ");
- info->print_address_func (immval, info);
- }
- }
+ print_immval_addr(info, immfound, immval, inst,
+ op->inst_offset_type == INST_PC_OFFSET
+ ? memaddr : 0);
break;
case INST_TYPE_IMM:
fprintf_func(stream, "\t%s", get_field_imm(inst));
- if (info->print_address_func && info->symbol_at_address_func && op->instr != imm) {
- if (immfound)
- immval |= (get_int_field_imm(inst) & 0x0000ffff);
- else {
- immval = get_int_field_imm(inst);
- if (immval & 0x8000)
- immval |= 0xFFFF0000;
- }
- if (op->inst_offset_type == INST_PC_OFFSET)
- immval += (int) memaddr;
- if (immval > 0 && info->symbol_at_address_func(immval, info)) {
- fprintf_func (stream, "\t// ");
- info->print_address_func (immval, info);
- } else if (op->inst_offset_type == INST_PC_OFFSET) {
- fprintf_func (stream, "\t\t// ");
- fprintf_func (stream, "%x", immval);
- }
+ if (op->instr != imm) {
+ print_immval_addr(info, immfound, immval, inst,
+ op->inst_offset_type == INST_PC_OFFSET
+ ? memaddr : 0);
}
break;
case INST_TYPE_RD_R2:
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 10/16] disas/microblaze: Re-indent print_insn_microblaze
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (8 preceding siblings ...)
2024-06-05 21:15 ` [PULL 09/16] disas/microblaze: Split out print_immval_addr Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 11/16] disas/microblaze: Merge op->name output into each fprintf Richard Henderson
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Pierrick Bouvier
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-16-richard.henderson@linaro.org>
---
disas/microblaze.c | 263 ++++++++++++++++++++++++---------------------
1 file changed, 141 insertions(+), 122 deletions(-)
diff --git a/disas/microblaze.c b/disas/microblaze.c
index 3473c94164..c729c76585 100644
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@@ -787,134 +787,153 @@ static void print_immval_addr(struct disassemble_info *info, bool immfound,
}
int
-print_insn_microblaze (bfd_vma memaddr, struct disassemble_info * info)
+print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
{
- fprintf_function fprintf_func = info->fprintf_func;
- void * stream = info->stream;
- unsigned long inst, prev_inst;
- const struct op_code_struct *op, *pop;
- int immval = 0;
- bfd_boolean immfound = FALSE;
- static bfd_vma prev_insn_addr = -1; /*init the prev insn addr */
- static int prev_insn_vma = -1; /*init the prev insn vma */
- int curr_insn_vma = info->buffer_vma;
+ fprintf_function fprintf_func = info->fprintf_func;
+ void *stream = info->stream;
+ unsigned long inst, prev_inst;
+ const struct op_code_struct *op, *pop;
+ int immval = 0;
+ bool immfound = false;
+ static bfd_vma prev_insn_addr = -1; /*init the prev insn addr */
+ static int prev_insn_vma = -1; /*init the prev insn vma */
+ int curr_insn_vma = info->buffer_vma;
- info->bytes_per_chunk = 4;
+ info->bytes_per_chunk = 4;
- inst = read_insn_microblaze (memaddr, info, &op);
- if (inst == 0) {
- return -1;
- }
+ inst = read_insn_microblaze (memaddr, info, &op);
+ if (inst == 0) {
+ return -1;
+ }
- if (prev_insn_vma == curr_insn_vma) {
- if (memaddr-(info->bytes_per_chunk) == prev_insn_addr) {
- prev_inst = read_insn_microblaze (prev_insn_addr, info, &pop);
- if (prev_inst == 0)
- return -1;
- if (pop->instr == imm) {
- immval = (get_int_field_imm(prev_inst) << 16) & 0xffff0000;
- immfound = TRUE;
+ if (prev_insn_vma == curr_insn_vma) {
+ if (memaddr - info->bytes_per_chunk == prev_insn_addr) {
+ prev_inst = read_insn_microblaze (prev_insn_addr, info, &pop);
+ if (prev_inst == 0)
+ return -1;
+ if (pop->instr == imm) {
+ immval = (get_int_field_imm(prev_inst) << 16) & 0xffff0000;
+ immfound = TRUE;
+ }
+ else {
+ immval = 0;
+ immfound = FALSE;
+ }
+ }
}
- else {
- immval = 0;
- immfound = FALSE;
- }
- }
- }
- /* make curr insn as prev insn */
- prev_insn_addr = memaddr;
- prev_insn_vma = curr_insn_vma;
+ /* make curr insn as prev insn */
+ prev_insn_addr = memaddr;
+ prev_insn_vma = curr_insn_vma;
- if (op->name == 0) {
- fprintf_func (stream, ".short 0x%04lx", inst);
- }
- else
- {
- fprintf_func (stream, "%s", op->name);
+ if (op->name == 0) {
+ fprintf_func (stream, ".short 0x%04lx", inst);
+ return 4;
+ }
+
+ fprintf_func (stream, "%s", op->name);
- switch (op->inst_type)
- {
- case INST_TYPE_RD_R1_R2:
- fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(inst), get_field_r2(inst));
- break;
- case INST_TYPE_RD_R1_IMM:
- fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(inst), get_field_imm(inst));
- if (get_int_field_r1(inst) == 0) {
- print_immval_addr(info, immfound, immval, inst, 0);
- }
- break;
- case INST_TYPE_RD_R1_IMM5:
- fprintf_func(stream, "\t%s, %s, %s", get_field_rd(inst), get_field_r1(inst), get_field_imm5(inst));
- break;
- case INST_TYPE_RD_RFSL:
- fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_rfsl(inst));
- break;
- case INST_TYPE_R1_RFSL:
- fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_rfsl(inst));
- break;
- case INST_TYPE_RD_SPECIAL:
- fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_special(inst, op));
- break;
- case INST_TYPE_SPECIAL_R1:
- fprintf_func(stream, "\t%s, %s", get_field_special(inst, op), get_field_r1(inst));
- break;
- case INST_TYPE_RD_R1:
- fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r1(inst));
- break;
- case INST_TYPE_R1_R2:
- fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_r2(inst));
- break;
- case INST_TYPE_R1_IMM:
- fprintf_func(stream, "\t%s, %s", get_field_r1(inst), get_field_imm(inst));
- /* The non-pc relative instructions are returns, which shouldn't
- have a label printed */
- if (op->inst_offset_type == INST_PC_OFFSET) {
- print_immval_addr(info, immfound, immval, inst, memaddr);
- }
- break;
- case INST_TYPE_RD_IMM:
- fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm(inst));
- print_immval_addr(info, immfound, immval, inst,
- op->inst_offset_type == INST_PC_OFFSET
- ? memaddr : 0);
- break;
- case INST_TYPE_IMM:
- fprintf_func(stream, "\t%s", get_field_imm(inst));
- if (op->instr != imm) {
- print_immval_addr(info, immfound, immval, inst,
- op->inst_offset_type == INST_PC_OFFSET
- ? memaddr : 0);
- }
- break;
- case INST_TYPE_RD_R2:
- fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r2(inst));
- break;
- case INST_TYPE_R2:
- fprintf_func(stream, "\t%s", get_field_r2(inst));
- break;
- case INST_TYPE_R1:
- fprintf_func(stream, "\t%s", get_field_r1(inst));
- break;
- case INST_TYPE_RD_R1_SPECIAL:
- fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_r2(inst));
- break;
- case INST_TYPE_RD_IMM15:
- fprintf_func(stream, "\t%s, %s", get_field_rd(inst), get_field_imm15(inst));
- break;
- /* For tuqula instruction */
- case INST_TYPE_RD:
- fprintf_func(stream, "\t%s", get_field_rd(inst));
- break;
- case INST_TYPE_RFSL:
- fprintf_func(stream, "\t%s", get_field_rfsl(inst));
- break;
- default:
- /* if the disassembler lags the instruction set */
- fprintf_func (stream, "\tundecoded operands, inst is 0x%04lx", inst);
- break;
- }
+ switch (op->inst_type) {
+ case INST_TYPE_RD_R1_R2:
+ fprintf_func(stream, "\t%s, %s, %s",
+ get_field_rd(inst), get_field_r1(inst),
+ get_field_r2(inst));
+ break;
+ case INST_TYPE_RD_R1_IMM:
+ fprintf_func(stream, "\t%s, %s, %s",
+ get_field_rd(inst), get_field_r1(inst),
+ get_field_imm(inst));
+ if (get_int_field_r1(inst) == 0) {
+ print_immval_addr(info, immfound, immval, inst, 0);
+ }
+ break;
+ case INST_TYPE_RD_R1_IMM5:
+ fprintf_func(stream, "\t%s, %s, %s",
+ get_field_rd(inst), get_field_r1(inst),
+ get_field_imm5(inst));
+ break;
+ case INST_TYPE_RD_RFSL:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_rd(inst), get_field_rfsl(inst));
+ break;
+ case INST_TYPE_R1_RFSL:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_r1(inst), get_field_rfsl(inst));
+ break;
+ case INST_TYPE_RD_SPECIAL:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_rd(inst), get_field_special(inst, op));
+ break;
+ case INST_TYPE_SPECIAL_R1:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_special(inst, op), get_field_r1(inst));
+ break;
+ case INST_TYPE_RD_R1:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_rd(inst), get_field_r1(inst));
+ break;
+ case INST_TYPE_R1_R2:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_r1(inst), get_field_r2(inst));
+ break;
+ case INST_TYPE_R1_IMM:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_r1(inst), get_field_imm(inst));
+ /*
+ * The non-pc relative instructions are returns,
+ * which shouldn't have a label printed.
+ */
+ if (op->inst_offset_type == INST_PC_OFFSET) {
+ print_immval_addr(info, immfound, immval, inst, memaddr);
+ }
+ break;
+ case INST_TYPE_RD_IMM:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_rd(inst), get_field_imm(inst));
+ print_immval_addr(info, immfound, immval, inst,
+ op->inst_offset_type == INST_PC_OFFSET
+ ? memaddr : 0);
+ break;
+ case INST_TYPE_IMM:
+ fprintf_func(stream, "\t%s", get_field_imm(inst));
+ if (op->instr != imm) {
+ print_immval_addr(info, immfound, immval, inst,
+ op->inst_offset_type == INST_PC_OFFSET
+ ? memaddr : 0);
+ }
+ break;
+ case INST_TYPE_RD_R2:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_rd(inst), get_field_r2(inst));
+ break;
+ case INST_TYPE_R2:
+ fprintf_func(stream, "\t%s",
+ get_field_r2(inst));
+ break;
+ case INST_TYPE_R1:
+ fprintf_func(stream, "\t%s",
+ get_field_r1(inst));
+ break;
+ case INST_TYPE_RD_R1_SPECIAL:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_rd(inst), get_field_r2(inst));
+ break;
+ case INST_TYPE_RD_IMM15:
+ fprintf_func(stream, "\t%s, %s",
+ get_field_rd(inst), get_field_imm15(inst));
+ break;
+ /* For tuqula instruction */
+ case INST_TYPE_RD:
+ fprintf_func(stream, "\t%s",
+ get_field_rd(inst));
+ break;
+ case INST_TYPE_RFSL:
+ fprintf_func(stream, "\t%s",
+ get_field_rfsl(inst));
+ break;
+ default:
+ /* if the disassembler lags the instruction set */
+ fprintf_func(stream, "\tundecoded operands, inst is 0x%04lx", inst);
+ break;
}
-
- /* Say how many bytes we consumed? */
- return 4;
+ return 4;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 11/16] disas/microblaze: Merge op->name output into each fprintf
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (9 preceding siblings ...)
2024-06-05 21:15 ` [PULL 10/16] disas/microblaze: Re-indent print_insn_microblaze Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 12/16] disas/microblaze: Print registers directly with PRIreg Richard Henderson
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Pierrick Bouvier
In the common case, issue one single fprintf.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-17-richard.henderson@linaro.org>
---
disas/microblaze.c | 80 +++++++++++++++++++++++-----------------------
1 file changed, 40 insertions(+), 40 deletions(-)
diff --git a/disas/microblaze.c b/disas/microblaze.c
index c729c76585..a537ac65dd 100644
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@@ -830,54 +830,52 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
return 4;
}
- fprintf_func (stream, "%s", op->name);
-
switch (op->inst_type) {
case INST_TYPE_RD_R1_R2:
- fprintf_func(stream, "\t%s, %s, %s",
- get_field_rd(inst), get_field_r1(inst),
+ fprintf_func(stream, "%s\t%s, %s, %s",
+ op->name, get_field_rd(inst), get_field_r1(inst),
get_field_r2(inst));
break;
case INST_TYPE_RD_R1_IMM:
- fprintf_func(stream, "\t%s, %s, %s",
- get_field_rd(inst), get_field_r1(inst),
+ fprintf_func(stream, "%s\t%s, %s, %s",
+ op->name, get_field_rd(inst), get_field_r1(inst),
get_field_imm(inst));
if (get_int_field_r1(inst) == 0) {
print_immval_addr(info, immfound, immval, inst, 0);
}
break;
case INST_TYPE_RD_R1_IMM5:
- fprintf_func(stream, "\t%s, %s, %s",
- get_field_rd(inst), get_field_r1(inst),
+ fprintf_func(stream, "%s\t%s, %s, %s",
+ op->name, get_field_rd(inst), get_field_r1(inst),
get_field_imm5(inst));
break;
case INST_TYPE_RD_RFSL:
- fprintf_func(stream, "\t%s, %s",
- get_field_rd(inst), get_field_rfsl(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_rd(inst), get_field_rfsl(inst));
break;
case INST_TYPE_R1_RFSL:
- fprintf_func(stream, "\t%s, %s",
- get_field_r1(inst), get_field_rfsl(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_r1(inst), get_field_rfsl(inst));
break;
case INST_TYPE_RD_SPECIAL:
- fprintf_func(stream, "\t%s, %s",
- get_field_rd(inst), get_field_special(inst, op));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_rd(inst), get_field_special(inst, op));
break;
case INST_TYPE_SPECIAL_R1:
- fprintf_func(stream, "\t%s, %s",
- get_field_special(inst, op), get_field_r1(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_special(inst, op), get_field_r1(inst));
break;
case INST_TYPE_RD_R1:
- fprintf_func(stream, "\t%s, %s",
- get_field_rd(inst), get_field_r1(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_rd(inst), get_field_r1(inst));
break;
case INST_TYPE_R1_R2:
- fprintf_func(stream, "\t%s, %s",
- get_field_r1(inst), get_field_r2(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_r1(inst), get_field_r2(inst));
break;
case INST_TYPE_R1_IMM:
- fprintf_func(stream, "\t%s, %s",
- get_field_r1(inst), get_field_imm(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_r1(inst), get_field_imm(inst));
/*
* The non-pc relative instructions are returns,
* which shouldn't have a label printed.
@@ -887,14 +885,15 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
}
break;
case INST_TYPE_RD_IMM:
- fprintf_func(stream, "\t%s, %s",
- get_field_rd(inst), get_field_imm(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_rd(inst), get_field_imm(inst));
print_immval_addr(info, immfound, immval, inst,
op->inst_offset_type == INST_PC_OFFSET
? memaddr : 0);
break;
case INST_TYPE_IMM:
- fprintf_func(stream, "\t%s", get_field_imm(inst));
+ fprintf_func(stream, "%s\t%s",
+ op->name, get_field_imm(inst));
if (op->instr != imm) {
print_immval_addr(info, immfound, immval, inst,
op->inst_offset_type == INST_PC_OFFSET
@@ -902,37 +901,38 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
}
break;
case INST_TYPE_RD_R2:
- fprintf_func(stream, "\t%s, %s",
- get_field_rd(inst), get_field_r2(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_rd(inst), get_field_r2(inst));
break;
case INST_TYPE_R2:
- fprintf_func(stream, "\t%s",
- get_field_r2(inst));
+ fprintf_func(stream, "%s\t%s",
+ op->name, get_field_r2(inst));
break;
case INST_TYPE_R1:
- fprintf_func(stream, "\t%s",
- get_field_r1(inst));
+ fprintf_func(stream, "%s\t%s",
+ op->name, get_field_r1(inst));
break;
case INST_TYPE_RD_R1_SPECIAL:
- fprintf_func(stream, "\t%s, %s",
- get_field_rd(inst), get_field_r2(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_rd(inst), get_field_r2(inst));
break;
case INST_TYPE_RD_IMM15:
- fprintf_func(stream, "\t%s, %s",
- get_field_rd(inst), get_field_imm15(inst));
+ fprintf_func(stream, "%s\t%s, %s",
+ op->name, get_field_rd(inst), get_field_imm15(inst));
break;
/* For tuqula instruction */
case INST_TYPE_RD:
- fprintf_func(stream, "\t%s",
- get_field_rd(inst));
+ fprintf_func(stream, "%s\t%s",
+ op->name, get_field_rd(inst));
break;
case INST_TYPE_RFSL:
- fprintf_func(stream, "\t%s",
- get_field_rfsl(inst));
+ fprintf_func(stream, "%s\t%s",
+ op->name, get_field_rfsl(inst));
break;
default:
/* if the disassembler lags the instruction set */
- fprintf_func(stream, "\tundecoded operands, inst is 0x%04lx", inst);
+ fprintf_func(stream, "%s\tundecoded operands, inst is 0x%04lx",
+ op->name, inst);
break;
}
return 4;
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 12/16] disas/microblaze: Print registers directly with PRIreg
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (10 preceding siblings ...)
2024-06-05 21:15 ` [PULL 11/16] disas/microblaze: Merge op->name output into each fprintf Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 13/16] disas/microblaze: Print immediates directly with PRIimm Richard Henderson
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Pierrick Bouvier
Use a printf format instead of sprintf into a buffer.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-18-richard.henderson@linaro.org>
---
disas/microblaze.c | 54 ++++++++++++++++++++--------------------------
1 file changed, 23 insertions(+), 31 deletions(-)
diff --git a/disas/microblaze.c b/disas/microblaze.c
index a537ac65dd..c12968f3b9 100644
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@@ -563,7 +563,7 @@ static const struct op_code_struct {
};
/* prefix for register names */
-static const char register_prefix[] = "r";
+#define register_prefix "r"
static const char fsl_register_prefix[] = "rfsl";
static const char pvr_register_prefix[] = "rpvr";
@@ -579,15 +579,16 @@ static const char pvr_register_prefix[] = "rpvr";
#include "disas/dis-asm.h"
-#define get_field_rd(instr) get_field(instr, RD_MASK, RD_LOW)
-#define get_field_r1(instr) get_field(instr, RA_MASK, RA_LOW)
-#define get_field_r2(instr) get_field(instr, RB_MASK, RB_LOW)
+#define PRIreg register_prefix "%ld"
+
+#define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW)
+#define get_field_r1(instr) ((instr & RA_MASK) >> RA_LOW)
+#define get_field_r2(instr) ((instr & RB_MASK) >> RB_LOW)
#define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW)
#define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW)
/* Local function prototypes. */
-static char * get_field (long instr, long mask, unsigned short low);
static char * get_field_imm (long instr);
static char * get_field_imm5 (long instr);
static char * get_field_rfsl (long instr);
@@ -596,15 +597,6 @@ static char * get_field_imm15 (long instr);
static char * get_field_unsigned_imm (long instr);
#endif
-static char *
-get_field (long instr, long mask, unsigned short low)
-{
- char tmpstr[25];
- snprintf(tmpstr, sizeof(tmpstr), "%s%d", register_prefix,
- (int)((instr & mask) >> low));
- return(strdup(tmpstr));
-}
-
static char *
get_field_imm (long instr)
{
@@ -832,12 +824,12 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
switch (op->inst_type) {
case INST_TYPE_RD_R1_R2:
- fprintf_func(stream, "%s\t%s, %s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", " PRIreg,
op->name, get_field_rd(inst), get_field_r1(inst),
get_field_r2(inst));
break;
case INST_TYPE_RD_R1_IMM:
- fprintf_func(stream, "%s\t%s, %s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", %s",
op->name, get_field_rd(inst), get_field_r1(inst),
get_field_imm(inst));
if (get_int_field_r1(inst) == 0) {
@@ -845,36 +837,36 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
}
break;
case INST_TYPE_RD_R1_IMM5:
- fprintf_func(stream, "%s\t%s, %s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", %s",
op->name, get_field_rd(inst), get_field_r1(inst),
get_field_imm5(inst));
break;
case INST_TYPE_RD_RFSL:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", %s",
op->name, get_field_rd(inst), get_field_rfsl(inst));
break;
case INST_TYPE_R1_RFSL:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", %s",
op->name, get_field_r1(inst), get_field_rfsl(inst));
break;
case INST_TYPE_RD_SPECIAL:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", %s",
op->name, get_field_rd(inst), get_field_special(inst, op));
break;
case INST_TYPE_SPECIAL_R1:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t%s, " PRIreg,
op->name, get_field_special(inst, op), get_field_r1(inst));
break;
case INST_TYPE_RD_R1:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg,
op->name, get_field_rd(inst), get_field_r1(inst));
break;
case INST_TYPE_R1_R2:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg,
op->name, get_field_r1(inst), get_field_r2(inst));
break;
case INST_TYPE_R1_IMM:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", %s",
op->name, get_field_r1(inst), get_field_imm(inst));
/*
* The non-pc relative instructions are returns,
@@ -885,7 +877,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
}
break;
case INST_TYPE_RD_IMM:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", %s",
op->name, get_field_rd(inst), get_field_imm(inst));
print_immval_addr(info, immfound, immval, inst,
op->inst_offset_type == INST_PC_OFFSET
@@ -901,28 +893,28 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
}
break;
case INST_TYPE_RD_R2:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg,
op->name, get_field_rd(inst), get_field_r2(inst));
break;
case INST_TYPE_R2:
- fprintf_func(stream, "%s\t%s",
+ fprintf_func(stream, "%s\t" PRIreg,
op->name, get_field_r2(inst));
break;
case INST_TYPE_R1:
- fprintf_func(stream, "%s\t%s",
+ fprintf_func(stream, "%s\t" PRIreg,
op->name, get_field_r1(inst));
break;
case INST_TYPE_RD_R1_SPECIAL:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg,
op->name, get_field_rd(inst), get_field_r2(inst));
break;
case INST_TYPE_RD_IMM15:
- fprintf_func(stream, "%s\t%s, %s",
+ fprintf_func(stream, "%s\t" PRIreg ", %s",
op->name, get_field_rd(inst), get_field_imm15(inst));
break;
/* For tuqula instruction */
case INST_TYPE_RD:
- fprintf_func(stream, "%s\t%s",
+ fprintf_func(stream, "%s\t" PRIreg,
op->name, get_field_rd(inst));
break;
case INST_TYPE_RFSL:
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 13/16] disas/microblaze: Print immediates directly with PRIimm
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (11 preceding siblings ...)
2024-06-05 21:15 ` [PULL 12/16] disas/microblaze: Print registers directly with PRIreg Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 14/16] disas/microblaze: Print registers directly with PRIrfsl Richard Henderson
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Pierrick Bouvier
Use a printf format instead of sprintf into a buffer.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-19-richard.henderson@linaro.org>
---
disas/microblaze.c | 61 +++++++++-------------------------------------
1 file changed, 11 insertions(+), 50 deletions(-)
diff --git a/disas/microblaze.c b/disas/microblaze.c
index c12968f3b9..390f98c0a3 100644
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@@ -580,40 +580,21 @@ static const char pvr_register_prefix[] = "rpvr";
#include "disas/dis-asm.h"
#define PRIreg register_prefix "%ld"
+#define PRIimm "%d"
#define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW)
#define get_field_r1(instr) ((instr & RA_MASK) >> RA_LOW)
#define get_field_r2(instr) ((instr & RB_MASK) >> RB_LOW)
+#define get_field_imm(instr) ((int16_t)instr)
+#define get_field_imm5(instr) ((int)instr & IMM5_MASK)
+#define get_field_imm15(instr) ((int)instr & IMM15_MASK)
+
#define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW)
#define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW)
/* Local function prototypes. */
-static char * get_field_imm (long instr);
-static char * get_field_imm5 (long instr);
static char * get_field_rfsl (long instr);
-static char * get_field_imm15 (long instr);
-#if 0
-static char * get_field_unsigned_imm (long instr);
-#endif
-
-static char *
-get_field_imm (long instr)
-{
- char tmpstr[25];
- snprintf(tmpstr, sizeof(tmpstr), "%d",
- (short)((instr & IMM_MASK) >> IMM_LOW));
- return(strdup(tmpstr));
-}
-
-static char *
-get_field_imm5 (long instr)
-{
- char tmpstr[25];
- snprintf(tmpstr, sizeof(tmpstr), "%d",
- (short)((instr & IMM5_MASK) >> IMM_LOW));
- return(strdup(tmpstr));
-}
static char *
get_field_rfsl (long instr)
@@ -624,26 +605,6 @@ get_field_rfsl (long instr)
return(strdup(tmpstr));
}
-static char *
-get_field_imm15 (long instr)
-{
- char tmpstr[25];
- snprintf(tmpstr, sizeof(tmpstr), "%d",
- (short)((instr & IMM15_MASK) >> IMM_LOW));
- return(strdup(tmpstr));
-}
-
-#if 0
-static char *
-get_field_unsigned_imm (long instr)
-{
- char tmpstr[25];
- snprintf(tmpstr, sizeof(tmpstr), "%d",
- (int)((instr & IMM_MASK) >> IMM_LOW));
- return(strdup(tmpstr));
-}
-#endif
-
/*
char *
get_field_special (instr)
@@ -829,7 +790,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
get_field_r2(inst));
break;
case INST_TYPE_RD_R1_IMM:
- fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", " PRIimm,
op->name, get_field_rd(inst), get_field_r1(inst),
get_field_imm(inst));
if (get_int_field_r1(inst) == 0) {
@@ -837,7 +798,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
}
break;
case INST_TYPE_RD_R1_IMM5:
- fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIreg ", " PRIimm,
op->name, get_field_rd(inst), get_field_r1(inst),
get_field_imm5(inst));
break;
@@ -866,7 +827,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
op->name, get_field_r1(inst), get_field_r2(inst));
break;
case INST_TYPE_R1_IMM:
- fprintf_func(stream, "%s\t" PRIreg ", %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIimm,
op->name, get_field_r1(inst), get_field_imm(inst));
/*
* The non-pc relative instructions are returns,
@@ -877,14 +838,14 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
}
break;
case INST_TYPE_RD_IMM:
- fprintf_func(stream, "%s\t" PRIreg ", %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIimm,
op->name, get_field_rd(inst), get_field_imm(inst));
print_immval_addr(info, immfound, immval, inst,
op->inst_offset_type == INST_PC_OFFSET
? memaddr : 0);
break;
case INST_TYPE_IMM:
- fprintf_func(stream, "%s\t%s",
+ fprintf_func(stream, "%s\t" PRIimm,
op->name, get_field_imm(inst));
if (op->instr != imm) {
print_immval_addr(info, immfound, immval, inst,
@@ -909,7 +870,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
op->name, get_field_rd(inst), get_field_r2(inst));
break;
case INST_TYPE_RD_IMM15:
- fprintf_func(stream, "%s\t" PRIreg ", %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIimm,
op->name, get_field_rd(inst), get_field_imm15(inst));
break;
/* For tuqula instruction */
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 14/16] disas/microblaze: Print registers directly with PRIrfsl
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (12 preceding siblings ...)
2024-06-05 21:15 ` [PULL 13/16] disas/microblaze: Print immediates directly with PRIimm Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 21:15 ` [PULL 15/16] disas/microblaze: Split get_field_special Richard Henderson
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Pierrick Bouvier
Use a printf format instead of sprintf into a buffer.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-20-richard.henderson@linaro.org>
---
disas/microblaze.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/disas/microblaze.c b/disas/microblaze.c
index 390f98c0a3..24febfdea9 100644
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@@ -564,7 +564,6 @@ static const struct op_code_struct {
/* prefix for register names */
#define register_prefix "r"
-static const char fsl_register_prefix[] = "rfsl";
static const char pvr_register_prefix[] = "rpvr";
@@ -580,11 +579,13 @@ static const char pvr_register_prefix[] = "rpvr";
#include "disas/dis-asm.h"
#define PRIreg register_prefix "%ld"
+#define PRIrfsl register_prefix "fsl%ld"
#define PRIimm "%d"
#define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW)
#define get_field_r1(instr) ((instr & RA_MASK) >> RA_LOW)
#define get_field_r2(instr) ((instr & RB_MASK) >> RB_LOW)
+#define get_field_rfsl(instr) (instr & RFSL_MASK)
#define get_field_imm(instr) ((int16_t)instr)
#define get_field_imm5(instr) ((int)instr & IMM5_MASK)
#define get_field_imm15(instr) ((int)instr & IMM15_MASK)
@@ -592,19 +593,6 @@ static const char pvr_register_prefix[] = "rpvr";
#define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW)
#define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW)
-/* Local function prototypes. */
-
-static char * get_field_rfsl (long instr);
-
-static char *
-get_field_rfsl (long instr)
-{
- char tmpstr[25];
- snprintf(tmpstr, sizeof(tmpstr), "%s%d", fsl_register_prefix,
- (short)((instr & RFSL_MASK) >> IMM_LOW));
- return(strdup(tmpstr));
-}
-
/*
char *
get_field_special (instr)
@@ -803,11 +791,11 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
get_field_imm5(inst));
break;
case INST_TYPE_RD_RFSL:
- fprintf_func(stream, "%s\t" PRIreg ", %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIrfsl,
op->name, get_field_rd(inst), get_field_rfsl(inst));
break;
case INST_TYPE_R1_RFSL:
- fprintf_func(stream, "%s\t" PRIreg ", %s",
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIrfsl,
op->name, get_field_r1(inst), get_field_rfsl(inst));
break;
case INST_TYPE_RD_SPECIAL:
@@ -879,7 +867,7 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
op->name, get_field_rd(inst));
break;
case INST_TYPE_RFSL:
- fprintf_func(stream, "%s\t%s",
+ fprintf_func(stream, "%s\t" PRIrfsl,
op->name, get_field_rfsl(inst));
break;
default:
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 15/16] disas/microblaze: Split get_field_special
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (13 preceding siblings ...)
2024-06-05 21:15 ` [PULL 14/16] disas/microblaze: Print registers directly with PRIrfsl Richard Henderson
@ 2024-06-05 21:15 ` 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
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Pierrick Bouvier
Extract the raw special index and a function to lookup a name.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-21-richard.henderson@linaro.org>
---
disas/microblaze.c | 142 +++++++++++++++++++--------------------------
1 file changed, 61 insertions(+), 81 deletions(-)
diff --git a/disas/microblaze.c b/disas/microblaze.c
index 24febfdea9..197327fae4 100644
--- a/disas/microblaze.c
+++ b/disas/microblaze.c
@@ -564,8 +564,6 @@ static const struct op_code_struct {
/* prefix for register names */
#define register_prefix "r"
-static const char pvr_register_prefix[] = "rpvr";
-
/* #defines for valid immediate range */
#define MIN_IMM ((int) 0x80000000)
@@ -580,6 +578,7 @@ static const char pvr_register_prefix[] = "rpvr";
#define PRIreg register_prefix "%ld"
#define PRIrfsl register_prefix "fsl%ld"
+#define PRIpvr register_prefix "pvr%d"
#define PRIimm "%d"
#define get_field_rd(instr) ((instr & RD_MASK) >> RD_LOW)
@@ -593,83 +592,48 @@ static const char pvr_register_prefix[] = "rpvr";
#define get_int_field_imm(instr) ((instr & IMM_MASK) >> IMM_LOW)
#define get_int_field_r1(instr) ((instr & RA_MASK) >> RA_LOW)
-/*
- char *
- get_field_special (instr)
- long instr;
- {
- char tmpstr[25];
-
- snprintf(tmpstr, sizeof(tmpstr), "%s%s", register_prefix,
- (((instr & IMM_MASK) >> IMM_LOW) & REG_MSR_MASK) == 0 ? "pc" : "msr");
-
- return(strdup(tmpstr));
- }
-*/
-
-static char *
-get_field_special(long instr, const struct op_code_struct *op)
+static int get_field_special(long instr, const struct op_code_struct *op)
{
- char tmpstr[25];
- char spr[6];
+ return ((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask;
+}
- switch ( (((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask) ) {
-
- case REG_MSR_MASK :
- strcpy(spr, "msr");
- break;
- case REG_PC_MASK :
- strcpy(spr, "pc");
- break;
- case REG_EAR_MASK :
- strcpy(spr, "ear");
- break;
- case REG_ESR_MASK :
- strcpy(spr, "esr");
- break;
- case REG_FSR_MASK :
- strcpy(spr, "fsr");
- break;
- case REG_BTR_MASK :
- strcpy(spr, "btr");
- break;
- case REG_EDR_MASK :
- strcpy(spr, "edr");
- break;
- case REG_PID_MASK :
- strcpy(spr, "pid");
- break;
- case REG_ZPR_MASK :
- strcpy(spr, "zpr");
- break;
- case REG_TLBX_MASK :
- strcpy(spr, "tlbx");
- break;
- case REG_TLBLO_MASK :
- strcpy(spr, "tlblo");
- break;
- case REG_TLBHI_MASK :
- strcpy(spr, "tlbhi");
- break;
- case REG_TLBSX_MASK :
- strcpy(spr, "tlbsx");
- break;
- default :
- {
- if ( ((((instr & IMM_MASK) >> IMM_LOW) ^ op->immval_mask) & 0xE000) == REG_PVR_MASK) {
- snprintf(tmpstr, sizeof(tmpstr), "%s%u", pvr_register_prefix,
- (unsigned short)(((instr & IMM_MASK) >> IMM_LOW) ^
- op->immval_mask) ^ REG_PVR_MASK);
- return(strdup(tmpstr));
- } else {
- strcpy(spr, "pc");
- }
- }
- break;
- }
-
- snprintf(tmpstr, sizeof(tmpstr), "%s%s", register_prefix, spr);
- return(strdup(tmpstr));
+/* Returns NULL for PVR registers, which should be rendered differently. */
+static const char *get_special_name(int special)
+{
+ switch (special) {
+ case REG_MSR_MASK:
+ return register_prefix "msr";
+ case REG_PC_MASK:
+ return register_prefix "pc";
+ case REG_EAR_MASK:
+ return register_prefix "ear";
+ case REG_ESR_MASK:
+ return register_prefix "esr";
+ case REG_FSR_MASK:
+ return register_prefix "fsr";
+ case REG_BTR_MASK:
+ return register_prefix "btr";
+ case REG_EDR_MASK:
+ return register_prefix "edr";
+ case REG_PID_MASK:
+ return register_prefix "pid";
+ case REG_ZPR_MASK:
+ return register_prefix "zpr";
+ case REG_TLBX_MASK:
+ return register_prefix "tlbx";
+ case REG_TLBLO_MASK:
+ return register_prefix "tlblo";
+ case REG_TLBHI_MASK:
+ return register_prefix "tlbhi";
+ case REG_TLBSX_MASK:
+ return register_prefix "tlbsx";
+ default:
+ if ((special & 0xE000) == REG_PVR_MASK) {
+ /* pvr register */
+ return NULL;
+ }
+ return register_prefix "pc";
+ }
}
static unsigned long
@@ -739,6 +703,8 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
static bfd_vma prev_insn_addr = -1; /*init the prev insn addr */
static int prev_insn_vma = -1; /*init the prev insn vma */
int curr_insn_vma = info->buffer_vma;
+ int special;
+ const char *special_name;
info->bytes_per_chunk = 4;
@@ -799,12 +765,26 @@ print_insn_microblaze(bfd_vma memaddr, struct disassemble_info *info)
op->name, get_field_r1(inst), get_field_rfsl(inst));
break;
case INST_TYPE_RD_SPECIAL:
- fprintf_func(stream, "%s\t" PRIreg ", %s",
- op->name, get_field_rd(inst), get_field_special(inst, op));
+ special = get_field_special(inst, op);
+ special_name = get_special_name(special);
+ if (special_name) {
+ fprintf_func(stream, "%s\t" PRIreg ", %s",
+ op->name, get_field_rd(inst), special_name);
+ } else {
+ fprintf_func(stream, "%s\t" PRIreg ", " PRIpvr,
+ op->name, get_field_rd(inst), special ^ REG_PVR_MASK);
+ }
break;
case INST_TYPE_SPECIAL_R1:
- fprintf_func(stream, "%s\t%s, " PRIreg,
- op->name, get_field_special(inst, op), get_field_r1(inst));
+ special = get_field_special(inst, op);
+ special_name = get_special_name(special);
+ if (special_name) {
+ fprintf_func(stream, "%s\t%s, " PRIreg,
+ op->name, special_name, get_field_r1(inst));
+ } else {
+ fprintf_func(stream, "%s\t" PRIpvr ", " PRIreg,
+ op->name, special ^ REG_PVR_MASK, get_field_r1(inst));
+ }
break;
case INST_TYPE_RD_R1:
fprintf_func(stream, "%s\t" PRIreg ", " PRIreg,
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PULL 16/16] disas/riscv: Use GString in format_inst
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (14 preceding siblings ...)
2024-06-05 21:15 ` [PULL 15/16] disas/microblaze: Split get_field_special Richard Henderson
@ 2024-06-05 21:15 ` Richard Henderson
2024-06-05 23:53 ` [PULL 00/16] sprintf fixes Richard Henderson
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 21:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Alistair Francis, Pierrick Bouvier
Allocate and fill a GString instead of snprintf and
appending to a fixed sized buffer.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Message-Id: <20240412073346.458116-22-richard.henderson@linaro.org>
---
disas/riscv.c | 209 ++++++++++++++++++++++----------------------------
1 file changed, 92 insertions(+), 117 deletions(-)
diff --git a/disas/riscv.c b/disas/riscv.c
index 297cfa2f63..90d6b26de9 100644
--- a/disas/riscv.c
+++ b/disas/riscv.c
@@ -4820,272 +4820,249 @@ static size_t inst_length(rv_inst inst)
/* format instruction */
-static void append(char *s1, const char *s2, size_t n)
-{
- size_t l1 = strlen(s1);
- if (n - l1 - 1 > 0) {
- strncat(s1, s2, n - l1);
- }
-}
-
-static void format_inst(char *buf, size_t buflen, size_t tab, rv_decode *dec)
+static GString *format_inst(size_t tab, rv_decode *dec)
{
const rv_opcode_data *opcode_data = dec->opcode_data;
- char tmp[64];
+ GString *buf = g_string_sized_new(64);
const char *fmt;
fmt = opcode_data[dec->op].format;
while (*fmt) {
switch (*fmt) {
case 'O':
- append(buf, opcode_data[dec->op].name, buflen);
+ g_string_append(buf, opcode_data[dec->op].name);
break;
case '(':
- append(buf, "(", buflen);
- break;
case ',':
- append(buf, ",", buflen);
- break;
case ')':
- append(buf, ")", buflen);
- break;
case '-':
- append(buf, "-", buflen);
+ g_string_append_c(buf, *fmt);
break;
case 'b':
- snprintf(tmp, sizeof(tmp), "%d", dec->bs);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "%d", dec->bs);
break;
case 'n':
- snprintf(tmp, sizeof(tmp), "%d", dec->rnum);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "%d", dec->rnum);
break;
case '0':
- append(buf, rv_ireg_name_sym[dec->rd], buflen);
+ g_string_append(buf, rv_ireg_name_sym[dec->rd]);
break;
case '1':
- append(buf, rv_ireg_name_sym[dec->rs1], buflen);
+ g_string_append(buf, rv_ireg_name_sym[dec->rs1]);
break;
case '2':
- append(buf, rv_ireg_name_sym[dec->rs2], buflen);
+ g_string_append(buf, rv_ireg_name_sym[dec->rs2]);
break;
case '3':
- append(buf, dec->cfg->ext_zfinx ? rv_ireg_name_sym[dec->rd] :
- rv_freg_name_sym[dec->rd],
- buflen);
+ if (dec->cfg->ext_zfinx) {
+ g_string_append(buf, rv_ireg_name_sym[dec->rd]);
+ } else {
+ g_string_append(buf, rv_freg_name_sym[dec->rd]);
+ }
break;
case '4':
- append(buf, dec->cfg->ext_zfinx ? rv_ireg_name_sym[dec->rs1] :
- rv_freg_name_sym[dec->rs1],
- buflen);
+ if (dec->cfg->ext_zfinx) {
+ g_string_append(buf, rv_ireg_name_sym[dec->rs1]);
+ } else {
+ g_string_append(buf, rv_freg_name_sym[dec->rs1]);
+ }
break;
case '5':
- append(buf, dec->cfg->ext_zfinx ? rv_ireg_name_sym[dec->rs2] :
- rv_freg_name_sym[dec->rs2],
- buflen);
+ if (dec->cfg->ext_zfinx) {
+ g_string_append(buf, rv_ireg_name_sym[dec->rs2]);
+ } else {
+ g_string_append(buf, rv_freg_name_sym[dec->rs2]);
+ }
break;
case '6':
- append(buf, dec->cfg->ext_zfinx ? rv_ireg_name_sym[dec->rs3] :
- rv_freg_name_sym[dec->rs3],
- buflen);
+ if (dec->cfg->ext_zfinx) {
+ g_string_append(buf, rv_ireg_name_sym[dec->rs3]);
+ } else {
+ g_string_append(buf, rv_freg_name_sym[dec->rs3]);
+ }
break;
case '7':
- snprintf(tmp, sizeof(tmp), "%d", dec->rs1);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "%d", dec->rs1);
break;
case 'i':
- snprintf(tmp, sizeof(tmp), "%d", dec->imm);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "%d", dec->imm);
break;
case 'u':
- snprintf(tmp, sizeof(tmp), "%u", ((uint32_t)dec->imm & 0b111111));
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "%u", ((uint32_t)dec->imm & 0b111111));
break;
case 'j':
- snprintf(tmp, sizeof(tmp), "%d", dec->imm1);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "%d", dec->imm1);
break;
case 'o':
- snprintf(tmp, sizeof(tmp), "%d", dec->imm);
- append(buf, tmp, buflen);
- while (strlen(buf) < tab * 2) {
- append(buf, " ", buflen);
+ g_string_append_printf(buf, "%d", dec->imm);
+ while (buf->len < tab * 2) {
+ g_string_append_c(buf, ' ');
}
- snprintf(tmp, sizeof(tmp), "# 0x%" PRIx64,
- dec->pc + dec->imm);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "# 0x%" PRIx64, dec->pc + dec->imm);
break;
case 'U':
fmt++;
- snprintf(tmp, sizeof(tmp), "%d", dec->imm >> 12);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "%d", dec->imm >> 12);
if (*fmt == 'o') {
- while (strlen(buf) < tab * 2) {
- append(buf, " ", buflen);
+ while (buf->len < tab * 2) {
+ g_string_append_c(buf, ' ');
}
- snprintf(tmp, sizeof(tmp), "# 0x%" PRIx64,
- dec->pc + dec->imm);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "# 0x%" PRIx64, dec->pc + dec->imm);
}
break;
case 'c': {
const char *name = csr_name(dec->imm & 0xfff);
if (name) {
- append(buf, name, buflen);
+ g_string_append(buf, name);
} else {
- snprintf(tmp, sizeof(tmp), "0x%03x", dec->imm & 0xfff);
- append(buf, tmp, buflen);
+ g_string_append_printf(buf, "0x%03x", dec->imm & 0xfff);
}
break;
}
case 'r':
switch (dec->rm) {
case rv_rm_rne:
- append(buf, "rne", buflen);
+ g_string_append(buf, "rne");
break;
case rv_rm_rtz:
- append(buf, "rtz", buflen);
+ g_string_append(buf, "rtz");
break;
case rv_rm_rdn:
- append(buf, "rdn", buflen);
+ g_string_append(buf, "rdn");
break;
case rv_rm_rup:
- append(buf, "rup", buflen);
+ g_string_append(buf, "rup");
break;
case rv_rm_rmm:
- append(buf, "rmm", buflen);
+ g_string_append(buf, "rmm");
break;
case rv_rm_dyn:
- append(buf, "dyn", buflen);
+ g_string_append(buf, "dyn");
break;
default:
- append(buf, "inv", buflen);
+ g_string_append(buf, "inv");
break;
}
break;
case 'p':
if (dec->pred & rv_fence_i) {
- append(buf, "i", buflen);
+ g_string_append_c(buf, 'i');
}
if (dec->pred & rv_fence_o) {
- append(buf, "o", buflen);
+ g_string_append_c(buf, 'o');
}
if (dec->pred & rv_fence_r) {
- append(buf, "r", buflen);
+ g_string_append_c(buf, 'r');
}
if (dec->pred & rv_fence_w) {
- append(buf, "w", buflen);
+ g_string_append_c(buf, 'w');
}
break;
case 's':
if (dec->succ & rv_fence_i) {
- append(buf, "i", buflen);
+ g_string_append_c(buf, 'i');
}
if (dec->succ & rv_fence_o) {
- append(buf, "o", buflen);
+ g_string_append_c(buf, 'o');
}
if (dec->succ & rv_fence_r) {
- append(buf, "r", buflen);
+ g_string_append_c(buf, 'r');
}
if (dec->succ & rv_fence_w) {
- append(buf, "w", buflen);
+ g_string_append_c(buf, 'w');
}
break;
case '\t':
- while (strlen(buf) < tab) {
- append(buf, " ", buflen);
+ while (buf->len < tab) {
+ g_string_append_c(buf, ' ');
}
break;
case 'A':
if (dec->aq) {
- append(buf, ".aq", buflen);
+ g_string_append(buf, ".aq");
}
break;
case 'R':
if (dec->rl) {
- append(buf, ".rl", buflen);
+ g_string_append(buf, ".rl");
}
break;
case 'l':
- append(buf, ",v0", buflen);
+ g_string_append(buf, ",v0");
break;
case 'm':
if (dec->vm == 0) {
- append(buf, ",v0.t", buflen);
+ g_string_append(buf, ",v0.t");
}
break;
case 'D':
- append(buf, rv_vreg_name_sym[dec->rd], buflen);
+ g_string_append(buf, rv_vreg_name_sym[dec->rd]);
break;
case 'E':
- append(buf, rv_vreg_name_sym[dec->rs1], buflen);
+ g_string_append(buf, rv_vreg_name_sym[dec->rs1]);
break;
case 'F':
- append(buf, rv_vreg_name_sym[dec->rs2], buflen);
+ g_string_append(buf, rv_vreg_name_sym[dec->rs2]);
break;
case 'G':
- append(buf, rv_vreg_name_sym[dec->rs3], buflen);
+ g_string_append(buf, rv_vreg_name_sym[dec->rs3]);
break;
case 'v': {
- char nbuf[32] = {0};
const int sew = 1 << (((dec->vzimm >> 3) & 0b111) + 3);
- sprintf(nbuf, "%d", sew);
const int lmul = dec->vzimm & 0b11;
const int flmul = (dec->vzimm >> 2) & 1;
const char *vta = (dec->vzimm >> 6) & 1 ? "ta" : "tu";
const char *vma = (dec->vzimm >> 7) & 1 ? "ma" : "mu";
- append(buf, "e", buflen);
- append(buf, nbuf, buflen);
- append(buf, ",m", buflen);
+
+ g_string_append_printf(buf, "e%d,m", sew);
if (flmul) {
switch (lmul) {
case 3:
- sprintf(nbuf, "f2");
+ g_string_append(buf, "f2");
break;
case 2:
- sprintf(nbuf, "f4");
+ g_string_append(buf, "f4");
break;
case 1:
- sprintf(nbuf, "f8");
- break;
+ g_string_append(buf, "f8");
+ break;
}
- append(buf, nbuf, buflen);
} else {
- sprintf(nbuf, "%d", 1 << lmul);
- append(buf, nbuf, buflen);
+ g_string_append_printf(buf, "%d", 1 << lmul);
}
- append(buf, ",", buflen);
- append(buf, vta, buflen);
- append(buf, ",", buflen);
- append(buf, vma, buflen);
+ g_string_append_c(buf, ',');
+ g_string_append(buf, vta);
+ g_string_append_c(buf, ',');
+ g_string_append(buf, vma);
break;
}
case 'x': {
switch (dec->rlist) {
case 4:
- snprintf(tmp, sizeof(tmp), "{ra}");
+ g_string_append(buf, "{ra}");
break;
case 5:
- snprintf(tmp, sizeof(tmp), "{ra, s0}");
+ g_string_append(buf, "{ra, s0}");
break;
case 15:
- snprintf(tmp, sizeof(tmp), "{ra, s0-s11}");
+ g_string_append(buf, "{ra, s0-s11}");
break;
default:
- snprintf(tmp, sizeof(tmp), "{ra, s0-s%d}", dec->rlist - 5);
+ g_string_append_printf(buf, "{ra, s0-s%d}", dec->rlist - 5);
break;
}
- append(buf, tmp, buflen);
break;
}
case 'h':
- append(buf, rv_fli_name_const[dec->imm], buflen);
+ g_string_append(buf, rv_fli_name_const[dec->imm]);
break;
default:
break;
}
fmt++;
}
+
+ return buf;
}
/* lift instruction to pseudo-instruction */
@@ -5171,9 +5148,8 @@ static void decode_inst_decompress(rv_decode *dec, rv_isa isa)
/* disassemble instruction */
-static void
-disasm_inst(char *buf, size_t buflen, rv_isa isa, uint64_t pc, rv_inst inst,
- RISCVCPUConfig *cfg)
+static GString *disasm_inst(rv_isa isa, uint64_t pc, rv_inst inst,
+ RISCVCPUConfig *cfg)
{
rv_decode dec = { 0 };
dec.pc = pc;
@@ -5220,7 +5196,7 @@ disasm_inst(char *buf, size_t buflen, rv_isa isa, uint64_t pc, rv_inst inst,
decode_inst_operands(&dec, isa);
decode_inst_decompress(&dec, isa);
decode_inst_lift_pseudo(&dec);
- format_inst(buf, buflen, 24, &dec);
+ return format_inst(24, &dec);
}
#define INST_FMT_2 "%04" PRIx64 " "
@@ -5231,7 +5207,6 @@ disasm_inst(char *buf, size_t buflen, rv_isa isa, uint64_t pc, rv_inst inst,
static int
print_insn_riscv(bfd_vma memaddr, struct disassemble_info *info, rv_isa isa)
{
- char buf[128] = { 0 };
bfd_byte packet[2];
rv_inst inst = 0;
size_t len = 2;
@@ -5272,9 +5247,9 @@ print_insn_riscv(bfd_vma memaddr, struct disassemble_info *info, rv_isa isa)
}
}
- disasm_inst(buf, sizeof(buf), isa, memaddr, inst,
- (RISCVCPUConfig *)info->target_info);
- (*info->fprintf_func)(info->stream, "%s", buf);
+ g_autoptr(GString) str =
+ disasm_inst(isa, memaddr, inst, (RISCVCPUConfig *)info->target_info);
+ (*info->fprintf_func)(info->stream, "%s", str->str);
return len;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PULL 00/16] sprintf fixes
2024-06-05 21:15 [PULL 00/16] sprintf fixes Richard Henderson
` (15 preceding siblings ...)
2024-06-05 21:15 ` [PULL 16/16] disas/riscv: Use GString in format_inst Richard Henderson
@ 2024-06-05 23:53 ` Richard Henderson
16 siblings, 0 replies; 18+ messages in thread
From: Richard Henderson @ 2024-06-05 23:53 UTC (permalink / raw)
To: qemu-devel
On 6/5/24 14:15, Richard Henderson wrote:
> The following changes since commit f1572ab94738bd5787b7badcd4bd93a3657f0680:
>
> Merge tag 'for-upstream' ofhttps://gitlab.com/bonzini/qemu into staging (2024-06-05 07:45:23 -0700)
>
> are available in the Git repository at:
>
> https://gitlab.com/rth7680/qemu.git tags/pull-misc-20240605
>
> for you to fetch changes up to b89fb575fd467ed5dfde4608d51c47c2aa427f30:
>
> disas/riscv: Use GString in format_inst (2024-06-05 12:29:54 -0700)
>
> ----------------------------------------------------------------
> util/hexdump: Use a GString for qemu_hexdump_line.
> system/qtest: Replace sprintf by qemu_hexdump_line
> hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf
> hw/ide/atapi: Use qemu_hexdump_line to avoid sprintf
> hw/dma/pl330: Use qemu_hexdump_line to avoid sprintf
> disas/microblaze: Reorg to avoid intermediate sprintf
> disas/riscv: Use GString in format_inst
Applied, thanks. Please update https://wiki.qemu.org/ChangeLog/9.1 as appropriate.
r~
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-06-05 23:53 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` [PULL 03/16] util/hexdump: Inline g_string_append_printf "%02x" Richard Henderson
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
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).