]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
Clean up the XML files for ARM
authorYao Qi <yao.qi@linaro.org>
Wed, 5 Oct 2016 08:31:13 +0000 (09:31 +0100)
committerYao Qi <yao.qi@linaro.org>
Wed, 5 Oct 2016 08:31:13 +0000 (09:31 +0100)
This patch is move features/arm-*.xml to features/arm/, and it is based
on Terry's patch posted here
https://sourceware.org/ml/gdb-patches/2014-06/msg00794.html

One comment to Terry's patch is about losing "arm" prefix, and the new
patch fixes this problem.

gdb:

2016-10-05  Terry Guo  <terry.guo@arm.com>
    Yao Qi  <yao.qi@linaro.org>

* arm-tdep.c: Adjust includes.
* features/Makefile (WHICH): Add "arm/" directory to arm
target descriptions.
(XMLTOC): Likewise.
(arm/arm-with-iwmmxt.dat): Adjust the path for
dependencies.
* features/arm-core.xml: Moved to ...
* features/arm/arm-core.xml: ... it.
* features/arm-fpa.xml: Moved to ...
* features/arm/arm-fpa.xml: ... it.
* features/arm-m-profile.xml: Moved to ...
* features/arm/arm-m-profile.xm: ... it.
* features/arm-vfpv2.xml: Moved to ...
* features/arm/arm-vfpv2.xm: ... it.
* features/arm-vfpv3.xml: Moved to ...
* features/arm/arm-vfpv3.xml: ... it.
* features/arm-with-iwmmxt.c: Moved to ...
* features/arm/arm-with-iwmmxt.c: ... it.
* features/arm-with-iwmmxt.xml: Moved to ...
* features/arm/arm-with-iwmmxt.xml: ... it.
* features/arm-with-m-fpa-layout.c: Moved to ...
* features/arm/arm-with-m-fpa-layout.c: ... it.
* features/arm-with-m-fpa-layout.xml: Moved to ...
* features/arm/arm-with-m-fpa-layout.xml: ... it.
* features/arm-with-m-vfp-d16.c: Moved to ...
* features/arm/arm-with-m-vfp-d16.c: ... it.
* features/arm-with-m-vfp-d16.xml: Moved to ...
* features/arm/arm-with-m-vfp-d16.xml: ... it.
* features/arm-with-m.c: Moved to ...
* features/arm/arm-with-m.c: ... it.
* features/arm-with-m.xml: Moved to ...
* features/arm/arm-with-m.xm: ... it.
* features/arm-with-neon.c: Moved to ...
* features/arm/arm-with-neon.c: ... it.
* features/arm-with-neon.xml: Moved to ...
* features/arm/arm-with-neon.xml: ... it.
* features/arm-with-vfpv2.c: Moved to ...
* features/arm/arm-with-vfpv2.c: ... it.
* features/arm-with-vfpv2.xml: Moved to ...
* features/arm/arm-with-vfpv2.xml: ... it.
* features/arm-with-vfpv3.c: Moved to ...
* features/arm/arm-with-vfpv3.c: ... it.
* features/arm-with-vfpv3.xml: Moved to ...
* features/arm/arm-with-vfpv3.xml: ... it.
* features/xscale-iwmmxt.xml: Moved to ...
* features/arm/xscale-iwmmxt.xml: ... it.

gdb/gdbserver:

2016-10-05  Terry Guo  <terry.guo@arm.com>
    Yao Qi  <yao.qi@linaro.org>

* Makefile.in: Adjust the path of rules.
* configure.srv: Update the path of xml files.
* regformats/arm-with-iwmmxt.dat: Regenerated.
* regformats/arm-with-neon.dat: Likewise.
* regformats/arm-with-vfpv2.dat: Likewise.
* regformats/arm-with-vfpv3.dat Likewise.

