From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v3 17/27] disas/microblaze: Print registers directly with PRIreg
Date: Fri, 12 Apr 2024 00:33:36 -0700 [thread overview]
Message-ID: <20240412073346.458116-18-richard.henderson@linaro.org> (raw)
In-Reply-To: <20240412073346.458116-1-richard.henderson@linaro.org>
Use a printf format instead of sprintf into a buffer.
Signed-off-by: Richard Henderson <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
next prev parent reply other threads:[~2024-04-12 7:35 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-12 7:33 [PATCH v3 00/27] misc: Replace sprintf Richard Henderson
2024-04-12 7:33 ` [PATCH v3 01/27] util/hexdump: Remove b parameter from qemu_hexdump_line Richard Henderson
2024-04-12 10:00 ` Philippe Mathieu-Daudé
2024-06-03 19:40 ` Philippe Mathieu-Daudé
2024-04-12 7:33 ` [PATCH v3 02/27] util/hexdump: Remove ascii " Richard Henderson
2024-04-12 10:03 ` Philippe Mathieu-Daudé
2024-06-03 17:42 ` Philippe Mathieu-Daudé
2024-04-12 7:33 ` [PATCH v3 03/27] util/hexdump: Use a GString for qemu_hexdump_line Richard Henderson
2024-04-12 17:41 ` Philippe Mathieu-Daudé
2024-04-12 18:59 ` Richard Henderson
2024-04-13 9:45 ` Philippe Mathieu-Daudé
2024-04-13 12:02 ` Stefan Hajnoczi
2024-04-12 7:33 ` [PATCH v3 04/27] util/hexdump: Add unit_len and block_len to qemu_hexdump_line Richard Henderson
2024-04-12 17:42 ` Philippe Mathieu-Daudé
2024-04-12 7:33 ` [PATCH v3 05/27] util/hexdump: Inline g_string_append_printf "%02x" Richard Henderson
2024-04-12 17:43 ` Philippe Mathieu-Daudé
2024-04-12 7:33 ` [PATCH v3 06/27] hw/mips/malta: Add re-usable rng_seed_hex_new() method Richard Henderson
2024-06-03 18:56 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 07/27] system/qtest: Replace sprintf by qemu_hexdump_line Richard Henderson
2024-04-12 17:45 ` Philippe Mathieu-Daudé
2024-04-12 7:33 ` [PATCH v3 08/27] hw/scsi/scsi-disk: Use qemu_hexdump_line to avoid sprintf Richard Henderson
2024-04-12 17:45 ` Philippe Mathieu-Daudé
2024-04-12 7:33 ` [PATCH v3 09/27] hw/ide/atapi: " Richard Henderson
2024-06-03 18:57 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 10/27] hw/dma/pl330: " Richard Henderson
2024-06-03 18:59 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 11/27] backends/tpm: " Richard Henderson
2024-04-12 17:47 ` Philippe Mathieu-Daudé
2024-04-12 7:33 ` [PATCH v3 12/27] disas/m68k: Replace sprintf() by snprintf() Richard Henderson
2024-04-12 7:33 ` [PATCH v3 13/27] disas/microblaze: " Richard Henderson
2024-04-12 7:33 ` [PATCH v3 14/27] disas/microblaze: Split out print_immval_addr Richard Henderson
2024-06-03 19:14 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 15/27] target/microblaze: Re-indent print_insn_microblaze Richard Henderson
2024-06-03 19:14 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 16/27] disas/microblaze: Merge op->name output into each fprintf Richard Henderson
2024-06-03 19:15 ` Pierrick Bouvier
2024-04-12 7:33 ` Richard Henderson [this message]
2024-06-03 19:17 ` [PATCH v3 17/27] disas/microblaze: Print registers directly with PRIreg Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 18/27] disas/microblaze: Print immediates directly with PRIimm Richard Henderson
2024-06-03 19:17 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 19/27] disas/microblaze: Print registers directly with PRIrfsl Richard Henderson
2024-06-03 19:17 ` Pierrick Bouvier
2024-06-03 19:18 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 20/27] disas/microblaze: Split get_field_special Richard Henderson
2024-06-03 19:20 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 21/27] disas/riscv: Use GString in format_inst Richard Henderson
2024-06-03 19:24 ` Pierrick Bouvier
2024-06-04 0:15 ` Alistair Francis
2024-04-12 7:33 ` [PATCH v3 22/27] linux-user/flatload: Replace sprintf() by snprintf() Richard Henderson
2024-04-12 9:48 ` Peter Maydell
2024-06-03 19:02 ` Pierrick Bouvier
2024-04-12 7:33 ` [PATCH v3 23/27] hw/misc/imx: " Richard Henderson
2024-04-12 7:33 ` [PATCH v3 24/27] hw/net/rocker: " Richard Henderson
2024-04-12 10:58 ` Philippe Mathieu-Daudé
2024-04-12 14:51 ` Richard Henderson
2024-04-12 7:33 ` [PATCH v3 25/27] hw/riscv/virt: Replace sprintf by g_strdup_printf Richard Henderson
2024-06-03 19:06 ` Pierrick Bouvier
2024-06-04 0:16 ` Alistair Francis
2024-04-12 7:33 ` [PATCH v3 26/27] target/arm: Replace sprintf() by snprintf() Richard Henderson
2024-04-12 7:33 ` [PATCH v3 27/27] target/i386/kvm: Improve KVM_EXIT_NOTIFY warnings Richard Henderson
2024-04-12 10:59 ` Philippe Mathieu-Daudé
2024-04-16 15:32 ` Peter Maydell
2024-04-16 15:32 ` Zhao Liu
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=20240412073346.458116-18-richard.henderson@linaro.org \
--to=richard.henderson@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).