From 9326300e4d3dbe943380b30766ed474d98df07ba Mon Sep 17 00:00:00 2001 From: Joseph Faulls Date: Wed, 27 Sep 2023 12:42:55 +0000 Subject: [PATCH] RISC-V: Add support for numbered ISA mapping strings The elf psabi allows for mapping symbols to be of the form $x. opcodes/ * riscv-dis.c (riscv_get_map_state): allow mapping symbol to be suffixed by a unique identifier . --- opcodes/riscv-dis.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index c0fd0625a2d..216916e9426 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -869,7 +869,21 @@ riscv_get_map_state (int n, { *state = MAP_INSN; riscv_release_subset_list (&riscv_subsets); - riscv_parse_subset (&riscv_rps_dis, name + 2); + + /* ISA mapping string may be numbered, suffixed with '.n'. Do not + consider this as part of the ISA string. */ + char *suffix = strchr (name, '.'); + if (suffix) + { + int suffix_index = (int)(suffix - name); + char *name_substr = xmalloc (suffix_index + 1); + strncpy (name_substr, name, suffix_index); + name_substr[suffix_index] = '\0'; + riscv_parse_subset (&riscv_rps_dis, name_substr + 2); + free (name_substr); + } + else + riscv_parse_subset (&riscv_rps_dis, name + 2); } else return false; -- 2.30.2