30 files changed:
gdb/ChangeLog
gdb/arm-tdep.c
gdb/features/Makefile
gdb/features/arm/arm-core.xml [moved from gdb/features/arm-core.xml with 100% similarity]
gdb/features/arm/arm-fpa.xml [moved from gdb/features/arm-fpa.xml with 100% similarity]
gdb/features/arm/arm-m-profile.xml [moved from gdb/features/arm-m-profile.xml with 100% similarity]
gdb/features/arm/arm-vfpv2.xml [moved from gdb/features/arm-vfpv2.xml with 100% similarity]
gdb/features/arm/arm-vfpv3.xml [moved from gdb/features/arm-vfpv3.xml with 100% similarity]
gdb/features/arm/arm-with-iwmmxt.c [moved from gdb/features/arm-with-iwmmxt.c with 100% similarity]
gdb/features/arm/arm-with-iwmmxt.xml [moved from gdb/features/arm-with-iwmmxt.xml with 100% similarity]
gdb/features/arm/arm-with-m-fpa-layout.c [moved from gdb/features/arm-with-m-fpa-layout.c with 100% similarity]
gdb/features/arm/arm-with-m-fpa-layout.xml [moved from gdb/features/arm-with-m-fpa-layout.xml with 100% similarity]
gdb/features/arm/arm-with-m-vfp-d16.c [moved from gdb/features/arm-with-m-vfp-d16.c with 100% similarity]
gdb/features/arm/arm-with-m-vfp-d16.xml [moved from gdb/features/arm-with-m-vfp-d16.xml with 100% similarity]
gdb/features/arm/arm-with-m.c [moved from gdb/features/arm-with-m.c with 100% similarity]
gdb/features/arm/arm-with-m.xml [moved from gdb/features/arm-with-m.xml with 100% similarity]
gdb/features/arm/arm-with-neon.c [moved from gdb/features/arm-with-neon.c with 100% similarity]
gdb/features/arm/arm-with-neon.xml [moved from gdb/features/arm-with-neon.xml with 100% similarity]
gdb/features/arm/arm-with-vfpv2.c [moved from gdb/features/arm-with-vfpv2.c with 100% similarity]
gdb/features/arm/arm-with-vfpv2.xml [moved from gdb/features/arm-with-vfpv2.xml with 100% similarity]
gdb/features/arm/arm-with-vfpv3.c [moved from gdb/features/arm-with-vfpv3.c with 100% similarity]
gdb/features/arm/arm-with-vfpv3.xml [moved from gdb/features/arm-with-vfpv3.xml with 100% similarity]
gdb/features/arm/xscale-iwmmxt.xml [moved from gdb/features/xscale-iwmmxt.xml with 100% similarity]
gdb/gdbserver/ChangeLog
gdb/gdbserver/Makefile.in
gdb/gdbserver/configure.srv
gdb/regformats/arm/arm-with-iwmmxt.dat [moved from gdb/regformats/arm-with-iwmmxt.dat with 91% similarity]
gdb/regformats/arm/arm-with-neon.dat [moved from gdb/regformats/arm-with-neon.dat with 92% similarity]
gdb/regformats/arm/arm-with-vfpv2.dat [moved from gdb/regformats/arm-with-vfpv2.dat with 90% similarity]
gdb/regformats/arm/arm-with-vfpv3.dat [moved from gdb/regformats/arm-with-vfpv3.dat with 92% similarity]

