This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [PATCH 1/2] Add support for setting disassembler-options in GDB for POWER, ARM and S390
- From: Peter Bergner <bergner at vnet dot ibm dot com>
- To: Alan Modra <amodra at gmail dot com>
- Cc: Pedro Alves <palves at redhat dot com>, Eli Zaretskii <eliz at gnu dot org>, nickc at redhat dot com, gdb-patches at sourceware dot org, uweigand at de dot ibm dot com, binutils at sourceware dot org
- Date: Mon, 23 Jan 2017 22:32:45 -0600
- Subject: Re: [PATCH 1/2] Add support for setting disassembler-options in GDB for POWER, ARM and S390
- Authentication-results: sourceware.org; auth=none
- References: <b6037acd-9036-7e69-3350-8da5f0ec981b@vnet.ibm.com> <bdc0c318-4abd-010e-28cf-b654222fe86a@redhat.com> <decc5b05-46eb-2187-5cbd-a7a2a32aaa56@vnet.ibm.com> <83eg28dcjk.fsf@gnu.org> <019eaf5d-9ace-539e-8501-feb3cb0eed6c@vnet.ibm.com> <a1d6f084-4ae2-66a1-3a1b-1a3072b87a0b@redhat.com> <ddaefb9f-9c11-655d-679c-a242bea2c10d@vnet.ibm.com> <20170124015651.GH28669@bubble.grove.modra.org> <b17de542-fbf7-977a-bcc3-e6fd722c9236@vnet.ibm.com> <20170124033625.GI28669@bubble.grove.modra.org>
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));
}