diff options
| author | Alan Modra <amodra@gmail.com> | 2023-08-22 07:31:03 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-08-22 09:35:55 +0930 |
| commit | 5bf26ab7cb82c2e6308b269af44b989a51ee7903 (patch) | |
| tree | 04c8ace52d334b14faebc2a822971d2644215f75 /opcodes | |
| parent | fddbba54a4b8224c848010048102ddcdbae1ec78 (diff) | |
| download | gdb-5bf26ab7cb82c2e6308b269af44b989a51ee7903.zip gdb-5bf26ab7cb82c2e6308b269af44b989a51ee7903.tar.gz gdb-5bf26ab7cb82c2e6308b269af44b989a51ee7903.tar.bz2 | |
kvx_dis_init
kvx_dis_init currently always returns true, but error conditions do so
by "return -1" which converts to true. The return status is ignored
anyway, and it doesn't make much sense to error on unexpected arch or
mach: If print_insn_kvx is called then the atch is known to be kvx,
and it's better to choose some default for a user passing an unknown
mach value rather than segfaulting in decode_insn when env.opc_table
is NULL.
I've chosen the default mach to be bfd_mach_kv3_1, the default in
bfd/cpu-kvx.c, not that it matters very much. In normal objdump/gdb
usage, info->mach won't be an unexpected value.
* kvx-dis.c (kvx_dis_init): Return void. Don't error on
unexpected arch or mach. Default to bfd_mach_kv3_1 for
unknown mach. Don't clear info->disassembler_options.
Diffstat (limited to 'opcodes')
| -rw-r--r-- | opcodes/kvx-dis.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/opcodes/kvx-dis.c b/opcodes/kvx-dis.c index eabef4a..d7b8679 100644 --- a/opcodes/kvx-dis.c +++ b/opcodes/kvx-dis.c @@ -207,15 +207,9 @@ static struct kvx_dis_env env = { .kvx_max_dec_registers = 0 }; -static bool +static void kvx_dis_init (struct disassemble_info *info) { - if (info->arch != bfd_arch_kvx) - { - (*info->fprintf_func) (info->stream, "error: Unknown architecture\n"); - return -1; - } - env.kvx_arch_size = 32; switch (info->mach) { @@ -224,6 +218,7 @@ kvx_dis_init (struct disassemble_info *info) /* fallthrough */ case bfd_mach_kv3_1_usr: case bfd_mach_kv3_1: + default: env.opc_table = kvx_kv3_v1_optab; env.kvx_regfiles = kvx_kv3_v1_regfiles; env.kvx_registers = kvx_kv3_v1_registers; @@ -252,26 +247,14 @@ kvx_dis_init (struct disassemble_info *info) env.kvx_modifiers = kvx_kv4_v1_modifiers; env.kvx_dec_registers = kvx_kv4_v1_dec_registers; break; - - default: - /* Core not supported. */ - (*info->fprintf_func) (info->stream, "disassembling not supported for " - "this KVX core! (core:%d)", (int) info->mach); - return -1; } env.kvx_max_dec_registers = env.kvx_regfiles[KVX_REGFILE_DEC_REGISTERS]; if (info->disassembler_options) - { - parse_kvx_dis_options (info->disassembler_options); + parse_kvx_dis_options (info->disassembler_options); - /* To avoid repeated parsing of these options, we remove them here. */ - info->disassembler_options = NULL; - } env.initialized_p = 1; - - return env.initialized_p; } static int |