Re: [PATCH 1/2] Add support for setting disassembler-options in GDB for POWER, ARM and S390

[Peter Bergner <bergner@vnet.ibm.com>]

On 1/23/17 9:36 PM, Alan Modra wrote:
> On Mon, Jan 23, 2017 at 08:39:25PM -0600, Peter Bergner wrote:
>> On 1/23/17 7:56 PM, Alan Modra wrote:
>>> On Mon, Jan 23, 2017 at 05:34:36PM -0600, Peter Bergner wrote:
>>>> The following S/390 specific disassembler options are supported for use\n\
>>>> with the -M switch (multiple options should be separated by commas):\n"));
>>>>
>>>> -  fprintf (stream, _("  esa         Disassemble in ESA architecture mode\n"));
>>>> -  fprintf (stream, _("  zarch       Disassemble in z/Architecture mode\n"));
>>>> -  fprintf (stream, _("  insnlength  Print unknown instructions according "
>>>> -		     "to length from first two bits\n"));
>>>> +  for (i = 0; sizeof (options) / sizeof (options[0]); i++)
>>>> +    {
>>>> +      unsigned int len = strlen (options[i].name);
>>>> +      if (max_len < len)
>>>> +	max_len = len;
>>>> +    }
>>>> +
>>>> +  for (i = 0, max_len++; sizeof (options) / sizeof (options[0]); i++)
>>>> +    fprintf (stream, "  %s%*c %s",
>>>> +	     options[i].name,
>>>> +	     (int)(max_len - strlen (options[i].name)), ' ',
>>>> +	     options[i].description);
>>>> }
>>>
>>> This appears to have lost translation of the help strings.
[snip]
> Yes, I meant the support for language translation.

Ok, I see now.  How about the following changes to to add _(...)
around the option descriptions for s390 and arm (ppc doesn't have any)?

Peter


diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 2987403..b5fd1e0 100644
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
 get_arm_regnames (int option,
 		  const char **setname,
 		  const char **setdescription,
 		  const char *const **register_names)
 {
   *setname = regnames[option].name;
-  *setdescription = regnames[option].description;
+  *setdescription = _(regnames[option].description);
   *register_names = regnames[option].reg_names;
   return 16;
 }


@@ -6126,7 +6120,7 @@ arm_symbol_is_valid (asymbol * sym,
+const char **
+disassembler_options_desc_arm (void)
+{
+  static const char **desc = NULL;
+
+  if (desc == NULL)
+    {
+      size_t i;
+      size_t num_desc = NUM_ARM_REGNAMES + 2;
+      desc = XNEWVEC (const char *, num_desc + 1);
+      for (i = 0; i < NUM_ARM_REGNAMES; i++)
+	desc[i] = _(regnames[i].description);
+      desc[i++] = _("Assume all insns are Thumb insns");
+      desc[i++] = _("Examine preceding label to determine an insn's type");
+      desc[i] = NULL;
+    }
+
+  return desc;
+}
+



@@ -6855,7 +6889,7 @@ the -M switch:\n"));
     fprintf (stream, "  reg-names-%s %*c%s\n",
	     regnames[i].name,
	     (int)(14 - strlen (regnames[i].name)), ' ',
-	     regnames[i].description);
+	     _(regnames[i].description));

   fprintf (stream, "  force-thumb              Assume all insns are Thumb insns\n");
   fprintf (stream, "  no-force-thumb           Examine preceding label to determine an insn's type\n\n");


diff --git a/opcodes/s390-dis.c b/opcodes/s390-dis.c
index 328ba2d..cbae7be 100644
--- a/opcodes/s390-dis.c
+++ b/opcodes/s390-dis.c
@@ -360,15 +369,58 @@ print_insn_s390 (bfd_vma memaddr, struct disassemble_info *info)
+const char **
+disassembler_options_desc_s390 (void)
+{
+  static const char **desc = NULL;
+
+  if (desc == NULL)
+    {
+      size_t i, num_options = sizeof (options) / sizeof (options[0]);
+      desc = XNEWVEC (const char *, num_options + 1);
+      for (i = 0; i < num_options; i++)
+	desc[i] = _(options[i].description);
+      desc[i] = NULL;
+    }
+
+  return desc;
+}


+  for (i = 0, max_len++; sizeof (options) / sizeof (options[0]); i++)
+    fprintf (stream, "  %s%*c %s",
+	     options[i].name,
+	     (int)(max_len - strlen (options[i].name)), ' ',
+	     _(options[i].description));
 }