[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 18/27] disas/microblaze: Print immediates directly with PRIimm
From: |
Richard Henderson |
Subject: |
[PATCH v3 18/27] disas/microblaze: Print immediates directly with PRIimm |
Date: |
Fri, 12 Apr 2024 00:33:37 -0700 |
Use a printf format instead of sprintf into a buffer.
Signed-off-by: Richard Henderson <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
- [PATCH v3 13/27] disas/microblaze: Replace sprintf() by snprintf(), (continued)
- [PATCH v3 13/27] disas/microblaze: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12
- [PATCH v3 15/27] target/microblaze: Re-indent print_insn_microblaze, Richard Henderson, 2024/04/12
- [PATCH v3 14/27] disas/microblaze: Split out print_immval_addr, Richard Henderson, 2024/04/12
- [PATCH v3 16/27] disas/microblaze: Merge op->name output into each fprintf, Richard Henderson, 2024/04/12
- [PATCH v3 11/27] backends/tpm: Use qemu_hexdump_line to avoid sprintf, Richard Henderson, 2024/04/12
- [PATCH v3 05/27] util/hexdump: Inline g_string_append_printf "%02x", Richard Henderson, 2024/04/12
- [PATCH v3 17/27] disas/microblaze: Print registers directly with PRIreg, Richard Henderson, 2024/04/12
- [PATCH v3 23/27] hw/misc/imx: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12
- [PATCH v3 18/27] disas/microblaze: Print immediates directly with PRIimm,
Richard Henderson <=
- [PATCH v3 26/27] target/arm: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12
- [PATCH v3 22/27] linux-user/flatload: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12
- [PATCH v3 21/27] disas/riscv: Use GString in format_inst, Richard Henderson, 2024/04/12
- [PATCH v3 25/27] hw/riscv/virt: Replace sprintf by g_strdup_printf, Richard Henderson, 2024/04/12
- [PATCH v3 19/27] disas/microblaze: Print registers directly with PRIrfsl, Richard Henderson, 2024/04/12
- [PATCH v3 20/27] disas/microblaze: Split get_field_special, Richard Henderson, 2024/04/12
- [PATCH v3 24/27] hw/net/rocker: Replace sprintf() by snprintf(), Richard Henderson, 2024/04/12