index 2b5232ce1511f072185af84e7bb4c2ad806b6283..f28a0efc970938159b0cb4d564e05ce55287b9b8 100644 (file)
@@ -1,3 +1,53 @@
+2016-10-05  Terry Guo  <terry.guo@arm.com>
+           Yao Qi  <yao.qi@linaro.org>
+
+       * arm-tdep.c: Adjust includes.
+       * features/Makefile (WHICH): Add "arm/" directory to arm
+       target descriptions.
+       (XMLTOC): Likewise.
+       (arm/arm-with-iwmmxt.dat): Adjust the path for
+       dependencies.
+       * features/arm-core.xml: Moved to ...
+       * features/arm/arm-core.xml: ... it.
+       * features/arm-fpa.xml: Moved to ...
+       * features/arm/arm-fpa.xml: ... it.
+       * features/arm-m-profile.xml: Moved to ...
+       * features/arm/arm-m-profile.xm: ... it.
+       * features/arm-vfpv2.xml: Moved to ...
+       * features/arm/arm-vfpv2.xm: ... it.
+       * features/arm-vfpv3.xml: Moved to ...
+       * features/arm/arm-vfpv3.xml: ... it.
+       * features/arm-with-iwmmxt.c: Moved to ...
+       * features/arm/arm-with-iwmmxt.c: ... it.
+       * features/arm-with-iwmmxt.xml: Moved to ...
+       * features/arm/arm-with-iwmmxt.xml: ... it.
+       * features/arm-with-m-fpa-layout.c: Moved to ...
+       * features/arm/arm-with-m-fpa-layout.c: ... it.
+       * features/arm-with-m-fpa-layout.xml: Moved to ...
+       * features/arm/arm-with-m-fpa-layout.xml: ... it.
+       * features/arm-with-m-vfp-d16.c: Moved to ...
+       * features/arm/arm-with-m-vfp-d16.c: ... it.
+       * features/arm-with-m-vfp-d16.xml: Moved to ...
+       * features/arm/arm-with-m-vfp-d16.xml: ... it.
+       * features/arm-with-m.c: Moved to ...
+       * features/arm/arm-with-m.c: ... it.
+       * features/arm-with-m.xml: Moved to ...
+       * features/arm/arm-with-m.xm: ... it.
+       * features/arm-with-neon.c: Moved to ...
+       * features/arm/arm-with-neon.c: ... it.
+       * features/arm-with-neon.xml: Moved to ...
+       * features/arm/arm-with-neon.xml: ... it.
+       * features/arm-with-vfpv2.c: Moved to ...
+       * features/arm/arm-with-vfpv2.c: ... it.
+       * features/arm-with-vfpv2.xml: Moved to ...
+       * features/arm/arm-with-vfpv2.xml: ... it.
+       * features/arm-with-vfpv3.c: Moved to ...
+       * features/arm/arm-with-vfpv3.c: ... it.
+       * features/arm-with-vfpv3.xml: Moved to ...
+       * features/arm/arm-with-vfpv3.xml: ... it.
+       * features/xscale-iwmmxt.xml: Moved to ...
+       * features/arm/xscale-iwmmxt.xml: ... it.
+
 2016-10-03  Antoine Tremblay  <antoine.tremblay@ericsson.com>
 2016-10-03  Simon Marchi  <simon.marchi@ericsson.com>
 
index a07d93b86404006cc400dabdb7d3cc52a690856d..4211cd5e3e71d7e4955019dcc1d00363922afaef 100644 (file)
 #include "record-full.h"
 #include <algorithm>
 
-#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/arm-with-m.c"
+#include "features/arm/arm-with-m-fpa-layout.c"
+#include "features/arm/arm-with-m-vfp-d16.c"
+#include "features/arm/arm-with-iwmmxt.c"
+#include "features/arm/arm-with-vfpv2.c"
+#include "features/arm/arm-with-vfpv3.c"
+#include "features/arm/arm-with-neon.c"
 
 static int arm_debug;
 
index 4efb1a550c50c01c9ce364ba80774c7818db44f0..f24b13ecea035b82bed3cb6a5c9d529e48400652 100644 (file)
@@ -44,7 +44,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/arm-with-iwmmxt arm/arm-with-vfpv2 arm/arm-with-vfpv3 \
+       arm/arm-with-neon \
        i386/i386 i386/i386-linux \
        i386/i386-mmx i386/i386-mmx-linux \
        i386/amd64 i386/amd64-linux \
@@ -150,13 +151,13 @@ XMLTOC = \
        aarch64.xml \
        arc-v2.xml \
        arc-arcompact.xml \
