From patchwork Fri Jun 20 10:21:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Terry Guo X-Patchwork-Id: 1587 Received: (qmail 8657 invoked by alias); 20 Jun 2014 10:21:59 -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 8646 invoked by uid 89); 20 Jun 2014 10:21:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: service87.mimecast.com Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 20 Jun 2014 10:21:54 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Fri, 20 Jun 2014 11:21:51 +0100 Received: from shawin252 ([10.164.2.65]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 20 Jun 2014 11:21:41 +0100 From: "Terry Guo" To: "'Pedro Alves'" Cc: , , "'Will Newton'" References: <000b01cf8540$dafa6d80$90ef4880$@arm.com> <001701cf8555$40925540$c1b6ffc0$@arm.com> <53983C82.4040208@codesourcery.com> <001801cf85ef$f9decd40$ed9c67c0$@arm.com> <000001cf8908$49f991f0$ddecb5d0$@arm.com> <001501cf8c34$7336e840$59a4b8c0$@arm.com> <53A40465.70508@redhat.com> In-Reply-To: <53A40465.70508@redhat.com> Subject: RE: [Patch]Clean up the XML files for ARM Date: Fri, 20 Jun 2014 18:21:40 +0800 Message-ID: <001c01cf8c71$6e7295b0$4b57c110$@arm.com> MIME-Version: 1.0 X-MC-Unique: 114062011215107601 X-IsSubscribed: yes > -----Original Message----- > From: Pedro Alves [mailto:palves@redhat.com] > Sent: Friday, June 20, 2014 5:53 PM > To: Terry Guo; 'Will Newton' > Cc: lgustavo@codesourcery.com; gdb-patches@sourceware.org > Subject: Re: [Patch]Clean up the XML files for ARM > > On 06/20/2014 04:05 AM, Terry Guo wrote: > > > > Sorry that I am still new to gdb community. Does this mean the approval of > this patch? If not, do you know who should I ask to approve this patch? > Thanks. > > Could you send a git diff -M version, please? > > -- > Pedro Alves > Thank you Pedro. The -M option is so sweet. Attached is the updated version. Please review again. BR, Terry diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 74942b1..6e1bcaa 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -59,13 +59,13 @@ #include "record.h" #include "record-full.h" -#include "features/arm-with-m.c" -#include "features/arm-with-m-fpa-layout.c" -#include "features/arm-with-m-vfp-d16.c" -#include "features/arm-with-iwmmxt.c" -#include "features/arm-with-vfpv2.c" -#include "features/arm-with-vfpv3.c" -#include "features/arm-with-neon.c" +#include "features/arm/with-m.c" +#include "features/arm/with-m-fpa-layout.c" +#include "features/arm/with-m-vfp-d16.c" +#include "features/arm/with-iwmmxt.c" +#include "features/arm/with-vfpv2.c" +#include "features/arm/with-vfpv3.c" +#include "features/arm/with-neon.c" static int arm_debug; diff --git a/gdb/features/Makefile b/gdb/features/Makefile index dbf4963..93ddbe2 100644 --- a/gdb/features/Makefile +++ b/gdb/features/Makefile @@ -31,8 +31,8 @@ # make GDB=/path/to/gdb XMLTOC="xml files" cfiles WHICH = aarch64 \ - arm-with-iwmmxt arm-with-vfpv2 arm-with-vfpv3 arm-with-neon \ - arm-with-m arm-with-m-fpa-layout arm-with-m-vfp-d16 \ + arm/with-iwmmxt arm/with-vfpv2 arm/with-vfpv3 arm/with-neon \ + arm/with-m arm/with-m-fpa-layout arm/with-m-vfp-d16 \ i386/i386 i386/i386-linux \ i386/i386-mmx i386/i386-mmx-linux \ i386/amd64 i386/amd64-linux \ @@ -61,7 +61,7 @@ WHICH = aarch64 \ # Record which registers should be sent to GDB by default after stop. aarch64-expedite = x29,sp,pc -arm-expedite = r11,sp,pc +arm/arm-expedite = r11,sp,pc i386/i386-expedite = ebp,esp,eip i386/i386-linux-expedite = ebp,esp,eip i386/amd64-expedite = rbp,rsp,rip @@ -141,7 +141,7 @@ cfiles: $(CFILES) sh ../../move-if-change $@.tmp $@ # Other dependencies. -$(outdir)/arm-with-iwmmxt.dat: arm-core.xml xscale-iwmmxt.xml +$(outdir)/arm/with-iwmmxt.dat: arm/core.xml arm/xscale-iwmmxt.xml $(outdir)/i386/i386.dat: i386/32bit-core.xml i386/32bit-sse.xml $(outdir)/i386/i386-linux.dat: i386/32bit-core.xml i386/32bit-sse.xml \ i386/32bit-linux.xml diff --git a/gdb/features/arm-core.xml b/gdb/features/arm/core.xml similarity index 100% rename from gdb/features/arm-core.xml rename to gdb/features/arm/core.xml diff --git a/gdb/features/arm-fpa.xml b/gdb/features/arm/fpa.xml similarity index 100% rename from gdb/features/arm-fpa.xml rename to gdb/features/arm/fpa.xml diff --git a/gdb/features/arm-m-profile.xml b/gdb/features/arm/m-profile.xml similarity index 100% rename from gdb/features/arm-m-profile.xml rename to gdb/features/arm/m-profile.xml diff --git a/gdb/features/arm-vfpv2.xml b/gdb/features/arm/vfpv2.xml similarity index 100% rename from gdb/features/arm-vfpv2.xml rename to gdb/features/arm/vfpv2.xml diff --git a/gdb/features/arm-vfpv3.xml b/gdb/features/arm/vfpv3.xml similarity index 100% rename from gdb/features/arm-vfpv3.xml rename to gdb/features/arm/vfpv3.xml diff --git a/gdb/features/arm-with-iwmmxt.c b/gdb/features/arm/with-iwmmxt.c similarity index 100% rename from gdb/features/arm-with-iwmmxt.c rename to gdb/features/arm/with-iwmmxt.c diff --git a/gdb/features/arm-with-iwmmxt.xml b/gdb/features/arm/with-iwmmxt.xml similarity index 92% rename from gdb/features/arm-with-iwmmxt.xml rename to gdb/features/arm/with-iwmmxt.xml index 5adadee..6b2939d 100644 --- a/gdb/features/arm-with-iwmmxt.xml +++ b/gdb/features/arm/with-iwmmxt.xml @@ -8,6 +8,6 @@ iwmmxt - + diff --git a/gdb/features/arm-with-m-fpa-layout.c b/gdb/features/arm/with-m-fpa-layout.c similarity index 100% rename from gdb/features/arm-with-m-fpa-layout.c rename to gdb/features/arm/with-m-fpa-layout.c diff --git a/gdb/features/arm-with-m-fpa-layout.xml b/gdb/features/arm/with-m-fpa-layout.xml similarity index 100% rename from gdb/features/arm-with-m-fpa-layout.xml rename to gdb/features/arm/with-m-fpa-layout.xml diff --git a/gdb/features/arm-with-m-vfp-d16.c b/gdb/features/arm/with-m-vfp-d16.c similarity index 100% rename from gdb/features/arm-with-m-vfp-d16.c rename to gdb/features/arm/with-m-vfp-d16.c diff --git a/gdb/features/arm-with-m-vfp-d16.xml b/gdb/features/arm/with-m-vfp-d16.xml similarity index 83% rename from gdb/features/arm-with-m-vfp-d16.xml rename to gdb/features/arm/with-m-vfp-d16.xml index a6527ab..7fb6fb9 100644 --- a/gdb/features/arm-with-m-vfp-d16.xml +++ b/gdb/features/arm/with-m-vfp-d16.xml @@ -7,7 +7,7 @@ - + - + diff --git a/gdb/features/arm-with-m.c b/gdb/features/arm/with-m.c similarity index 100% rename from gdb/features/arm-with-m.c rename to gdb/features/arm/with-m.c diff --git a/gdb/features/arm-with-m.xml b/gdb/features/arm/with-m.xml similarity index 89% rename from gdb/features/arm-with-m.xml rename to gdb/features/arm/with-m.xml index 6b82405..b1a4316 100644 --- a/gdb/features/arm-with-m.xml +++ b/gdb/features/arm/with-m.xml @@ -7,5 +7,5 @@ - + diff --git a/gdb/features/arm-with-neon.c b/gdb/features/arm/with-neon.c similarity index 100% rename from gdb/features/arm-with-neon.c rename to gdb/features/arm/with-neon.c diff --git a/gdb/features/arm-with-neon.xml b/gdb/features/arm/with-neon.xml similarity index 83% rename from gdb/features/arm-with-neon.xml rename to gdb/features/arm/with-neon.xml index 53d1618..096bb5a 100644 --- a/gdb/features/arm-with-neon.xml +++ b/gdb/features/arm/with-neon.xml @@ -7,7 +7,7 @@ - - + + diff --git a/gdb/features/arm-with-vfpv2.c b/gdb/features/arm/with-vfpv2.c similarity index 100% rename from gdb/features/arm-with-vfpv2.c rename to gdb/features/arm/with-vfpv2.c diff --git a/gdb/features/arm-with-vfpv3.xml b/gdb/features/arm/with-vfpv2.xml similarity index 82% rename from gdb/features/arm-with-vfpv3.xml rename to gdb/features/arm/with-vfpv2.xml index aa39548..136c694 100644 --- a/gdb/features/arm-with-vfpv3.xml +++ b/gdb/features/arm/with-vfpv2.xml @@ -7,6 +7,6 @@ - - + + diff --git a/gdb/features/arm-with-vfpv3.c b/gdb/features/arm/with-vfpv3.c similarity index 100% rename from gdb/features/arm-with-vfpv3.c rename to gdb/features/arm/with-vfpv3.c diff --git a/gdb/features/arm-with-vfpv2.xml b/gdb/features/arm/with-vfpv3.xml similarity index 82% rename from gdb/features/arm-with-vfpv2.xml rename to gdb/features/arm/with-vfpv3.xml index 98a5a1c..855ad13 100644 --- a/gdb/features/arm-with-vfpv2.xml +++ b/gdb/features/arm/with-vfpv3.xml @@ -7,6 +7,6 @@ - - + + diff --git a/gdb/features/xscale-iwmmxt.xml b/gdb/features/arm/xscale-iwmmxt.xml similarity index 100% rename from gdb/features/xscale-iwmmxt.xml rename to gdb/features/arm/xscale-iwmmxt.xml diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv index cc4f53d..1b816ec 100644 --- a/gdb/gdbserver/configure.srv +++ b/gdb/gdbserver/configure.srv @@ -58,19 +58,19 @@ case "${target}" in srv_linux_regsets=yes srv_linux_thread_db=yes ;; - arm*-*-linux*) srv_regobj="reg-arm.o arm-with-iwmmxt.o" - srv_regobj="${srv_regobj} arm-with-vfpv2.o" - srv_regobj="${srv_regobj} arm-with-vfpv3.o" - srv_regobj="${srv_regobj} arm-with-neon.o" + arm*-*-linux*) srv_regobj="reg-arm.o with-iwmmxt.o" + srv_regobj="${srv_regobj} with-vfpv2.o" + srv_regobj="${srv_regobj} with-vfpv3.o" + srv_regobj="${srv_regobj} with-neon.o" srv_tgtobj="$srv_linux_obj linux-arm-low.o" - srv_xmlfiles="arm-with-iwmmxt.xml" - srv_xmlfiles="${srv_xmlfiles} arm-with-vfpv2.xml" - srv_xmlfiles="${srv_xmlfiles} arm-with-vfpv3.xml" - srv_xmlfiles="${srv_xmlfiles} arm-with-neon.xml" - srv_xmlfiles="${srv_xmlfiles} arm-core.xml" - srv_xmlfiles="${srv_xmlfiles} xscale-iwmmxt.xml" - srv_xmlfiles="${srv_xmlfiles} arm-vfpv2.xml" - srv_xmlfiles="${srv_xmlfiles} arm-vfpv3.xml" + srv_xmlfiles="arm/with-iwmmxt.xml" + srv_xmlfiles="${srv_xmlfiles} arm/with-vfpv2.xml" + srv_xmlfiles="${srv_xmlfiles} arm/with-vfpv3.xml" + srv_xmlfiles="${srv_xmlfiles} arm/with-neon.xml" + srv_xmlfiles="${srv_xmlfiles} arm/core.xml" + srv_xmlfiles="${srv_xmlfiles} arm/xscale-iwmmxt.xml" + srv_xmlfiles="${srv_xmlfiles} arm/vfpv2.xml" + srv_xmlfiles="${srv_xmlfiles} arm/vfpv3.xml" srv_linux_usrregs=yes srv_linux_regsets=yes srv_linux_thread_db=yes diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp index 0e4547c..18a99ba 100644 --- a/gdb/testsuite/gdb.xml/tdesc-regs.exp +++ b/gdb/testsuite/gdb.xml/tdesc-regs.exp @@ -28,7 +28,8 @@ set regdir "" set architecture "" switch -glob -- [istarget] { "arm*-*-*" { - set core-regs {arm-core.xml} + set regdir "arm/" + set core-regs {core.xml} } "*m68k-*-*" { set core-regs {m68k-core.xml}