From patchwork Wed Oct 11 11:55:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Kolesov X-Patchwork-Id: 23476 Received: (qmail 111385 invoked by alias); 11 Oct 2017 11:55:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 109094 invoked by uid 89); 11 Oct 2017 11:55:17 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: smtprelay.synopsys.com Received: from us01smtprelay-2.synopsys.com (HELO smtprelay.synopsys.com) (198.182.60.111) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 11 Oct 2017 11:55:14 +0000 Received: from mailhost.synopsys.com (mailhost2.synopsys.com [10.13.184.66]) by smtprelay.synopsys.com (Postfix) with ESMTP id 444AA10C12E6; Wed, 11 Oct 2017 04:55:13 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 048B7E5D; Wed, 11 Oct 2017 04:55:12 -0700 (PDT) Received: from akolesov-lab.internal.synopsys.com (akolesov-lab.internal.synopsys.com [10.121.14.106]) by mailhost.synopsys.com (Postfix) with ESMTP id 576D9E28; Wed, 11 Oct 2017 04:55:11 -0700 (PDT) From: Anton Kolesov To: gdb-patches@sourceware.org Cc: Anton Kolesov , Francois Bedard , Pedro Alves Subject: [PATCH v2] arc: Pass proper CPU value to the disassembler Date: Wed, 11 Oct 2017 14:55:00 +0300 Message-Id: <20171011115500.23177-1-Anton.Kolesov@synopsys.com> In-Reply-To: <679b988a-e853-82eb-b777-5cbcd6890176@redhat.com> References: <679b988a-e853-82eb-b777-5cbcd6890176@redhat.com> Changes in v2: * Add missing articles in the comments; * Use startswith () instead of CONST_STRNEQ (); * Stricter pattern matching in test case. --- There was a problem with generation of the disassembler options for ARC in GDB, because a BFD architecture name was used as a CPU name, but they have different meaning even if some architectures have same name as respective CPUs. Target description specifies a BFD architecture, which is different from ARC CPU, as accepted by the disassembler (and most other ARC tools), because CPU values are much more fine grained - there can be multiple CPU values per single BFD architecture. As a result this code should translate architecture to some CPU value. Since there is no info on exact CPU configuration, it is best to use the most feature-rich CPU, so that the disassembler will recognize all instructions available to the specified architecture. gdb/ChangeLog yyyy-mm-dd Anton Kolesov * arc-tdep.c (arc_gdbarch_init): Pass proper cpu value to disassembler. * arc-tdep.h (arc_arch_is_em): New function. (arc_arch_is_hs): Likewise. gdb/testsuite/ChangeLog yyyy-mm-dd Anton Kolesov * arc-tdesc-cpu.exp: New file. * arc-tdesc-cpu.xml: Likewise. --- gdb/arc-tdep.c | 34 ++++++++++++++++++-- gdb/arc-tdep.h | 15 +++++++++ gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp | 48 +++++++++++++++++++++++++++++ gdb/testsuite/gdb.arch/arc-tdesc-cpu.xml | 53 ++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp create mode 100644 gdb/testsuite/gdb.arch/arc-tdesc-cpu.xml diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index 1d05c5a..d238ab7 100644 --- a/gdb/arc-tdep.c +++ b/gdb/arc-tdep.c @@ -2085,8 +2085,38 @@ arc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) existing gdbarches, which also can be problematic, if arc_gdbarch_init will start reusing existing gdbarch instances. */ - arc_disassembler_options = xstrprintf ("cpu=%s", - tdesc_arch->printable_name); + /* Target description specifies a BFD architecture, which is + different from ARC cpu, as accepted by disassembler (and most + other ARC tools), because cpu values are much more fine grained - + there can be multiple cpu values per single BFD architecture. As + a result this code should translate architecture to some cpu + value. Since there is no info on exact cpu configuration, it is + best to use the most feature-rich CPU, so that disassembler will + recognize all instructions available to the specified + architecture. */ + switch (tdesc_arch->mach) + { + case bfd_mach_arc_arc601: + arc_disassembler_options = xstrdup ("cpu=arc601"); + break; + case bfd_mach_arc_arc600: + arc_disassembler_options = xstrdup ("cpu=arc600"); + break; + case bfd_mach_arc_arc700: + arc_disassembler_options = xstrdup ("cpu=arc700"); + break; + case bfd_mach_arc_arcv2: + /* Machine arcv2 has three arches: ARCv2, EM and HS; where ARCv2 + is treated as EM. */ + if (arc_arch_is_hs (tdesc_arch)) + arc_disassembler_options = xstrdup ("cpu=hs38_linux"); + else + arc_disassembler_options = xstrdup ("cpu=em4_fpuda"); + break; + default: + arc_disassembler_options = NULL; + break; + } set_gdbarch_disassembler_options (gdbarch, &arc_disassembler_options); } diff --git a/gdb/arc-tdep.h b/gdb/arc-tdep.h index 1bf1817..580ccb7 100644 --- a/gdb/arc-tdep.h +++ b/gdb/arc-tdep.h @@ -123,6 +123,21 @@ arc_mach_is_arcv2 (struct gdbarch *gdbarch) return gdbarch_bfd_arch_info (gdbarch)->mach == bfd_mach_arc_arcv2; } +/* ARC EM and ARC HS are unique BFD arches, however they share the same machine + number as "ARCv2". */ + +static inline bool +arc_arch_is_hs (const struct bfd_arch_info* arch) +{ + return startswith (arch->printable_name, "HS"); +} + +static inline bool +arc_arch_is_em (const struct bfd_arch_info* arch) +{ + return startswith (arch->printable_name, "EM"); +} + /* Function to access ARC disassembler. Underlying opcodes disassembler will print an instruction into stream specified in the INFO, so if it is undesired, then this stream should be set to some invisible stream, but it diff --git a/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp new file mode 100644 index 0000000..f1c009d --- /dev/null +++ b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp @@ -0,0 +1,48 @@ +# Copyright 2017 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if {[gdb_skip_xml_test]} { + unsupported "arc-tdesc-cpu.exp" + return -1 +} + +gdb_start + +# Test whether it is OK to have `arc:HS` in the target description +# architecture. `HS` is a valid BFD architecture name, however the +# disassembler doesn't accept it as a CPU name. This test checks that GDB +# doesn't pass architecture from the target description directly to the +# disassembler and instead uses one of the valid CPU names. + +set filename $srcdir/$subdir/arc-tdesc-cpu.xml + +set cmd "set tdesc filename $filename" +gdb_test $cmd + +# An error message is emitted by the disassembler, therefore it is not shown +# unless the disassembler is actually invoked. Address "0" is not invalid, +# but that doesn't matter for this test case, because it is only the +# disassembler error message that is interesting. +set cmd "x /i 0" +set msg "setting HS architecture" +gdb_test_multiple $cmd $msg { + -re "Unrecognised disassembler CPU option: HS.*$gdb_prompt" { + fail $msg + } + -re "^$cmd\r\n\\s*$hex:\\s+Cannot access memory at address $hex\r\n$gdb_prompt" + { + pass $msg + } +} diff --git a/gdb/testsuite/gdb.arch/arc-tdesc-cpu.xml b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.xml new file mode 100644 index 0000000..fe158ae --- /dev/null +++ b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.xml @@ -0,0 +1,53 @@ + + + + + + arc:HS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +