opcodes: Add non-enum disassembler options

This is paired with "gdb: Add non-enum disassembler options".

There is a portable mechanism for disassembler options and used on some
architectures:

-   ARC
-   Arm
-   MIPS
-   PowerPC
-   RISC-V
-   S/390

However, it only supports following forms:

-   [NAME]
-   [NAME]=[ENUM_VALUE]

Valid values for [ENUM_VALUE] must be predefined in
disasm_option_arg_t.values. For instance, for -M cpu=[CPU] in ARC
architecture, opcodes/arc-dis.c builds valid CPU model list from
include/elf/arc-cpu.def.

In this commit, it adds following format:

-   [NAME]=[ARBITRARY_VALUE] (cannot contain "," though)

This is identified by NULL value of disasm_option_arg_t.values
(normally, this is a non-NULL pointer to a NULL-terminated list).

include/ChangeLog:

	* dis-asm.h (disasm_option_arg_t): Update comment of values
	to allow non-enum disassembler options.

opcodes/ChangeLog:

	* riscv-dis.c (print_riscv_disassembler_options): Support
	non-enum disassembler options on printing disassembler help.
	* arc-dis.c (print_arc_disassembler_options): Likewise.
	* mips-dis.c (print_mips_disassembler_options): Likewise.

diff --git a/include/dis-asm.h b/include/dis-asm.h
index f1a83dc84e59d0373051822900db173fd18bb569..4921c04071022a9f82205b2bd793c408984c472b 100644 (file)
--- a/include/dis-asm.h
+++ b/include/dis-asm.h
@@ -318,7 +318,8 @@ typedef struct
   /* Option argument name to use in descriptions.  */
   const char *name;
 
-  /* Vector of acceptable option argument values, NULL-terminated.  */
+  /* Vector of acceptable option argument values, NULL-terminated.
+     NULL if any values are accepted.  */
   const char **values;
 } disasm_option_arg_t;
 

diff --git a/opcodes/arc-dis.c b/opcodes/arc-dis.c
index 3490bad4f66692ef32df5de478d6439df2cd6383..c8dc525f64d783194fca7245e6fbefe06d0fb63e 100644 (file)
--- a/opcodes/arc-dis.c
+++ b/opcodes/arc-dis.c
@@ -1611,6 +1611,8 @@ print_arc_disassembler_options (FILE *stream)
   for (i = 0; args[i].name != NULL; ++i)
     {
       size_t len = 3;
+      if (args[i].values == NULL)
+       continue;
       fprintf (stream, _("\n\
   For the options above, the following values are supported for \"%s\":\n   "),
               args[i].name);

diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index 9db604ffb39f5d2d8d65bfef68334c74f4ee8b8c..faeebccfc3bc06250704af2f0f5fb6fcf0645ff0 100644 (file)
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -2809,6 +2809,8 @@ with the -M switch (multiple options should be separated by commas):\n\n"));
 
   for (i = 0; args[i].name != NULL; i++)
     {
+      if (args[i].values == NULL)
+       continue;
       fprintf (stream, _("\n\
   For the options above, the following values are supported for \"%s\":\n   "),
               args[i].name);

diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c
index 160cc40f865d35329c98eb18b8a68c9566f10df4..7ae6e7092900065b3b193b1f691b3acaf9e550df 100644 (file)
--- a/opcodes/riscv-dis.c
+++ b/opcodes/riscv-dis.c
@@ -1195,6 +1195,8 @@ with the -M switch (multiple options should be separated by commas):\n"));
 
   for (i = 0; args[i].name != NULL; i++)
     {
+      if (args[i].values == NULL)
+       continue;
       fprintf (stream, _("\n\
   For the options above, the following values are supported for \"%s\":\n   "),
               args[i].name);