-       arm-with-iwmmxt.xml \
-       arm-with-m-fpa-layout.xml \
-       arm-with-m-vfp-d16.xml \
-       arm-with-m.xml \
-       arm-with-neon.xml \
-       arm-with-vfpv2.xml \
-       arm-with-vfpv3.xml \
+       arm/arm-with-iwmmxt.xml \
+       arm/arm-with-m-fpa-layout.xml \
+       arm/arm-with-m-vfp-d16.xml \
+       arm/arm-with-m.xml \
+       arm/arm-with-neon.xml \
+       arm/arm-with-vfpv2.xml \
+       arm/arm-with-vfpv3.xml \
        i386/amd64-avx-linux.xml \
        i386/amd64-avx.xml \
        i386/amd64-avx512-linux.xml \
@@ -270,7 +271,7 @@ cfiles: $(CFILES)
        sh ../../move-if-change $@.tmp $@
 
 # Other dependencies.
-$(outdir)/arm-with-iwmmxt.dat: arm-core.xml xscale-iwmmxt.xml
+$(outdir)/arm/arm-with-iwmmxt.dat: arm/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
index 5c2cca9f98f600981ab8ec0111d697ebbda1c4ca..c5308088d40d148c3bcba99eef463c64cae214b0 100644 (file)
@@ -1,3 +1,13 @@
+2016-10-05  Terry Guo  <terry.guo@arm.com>
+           Yao Qi  <yao.qi@linaro.org>
+
+       * Makefile.in: Adjust the path of rules.
+       * configure.srv: Update the path of xml files.
+       * regformats/arm-with-iwmmxt.dat: Regenerated.
+       * regformats/arm-with-neon.dat: Likewise.
+       * regformats/arm-with-vfpv2.dat: Likewise.
+       * regformats/arm-with-vfpv3.dat Likewise.
+
 2016-09-30  Yao Qi  <yao.qi@linaro.org>
 
        PR gdbserver/20627
index 6d5abd3b50e546cb3b31c9c492313da0c9a4be08..0db5287ba9140023b0120d81490f9a12988210a0 100644 (file)
@@ -801,14 +801,14 @@ aarch64.c : $(srcdir)/../regformats/aarch64.dat $(regdat_sh)
        $(SHELL) $(regdat_sh) $(srcdir)/../regformats/aarch64.dat aarch64.c
 reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh)
        $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c
-arm-with-iwmmxt.c : $(srcdir)/../regformats/arm-with-iwmmxt.dat $(regdat_sh)
-       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm-with-iwmmxt.dat arm-with-iwmmxt.c
-arm-with-vfpv2.c : $(srcdir)/../regformats/arm-with-vfpv2.dat $(regdat_sh)
-       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm-with-vfpv2.dat arm-with-vfpv2.c
-arm-with-vfpv3.c : $(srcdir)/../regformats/arm-with-vfpv3.dat $(regdat_sh)
-       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm-with-vfpv3.dat arm-with-vfpv3.c
-arm-with-neon.c : $(srcdir)/../regformats/arm-with-neon.dat $(regdat_sh)
-       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm-with-neon.dat arm-with-neon.c
+arm-with-iwmmxt.c : $(srcdir)/../regformats/arm/arm-with-iwmmxt.dat $(regdat_sh)
+       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm/arm-with-iwmmxt.dat arm-with-iwmmxt.c
+arm-with-vfpv2.c : $(srcdir)/../regformats/arm/arm-with-vfpv2.dat $(regdat_sh)
+       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm/arm-with-vfpv2.dat arm-with-vfpv2.c
+arm-with-vfpv3.c : $(srcdir)/../regformats/arm/arm-with-vfpv3.dat $(regdat_sh)
+       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm/arm-with-vfpv3.dat arm-with-vfpv3.c
+arm-with-neon.c : $(srcdir)/../regformats/arm/arm-with-neon.dat $(regdat_sh)
+       $(SHELL) $(regdat_sh) $(srcdir)/../regformats/arm/arm-with-neon.dat arm-with-neon.c
 reg-bfin.c : $(srcdir)/../regformats/reg-bfin.dat $(regdat_sh)
        $(SHELL) $(regdat_sh) $(srcdir)/../regformats/reg-bfin.dat reg-bfin.c
 reg-cris.c : $(srcdir)/../regformats/reg-cris.dat $(regdat_sh)
