summaryrefslogtreecommitdiff
path: root/opcodes/arc-dis.c
diff options
context:
space:
mode:
authorAnton Kolesov <Anton.Kolesov@synopsys.com>2017-06-15 15:58:32 +0300
committerAnton Kolesov <Anton.Kolesov@synopsys.com>2017-06-29 14:49:39 +0300
commite1e94c4994151ebe0e3a103fd0d27f60bd806bbe (patch)
tree59c0f13136fbf882c5be12ad11a828bdbba3087f /opcodes/arc-dis.c
parentadc764e7d217d3e56af988ce20cedc98d8c4cc73 (diff)
[ARC] Fix handling of cpu=... disassembler option value
There is a bug in handling of cpu=... disassembler option in case there are other options after it, for example, `cpu=EM,dsp'. In this case `EM,dsp' is treated as an option value, and strcasecmp reports is as non-equal to "EM". This is fixed by using disassembler_options_cmp function, which compares string treating `,' the same way as `\0'. This function also solves a problem with option order in parse_option. Previously, if several option had same prefix (e.g. fpud, fpuda), then the longer one should have been compared first, otherwise when longer option is passed it would be treated as a short one, because CONST_STRNEQ ("fpud", "fpuda") would be true. The order of options was correct for ARC, so there were no bugs per se, but with disassembler_option_cmp there is no risk of such a bug being introduced in the future. opcodes/ChangeLog: yyyy-mm-dd Anton Kolesov <Anton.Kolesov@synopsys.com> * arc-dis.c (parse_option): Use disassembler_options_cmp to compare disassembler option strings. (parse_cpu_option): Likewise. binutils/ChangeLog yyyy-mm-dd Anton Kolesov <Anton.Kolesov@synopsys.com> * testsuite/binutils-all/arc/double_store.s: New file. * testsuite/binutils-all/arc/objdump.exp: Tests for disassembler options. (do_objfile): New function. (check_assembly): Likewise.
Diffstat (limited to 'opcodes/arc-dis.c')
-rw-r--r--opcodes/arc-dis.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/opcodes/arc-dis.c b/opcodes/arc-dis.c
index edd0c0735a..b46424a7c5 100644
--- a/opcodes/arc-dis.c
+++ b/opcodes/arc-dis.c
@@ -740,16 +740,16 @@ operand_iterator_next (struct arc_operand_iterator *iter,
static void
parse_option (const char *option)
{
- if (CONST_STRNEQ (option, "dsp"))
+ if (disassembler_options_cmp (option, "dsp") == 0)
add_to_decodelist (DSP, NONE);
- else if (CONST_STRNEQ (option, "spfp"))
+ else if (disassembler_options_cmp (option, "spfp") == 0)
add_to_decodelist (FLOAT, SPX);
- else if (CONST_STRNEQ (option, "dpfp"))
+ else if (disassembler_options_cmp (option, "dpfp") == 0)
add_to_decodelist (FLOAT, DPX);
- else if (CONST_STRNEQ (option, "quarkse_em"))
+ else if (disassembler_options_cmp (option, "quarkse_em") == 0)
{
add_to_decodelist (FLOAT, DPX);
add_to_decodelist (FLOAT, SPX);
@@ -757,16 +757,16 @@ parse_option (const char *option)
add_to_decodelist (FLOAT, QUARKSE2);
}
- else if (CONST_STRNEQ (option, "fpuda"))
+ else if (disassembler_options_cmp (option, "fpuda") == 0)
add_to_decodelist (FLOAT, DPA);
- else if (CONST_STRNEQ (option, "fpus"))
+ else if (disassembler_options_cmp (option, "fpus") == 0)
{
add_to_decodelist (FLOAT, SP);
add_to_decodelist (FLOAT, CVT);
}
- else if (CONST_STRNEQ (option, "fpud"))
+ else if (disassembler_options_cmp (option, "fpud") == 0)
{
add_to_decodelist (FLOAT, DP);
add_to_decodelist (FLOAT, CVT);
@@ -808,7 +808,7 @@ parse_cpu_option (const char *option)
for (i = 0; cpu_types[i].name; ++i)
{
- if (!strcasecmp (cpu_types[i].name, option))
+ if (!disassembler_options_cmp (cpu_types[i].name, option))
{
return cpu_types[i].flags;
}