index 39e8392ac4f30f1fd1679b05e13b0ff576d1ec38..e8712e6ced4a9165127ce65be1c35a961cfdf611 100644 (file)
@@ -76,14 +76,14 @@ case "${target}" in
                        srv_tgtobj="${srv_tgtobj} arm.o"
                        srv_tgtobj="${srv_tgtobj} arm-linux.o"
                        srv_tgtobj="${srv_tgtobj} arm-get-next-pcs.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/arm-with-iwmmxt.xml"
+                       srv_xmlfiles="${srv_xmlfiles} arm/arm-with-vfpv2.xml"
+                       srv_xmlfiles="${srv_xmlfiles} arm/arm-with-vfpv3.xml"
+                       srv_xmlfiles="${srv_xmlfiles} arm/arm-with-neon.xml"
+                       srv_xmlfiles="${srv_xmlfiles} arm/arm-core.xml"
+                       srv_xmlfiles="${srv_xmlfiles} arm/xscale-iwmmxt.xml"
+                       srv_xmlfiles="${srv_xmlfiles} arm/arm-vfpv2.xml"
+                       srv_xmlfiles="${srv_xmlfiles} arm/arm-vfpv3.xml"
                        srv_linux_usrregs=yes
                        srv_linux_regsets=yes
                        srv_linux_thread_db=yes
similarity index 91%
rename from gdb/regformats/arm-with-iwmmxt.dat
rename to gdb/regformats/arm/arm-with-iwmmxt.dat
index 4b4679b047486c5205304a3356697601459f156a..f529c2c493c39ff204a22d34c8a2c7a622f349a2 100644 (file)
@@ -1,5 +1,5 @@
 # THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi :set ro:
-# Generated from: arm-with-iwmmxt.xml
+# Generated from: arm/arm-with-iwmmxt.xml
 name:arm_with_iwmmxt
 xmltarget:arm-with-iwmmxt.xml
 expedite:r11,sp,pc
similarity index 92%
rename from gdb/regformats/arm-with-neon.dat
rename to gdb/regformats/arm/arm-with-neon.dat
index ee0ec587283395b8408c9ebcac475119673d65f0..2e6cb85cf4bc1712b640fdca902774f87bdac376 100644 (file)
@@ -1,5 +1,5 @@
 # THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi :set ro:
-# Generated from: arm-with-neon.xml
+# Generated from: arm/arm-with-neon.xml
 name:arm_with_neon
 xmltarget:arm-with-neon.xml
 expedite:r11,sp,pc
similarity index 90%
rename from gdb/regformats/arm-with-vfpv2.dat
rename to gdb/regformats/arm/arm-with-vfpv2.dat
index 9486c190ed7bb6b73b800589bfe163bb55296e72..aa71f85bcb26f11c8a4ded0738d39fdaf3c3f9f9 100644 (file)
@@ -1,5 +1,5 @@
 # THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi :set ro:
-# Generated from: arm-with-vfpv2.xml
+# Generated from: arm/arm-with-vfpv2.xml
 name:arm_with_vfpv2
 xmltarget:arm-with-vfpv2.xml
 expedite:r11,sp,pc
similarity index 92%
rename from gdb/regformats/arm-with-vfpv3.dat
rename to gdb/regformats/arm/arm-with-vfpv3.dat
index 236da097514d3744d695897eeb899d17d0b9914e..6fec4fd8f5d11ee8f29402704fb7e55f7fc9ea45 100644 (file)
@@ -1,5 +1,5 @@
 # THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi :set ro:
-# Generated from: arm-with-vfpv3.xml
+# Generated from: arm/arm-with-vfpv3.xml
 name:arm_with_vfpv3
 xmltarget:arm-with-vfpv3.xml
 expedite:r11,sp,pc