* [PATCHv4 1/3] gdb/features: set osabi in all Linux related features/*.xml files
2024-10-15 14:05 ` [PATCHv4 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
@ 2024-10-15 14:05 ` Andrew Burgess
2024-10-15 14:05 ` [PATCHv4 2/3] gdb/regformats: add osabi information to generated .dat files Andrew Burgess
` (2 subsequent siblings)
3 siblings, 0 replies; 17+ messages in thread
From: Andrew Burgess @ 2024-10-15 14:05 UTC (permalink / raw)
To: gdb-patches; +Cc: Andrew Burgess
Some of the top level (i.e. those that contain the <target> element)
xml files in gdb/features/ are clearly Linux only. I conclude this
based on the files names containing the string "linux".
I think that all of these files should have the <osabi> element
included with the value "GNU/Linux".
This commits adds the <osabi> element where I believe it is
appropriate and regenerates the associated .c files.
The benefit of this change is that gdbserver, which makes use of these
files, will now send the osabi back in more cases. Sending back more
descriptive target descriptions is a good thing as this makes it
easier for GDB to select the correct gdbarch.
---
gdb/features/mips64-dsp-linux.c | 2 ++
gdb/features/mips64-dsp-linux.xml | 1 +
gdb/features/mips64-linux.c | 2 ++
gdb/features/mips64-linux.xml | 1 +
gdb/features/s390-gs-linux64.c | 2 ++
gdb/features/s390-gs-linux64.xml | 1 +
gdb/features/s390-linux32.c | 2 ++
gdb/features/s390-linux32.xml | 1 +
gdb/features/s390-linux32v1.c | 2 ++
gdb/features/s390-linux32v1.xml | 1 +
gdb/features/s390-linux32v2.c | 2 ++
gdb/features/s390-linux32v2.xml | 1 +
gdb/features/s390-linux64.c | 2 ++
gdb/features/s390-linux64.xml | 1 +
gdb/features/s390-linux64v1.c | 2 ++
gdb/features/s390-linux64v1.xml | 1 +
gdb/features/s390-linux64v2.c | 2 ++
gdb/features/s390-linux64v2.xml | 1 +
gdb/features/s390-te-linux64.c | 2 ++
gdb/features/s390-te-linux64.xml | 1 +
gdb/features/s390-tevx-linux64.c | 2 ++
gdb/features/s390-tevx-linux64.xml | 1 +
gdb/features/s390-vx-linux64.c | 2 ++
gdb/features/s390-vx-linux64.xml | 1 +
gdb/features/s390x-gs-linux64.c | 2 ++
gdb/features/s390x-gs-linux64.xml | 1 +
gdb/features/s390x-linux64.c | 2 ++
gdb/features/s390x-linux64.xml | 1 +
gdb/features/s390x-linux64v1.c | 2 ++
gdb/features/s390x-linux64v1.xml | 1 +
gdb/features/s390x-linux64v2.c | 2 ++
gdb/features/s390x-linux64v2.xml | 1 +
gdb/features/s390x-te-linux64.c | 2 ++
gdb/features/s390x-te-linux64.xml | 1 +
gdb/features/s390x-tevx-linux64.c | 2 ++
gdb/features/s390x-tevx-linux64.xml | 1 +
gdb/features/s390x-vx-linux64.c | 2 ++
gdb/features/s390x-vx-linux64.xml | 1 +
38 files changed, 57 insertions(+)
diff --git a/gdb/features/mips64-dsp-linux.c b/gdb/features/mips64-dsp-linux.c
index 7ea0bb704f4..646f5487f49 100644
--- a/gdb/features/mips64-dsp-linux.c
+++ b/gdb/features/mips64-dsp-linux.c
@@ -11,6 +11,8 @@ initialize_tdesc_mips64_dsp_linux (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("mips"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.mips.cpu");
diff --git a/gdb/features/mips64-dsp-linux.xml b/gdb/features/mips64-dsp-linux.xml
index 69518e496c4..6c108555490 100644
--- a/gdb/features/mips64-dsp-linux.xml
+++ b/gdb/features/mips64-dsp-linux.xml
@@ -8,6 +8,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>mips</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="mips64-cpu.xml"/>
<xi:include href="mips64-cp0.xml"/>
<xi:include href="mips64-fpu.xml"/>
diff --git a/gdb/features/mips64-linux.c b/gdb/features/mips64-linux.c
index f4dcf8bc109..98b3d34448d 100644
--- a/gdb/features/mips64-linux.c
+++ b/gdb/features/mips64-linux.c
@@ -11,6 +11,8 @@ initialize_tdesc_mips64_linux (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("mips"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.mips.cpu");
diff --git a/gdb/features/mips64-linux.xml b/gdb/features/mips64-linux.xml
index 4c99206b5bd..f861982a8e9 100644
--- a/gdb/features/mips64-linux.xml
+++ b/gdb/features/mips64-linux.xml
@@ -8,6 +8,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>mips</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="mips64-cpu.xml"/>
<xi:include href="mips64-cp0.xml"/>
<xi:include href="mips64-fpu.xml"/>
diff --git a/gdb/features/s390-gs-linux64.c b/gdb/features/s390-gs-linux64.c
index 49ea08b2c39..ab6ad6f21e3 100644
--- a/gdb/features/s390-gs-linux64.c
+++ b/gdb/features/s390-gs-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_gs_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-gs-linux64.xml b/gdb/features/s390-gs-linux64.xml
index 035e794643d..e33e8a42f6b 100644
--- a/gdb/features/s390-gs-linux64.xml
+++ b/gdb/features/s390-gs-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32.c b/gdb/features/s390-linux32.c
index 43ceb9c008e..e45321a2099 100644
--- a/gdb/features/s390-linux32.c
+++ b/gdb/features/s390-linux32.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32.xml b/gdb/features/s390-linux32.xml
index 4225e5cb120..6a51c21d07c 100644
--- a/gdb/features/s390-linux32.xml
+++ b/gdb/features/s390-linux32.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core32.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32v1.c b/gdb/features/s390-linux32v1.c
index 291784fdac7..cea14c16969 100644
--- a/gdb/features/s390-linux32v1.c
+++ b/gdb/features/s390-linux32v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32v1 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32v1.xml b/gdb/features/s390-linux32v1.xml
index 60f8ab650ea..63780765f98 100644
--- a/gdb/features/s390-linux32v1.xml
+++ b/gdb/features/s390-linux32v1.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core32.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32v2.c b/gdb/features/s390-linux32v2.c
index 6fa26daa537..182ab2f0b60 100644
--- a/gdb/features/s390-linux32v2.c
+++ b/gdb/features/s390-linux32v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32v2 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32v2.xml b/gdb/features/s390-linux32v2.xml
index 58b1478ee4f..0646ce3f2e0 100644
--- a/gdb/features/s390-linux32v2.xml
+++ b/gdb/features/s390-linux32v2.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core32.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64.c b/gdb/features/s390-linux64.c
index 74c338c1fa6..8bcec095174 100644
--- a/gdb/features/s390-linux64.c
+++ b/gdb/features/s390-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64.xml b/gdb/features/s390-linux64.xml
index dcd50296983..e8d8f03eae7 100644
--- a/gdb/features/s390-linux64.xml
+++ b/gdb/features/s390-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64v1.c b/gdb/features/s390-linux64v1.c
index 0aebbdb6b7a..3a6394b513d 100644
--- a/gdb/features/s390-linux64v1.c
+++ b/gdb/features/s390-linux64v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64v1 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64v1.xml b/gdb/features/s390-linux64v1.xml
index a849e793acd..fc63a165236 100644
--- a/gdb/features/s390-linux64v1.xml
+++ b/gdb/features/s390-linux64v1.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64v2.c b/gdb/features/s390-linux64v2.c
index 3b3b4916ac3..5ff9a5709ef 100644
--- a/gdb/features/s390-linux64v2.c
+++ b/gdb/features/s390-linux64v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64v2 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64v2.xml b/gdb/features/s390-linux64v2.xml
index 4bbfb09b2fb..3d0c9f9b210 100644
--- a/gdb/features/s390-linux64v2.xml
+++ b/gdb/features/s390-linux64v2.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-te-linux64.c b/gdb/features/s390-te-linux64.c
index d49e7441313..2abddd53bfa 100644
--- a/gdb/features/s390-te-linux64.c
+++ b/gdb/features/s390-te-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_te_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-te-linux64.xml b/gdb/features/s390-te-linux64.xml
index e141e0b789c..399053a0319 100644
--- a/gdb/features/s390-te-linux64.xml
+++ b/gdb/features/s390-te-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-tevx-linux64.c b/gdb/features/s390-tevx-linux64.c
index ffe1ddf4ee1..8e38a5cf81f 100644
--- a/gdb/features/s390-tevx-linux64.c
+++ b/gdb/features/s390-tevx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_tevx_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-tevx-linux64.xml b/gdb/features/s390-tevx-linux64.xml
index f9dc796e66d..2dbb0399b9c 100644
--- a/gdb/features/s390-tevx-linux64.xml
+++ b/gdb/features/s390-tevx-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-vx-linux64.c b/gdb/features/s390-vx-linux64.c
index 30262a63fce..1ce5ad3671a 100644
--- a/gdb/features/s390-vx-linux64.c
+++ b/gdb/features/s390-vx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_vx_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-vx-linux64.xml b/gdb/features/s390-vx-linux64.xml
index fe55fb22565..6b32bf8130b 100644
--- a/gdb/features/s390-vx-linux64.xml
+++ b/gdb/features/s390-vx-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-gs-linux64.c b/gdb/features/s390x-gs-linux64.c
index 501b3b24061..76b8124863a 100644
--- a/gdb/features/s390x-gs-linux64.c
+++ b/gdb/features/s390x-gs-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_gs_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-gs-linux64.xml b/gdb/features/s390x-gs-linux64.xml
index 6131aaa9e38..c41e460d91c 100644
--- a/gdb/features/s390x-gs-linux64.xml
+++ b/gdb/features/s390x-gs-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64.c b/gdb/features/s390x-linux64.c
index 8655d5a6116..eb6b181f599 100644
--- a/gdb/features/s390x-linux64.c
+++ b/gdb/features/s390x-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64.xml b/gdb/features/s390x-linux64.xml
index a70f6372c25..31afe82dadc 100644
--- a/gdb/features/s390x-linux64.xml
+++ b/gdb/features/s390x-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64v1.c b/gdb/features/s390x-linux64v1.c
index 11bfd85c995..6b43f88ac84 100644
--- a/gdb/features/s390x-linux64v1.c
+++ b/gdb/features/s390x-linux64v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64v1 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64v1.xml b/gdb/features/s390x-linux64v1.xml
index ffc0505202e..8aa26b4f587 100644
--- a/gdb/features/s390x-linux64v1.xml
+++ b/gdb/features/s390x-linux64v1.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64v2.c b/gdb/features/s390x-linux64v2.c
index 400b1af4485..eeba787ec7b 100644
--- a/gdb/features/s390x-linux64v2.c
+++ b/gdb/features/s390x-linux64v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64v2 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64v2.xml b/gdb/features/s390x-linux64v2.xml
index 4b2abc60dad..3769a75db40 100644
--- a/gdb/features/s390x-linux64v2.xml
+++ b/gdb/features/s390x-linux64v2.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-te-linux64.c b/gdb/features/s390x-te-linux64.c
index 74883e30fe8..0fec2b0bd02 100644
--- a/gdb/features/s390x-te-linux64.c
+++ b/gdb/features/s390x-te-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_te_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-te-linux64.xml b/gdb/features/s390x-te-linux64.xml
index b38c7c0ac12..c48831d54e5 100644
--- a/gdb/features/s390x-te-linux64.xml
+++ b/gdb/features/s390x-te-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-tevx-linux64.c b/gdb/features/s390x-tevx-linux64.c
index 1d45d6044c1..c1b890045d3 100644
--- a/gdb/features/s390x-tevx-linux64.c
+++ b/gdb/features/s390x-tevx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_tevx_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-tevx-linux64.xml b/gdb/features/s390x-tevx-linux64.xml
index 2d7672e1dca..a53bfff5ac7 100644
--- a/gdb/features/s390x-tevx-linux64.xml
+++ b/gdb/features/s390x-tevx-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-vx-linux64.c b/gdb/features/s390x-vx-linux64.c
index 4de6585a227..af57e052eab 100644
--- a/gdb/features/s390x-vx-linux64.c
+++ b/gdb/features/s390x-vx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_vx_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-vx-linux64.xml b/gdb/features/s390x-vx-linux64.xml
index 8903f1871e2..fcf75deb588 100644
--- a/gdb/features/s390x-vx-linux64.xml
+++ b/gdb/features/s390x-vx-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
--
2.25.4
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCHv4 2/3] gdb/regformats: add osabi information to generated .dat files
2024-10-15 14:05 ` [PATCHv4 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
2024-10-15 14:05 ` [PATCHv4 1/3] gdb/features: set osabi in all Linux related features/*.xml files Andrew Burgess
@ 2024-10-15 14:05 ` Andrew Burgess
2024-10-15 14:05 ` [PATCHv4 3/3] gdbserver: pass osabi to GDB in more target descriptions Andrew Burgess
2024-10-27 20:07 ` [PATCHv5 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
3 siblings, 0 replies; 17+ messages in thread
From: Andrew Burgess @ 2024-10-15 14:05 UTC (permalink / raw)
To: gdb-patches; +Cc: Andrew Burgess
Some gdbserver targets generate their target description based on the
gdb/regformats/*.dat files. These .dat files are generated from a
matching xml file in gdb/features/.
Lets consider a concrete example:
Take gdb/features/or1k-linux.xml, this file is processed by
gdb/features/Makefile to create gdb/regformats/or1k-linux.dat.
When gdbserver is built for the or1k target the file
or1k-linux-generated.cc is generated using the
gdb/regformats/regdat.sh script. This .cc file is then compiled and
linked into gdbserver.
The or1k-linux-generated.cc file contains the function
init_registers_or1k_linux which is called from within gdbserver, this
function creates a target_desc object and sets its xmltarget field to
a fixed string. This fixed string is the xml filename that was
originally used to generate the xml file, in this case or1k-linux.xml.
Additionally, as part of the gdbserver build the file or1k-linux.xml
is converted to a string and placed in the file
xml-builtin-generated.cc which is then built into gdbserver.
Now when GDB asks gdbserver for the target description, gdbserver
returns the fixed xmltarget string, which is the name of an xml file.
GDB will then ask gdbserver for that file and gdbserver will return
the contents of that file thanks to the xml-builtin-generated.cc
file's contents.
This is all rather complicated, but it does work. So what's the
problem that I'm fixing?
Well or1k-linux.xml does contain the osabi information, so this will
be returned from gdbserver to GDB. That's good.
However, the target_desc object created in init_registers_or1k_linux
will not have its osabi set correctly.
Now this doesn't really matter too much except
init_registers_or1k_linux includes a call to init_target_desc.
In the next commit I want to extend init_target_desc to require an
osabi to be passed in. The motivation for this will be explained in
the next commit, but if we accept for a moment that this is something
that should be done, then the question is what osabi should we use in
init_registers_or1k_linux?
Ideally we'd use the osabi which is set in or1k-linux.xml. If we do
that then everything will remain consistent, which is a good thing.
And so, to get the osabi from or1k-linux.xml into
init_registers_or1k_linux, we first need to get the osabi information
into or1k-linux.dat file, and this is what this commit does.
I've added a new xsl script print-osabi.xsl and updated
gdb/features/Makefile to make use of this script. Then I regenerated
all of the .dat files. Now every .dat file contains either:
osabi:GNU/Linux
osabi:unknown
The first is for xml files containing <osabi>GNU/Linux</osabi> and the
second is for xml files that don't contain an osabi element.
This commit doesn't attempt to make use of the osabi information in
the .dat files, that will come in the next commit. There should be no
user visible changes after this commit.
---
gdb/features/Makefile | 2 +
gdb/features/print-osabi.xsl | 39 +++++++++++++++++++
gdb/regformats/mips-dsp-linux.dat | 1 +
gdb/regformats/mips-linux.dat | 1 +
gdb/regformats/mips64-dsp-linux.dat | 1 +
gdb/regformats/mips64-linux.dat | 1 +
gdb/regformats/nios2-linux.dat | 1 +
gdb/regformats/or1k-linux.dat | 1 +
gdb/regformats/rs6000/powerpc-32.dat | 1 +
gdb/regformats/rs6000/powerpc-32l.dat | 1 +
gdb/regformats/rs6000/powerpc-64l.dat | 1 +
gdb/regformats/rs6000/powerpc-altivec32l.dat | 1 +
gdb/regformats/rs6000/powerpc-altivec64l.dat | 1 +
gdb/regformats/rs6000/powerpc-e500l.dat | 1 +
gdb/regformats/rs6000/powerpc-isa205-32l.dat | 1 +
gdb/regformats/rs6000/powerpc-isa205-64l.dat | 1 +
.../rs6000/powerpc-isa205-altivec32l.dat | 1 +
.../rs6000/powerpc-isa205-altivec64l.dat | 1 +
.../rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat | 1 +
.../rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat | 1 +
.../rs6000/powerpc-isa205-vsx32l.dat | 1 +
.../rs6000/powerpc-isa205-vsx64l.dat | 1 +
.../rs6000/powerpc-isa207-htm-vsx32l.dat | 1 +
.../rs6000/powerpc-isa207-htm-vsx64l.dat | 1 +
.../rs6000/powerpc-isa207-vsx32l.dat | 1 +
.../rs6000/powerpc-isa207-vsx64l.dat | 1 +
gdb/regformats/rs6000/powerpc-vsx32l.dat | 1 +
gdb/regformats/rs6000/powerpc-vsx64l.dat | 1 +
gdb/regformats/s390-gs-linux64.dat | 1 +
gdb/regformats/s390-linux32.dat | 1 +
gdb/regformats/s390-linux32v1.dat | 1 +
gdb/regformats/s390-linux32v2.dat | 1 +
gdb/regformats/s390-linux64.dat | 1 +
gdb/regformats/s390-linux64v1.dat | 1 +
gdb/regformats/s390-linux64v2.dat | 1 +
gdb/regformats/s390-te-linux64.dat | 1 +
gdb/regformats/s390-tevx-linux64.dat | 1 +
gdb/regformats/s390-vx-linux64.dat | 1 +
gdb/regformats/s390x-gs-linux64.dat | 1 +
gdb/regformats/s390x-linux64.dat | 1 +
gdb/regformats/s390x-linux64v1.dat | 1 +
gdb/regformats/s390x-linux64v2.dat | 1 +
gdb/regformats/s390x-te-linux64.dat | 1 +
gdb/regformats/s390x-tevx-linux64.dat | 1 +
gdb/regformats/s390x-vx-linux64.dat | 1 +
gdb/regformats/tic6x-c62x-linux.dat | 1 +
gdb/regformats/tic6x-c64x-linux.dat | 1 +
gdb/regformats/tic6x-c64xp-linux.dat | 1 +
48 files changed, 87 insertions(+)
create mode 100644 gdb/features/print-osabi.xsl
diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 01b327cbce1..4f42d00cf9b 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -191,6 +191,8 @@ $(outdir)/%.dat: %.xml number-regs.xsl sort-regs.xsl gdbserver-regs.xsl
echo "xmltarget:$(<F)" >> $(outdir)/$*.tmp
echo "expedite:$(if $($*-expedite),$($*-expedite),$($(firstword $(subst -, ,$(notdir $*)))-expedite))" \
>> $(outdir)/$*.tmp
+ $(XSLTPROC) --path "$(PWD)" --xinclude print-osabi.xsl $< \
+ >> $(outdir)/$*.tmp
$(XSLTPROC) --path "$(PWD)" --xinclude number-regs.xsl $< | \
$(XSLTPROC) sort-regs.xsl - | \
$(XSLTPROC) gdbserver-regs.xsl - >> $(outdir)/$*.tmp
diff --git a/gdb/features/print-osabi.xsl b/gdb/features/print-osabi.xsl
new file mode 100644
index 00000000000..77f9931de52
--- /dev/null
+++ b/gdb/features/print-osabi.xsl
@@ -0,0 +1,39 @@
+<!--
+
+ Copyright (C) 2024 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ 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 <http://www.gnu.org/licenses/>.
+
+-->
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="text"/>
+ <xsl:variable name="total" select="count(/target/osabi)"/>
+ <xsl:template match = "/target">
+ <xsl:text>osabi:</xsl:text>
+ <xsl:choose>
+ <xsl:when test="osabi">
+ <xsl:value-of select="osabi"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>unknown</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text>
+</xsl:text>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/gdb/regformats/mips-dsp-linux.dat b/gdb/regformats/mips-dsp-linux.dat
index ce37bf38bdb..dd222857887 100644
--- a/gdb/regformats/mips-dsp-linux.dat
+++ b/gdb/regformats/mips-dsp-linux.dat
@@ -3,6 +3,7 @@
name:mips_dsp_linux
xmltarget:mips-dsp-linux.xml
expedite:r29,pc
+osabi:GNU/Linux
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/mips-linux.dat b/gdb/regformats/mips-linux.dat
index d95e2c9ed45..d333602dad1 100644
--- a/gdb/regformats/mips-linux.dat
+++ b/gdb/regformats/mips-linux.dat
@@ -3,6 +3,7 @@
name:mips_linux
xmltarget:mips-linux.xml
expedite:r29,pc
+osabi:GNU/Linux
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/mips64-dsp-linux.dat b/gdb/regformats/mips64-dsp-linux.dat
index e73df93d69b..5712424c0b6 100644
--- a/gdb/regformats/mips64-dsp-linux.dat
+++ b/gdb/regformats/mips64-dsp-linux.dat
@@ -3,6 +3,7 @@
name:mips64_dsp_linux
xmltarget:mips64-dsp-linux.xml
expedite:r29,pc
+osabi:GNU/Linux
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/mips64-linux.dat b/gdb/regformats/mips64-linux.dat
index 6770c8f6545..843320d46be 100644
--- a/gdb/regformats/mips64-linux.dat
+++ b/gdb/regformats/mips64-linux.dat
@@ -3,6 +3,7 @@
name:mips64_linux
xmltarget:mips64-linux.xml
expedite:r29,pc
+osabi:GNU/Linux
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/nios2-linux.dat b/gdb/regformats/nios2-linux.dat
index fe4af2f4f36..ecfca72ec6d 100644
--- a/gdb/regformats/nios2-linux.dat
+++ b/gdb/regformats/nios2-linux.dat
@@ -3,6 +3,7 @@
name:nios2_linux
xmltarget:nios2-linux.xml
expedite:sp,pc
+osabi:GNU/Linux
32:zero
32:at
32:r2
diff --git a/gdb/regformats/or1k-linux.dat b/gdb/regformats/or1k-linux.dat
index 7b64646fc65..d2d94c65c95 100644
--- a/gdb/regformats/or1k-linux.dat
+++ b/gdb/regformats/or1k-linux.dat
@@ -3,6 +3,7 @@
name:or1k_linux
xmltarget:or1k-linux.xml
expedite:r1,npc
+osabi:GNU/Linux
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-32.dat b/gdb/regformats/rs6000/powerpc-32.dat
index 266636b11f9..f85f95df06f 100644
--- a/gdb/regformats/rs6000/powerpc-32.dat
+++ b/gdb/regformats/rs6000/powerpc-32.dat
@@ -3,6 +3,7 @@
name:powerpc_32
xmltarget:powerpc-32.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-32l.dat b/gdb/regformats/rs6000/powerpc-32l.dat
index 2c8ccbe49b9..286f1a5d88f 100644
--- a/gdb/regformats/rs6000/powerpc-32l.dat
+++ b/gdb/regformats/rs6000/powerpc-32l.dat
@@ -3,6 +3,7 @@
name:powerpc_32l
xmltarget:powerpc-32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-64l.dat b/gdb/regformats/rs6000/powerpc-64l.dat
index 10f43b16241..b304c614e4d 100644
--- a/gdb/regformats/rs6000/powerpc-64l.dat
+++ b/gdb/regformats/rs6000/powerpc-64l.dat
@@ -3,6 +3,7 @@
name:powerpc_64l
xmltarget:powerpc-64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-altivec32l.dat b/gdb/regformats/rs6000/powerpc-altivec32l.dat
index c792a2f9616..3b1740bf041 100644
--- a/gdb/regformats/rs6000/powerpc-altivec32l.dat
+++ b/gdb/regformats/rs6000/powerpc-altivec32l.dat
@@ -3,6 +3,7 @@
name:powerpc_altivec32l
xmltarget:powerpc-altivec32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-altivec64l.dat b/gdb/regformats/rs6000/powerpc-altivec64l.dat
index a806141b6ee..6cd79eaf37a 100644
--- a/gdb/regformats/rs6000/powerpc-altivec64l.dat
+++ b/gdb/regformats/rs6000/powerpc-altivec64l.dat
@@ -3,6 +3,7 @@
name:powerpc_altivec64l
xmltarget:powerpc-altivec64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-e500l.dat b/gdb/regformats/rs6000/powerpc-e500l.dat
index 750eafed7ca..44d96d1478e 100644
--- a/gdb/regformats/rs6000/powerpc-e500l.dat
+++ b/gdb/regformats/rs6000/powerpc-e500l.dat
@@ -3,6 +3,7 @@
name:powerpc_e500l
xmltarget:powerpc-e500l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-32l.dat b/gdb/regformats/rs6000/powerpc-isa205-32l.dat
index 7227d06c977..61f06e0f142 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_32l
xmltarget:powerpc-isa205-32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-64l.dat b/gdb/regformats/rs6000/powerpc-isa205-64l.dat
index 13a72c7eb8f..bd62eb9fdfa 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_64l
xmltarget:powerpc-isa205-64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat b/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
index 051724c6132..1e9da0f9443 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_altivec32l
xmltarget:powerpc-isa205-altivec32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat b/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
index 867e8213516..7944d39e053 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_altivec64l
xmltarget:powerpc-isa205-altivec64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
index 31a7d02e95c..c0337380781 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_ppr_dscr_vsx32l
xmltarget:powerpc-isa205-ppr-dscr-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
index 74c8feb3eea..91cd86f06e0 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_ppr_dscr_vsx64l
xmltarget:powerpc-isa205-ppr-dscr-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
index fa05cae8594..72e7f6863ae 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_vsx32l
xmltarget:powerpc-isa205-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
index 75bd4539ad0..ff5e8bd62a4 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_vsx64l
xmltarget:powerpc-isa205-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
index c19416db868..8c38c537d63 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa207_htm_vsx32l
xmltarget:powerpc-isa207-htm-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
index 38359959fd7..4a4acebffe4 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa207_htm_vsx64l
xmltarget:powerpc-isa207-htm-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
index 0718d72d930..36891b3615d 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa207_vsx32l
xmltarget:powerpc-isa207-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
index 510c6c87dad..28515f7cde8 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa207_vsx64l
xmltarget:powerpc-isa207-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-vsx32l.dat b/gdb/regformats/rs6000/powerpc-vsx32l.dat
index 6db3e38d5f2..2ff89796331 100644
--- a/gdb/regformats/rs6000/powerpc-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_vsx32l
xmltarget:powerpc-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-vsx64l.dat b/gdb/regformats/rs6000/powerpc-vsx64l.dat
index bc0a45512c8..4b780382bcf 100644
--- a/gdb/regformats/rs6000/powerpc-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_vsx64l
xmltarget:powerpc-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/s390-gs-linux64.dat b/gdb/regformats/s390-gs-linux64.dat
index 130c8ecc026..ced8c8c66bc 100644
--- a/gdb/regformats/s390-gs-linux64.dat
+++ b/gdb/regformats/s390-gs-linux64.dat
@@ -3,6 +3,7 @@
name:s390_gs_linux64
xmltarget:s390-gs-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-linux32.dat b/gdb/regformats/s390-linux32.dat
index 545dd0fb915..1a494bc532e 100644
--- a/gdb/regformats/s390-linux32.dat
+++ b/gdb/regformats/s390-linux32.dat
@@ -3,6 +3,7 @@
name:s390_linux32
xmltarget:s390-linux32.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0
diff --git a/gdb/regformats/s390-linux32v1.dat b/gdb/regformats/s390-linux32v1.dat
index b9e7fc89730..9d26f2e8762 100644
--- a/gdb/regformats/s390-linux32v1.dat
+++ b/gdb/regformats/s390-linux32v1.dat
@@ -3,6 +3,7 @@
name:s390_linux32v1
xmltarget:s390-linux32v1.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0
diff --git a/gdb/regformats/s390-linux32v2.dat b/gdb/regformats/s390-linux32v2.dat
index 220af5e3dfb..33bd546404d 100644
--- a/gdb/regformats/s390-linux32v2.dat
+++ b/gdb/regformats/s390-linux32v2.dat
@@ -3,6 +3,7 @@
name:s390_linux32v2
xmltarget:s390-linux32v2.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0
diff --git a/gdb/regformats/s390-linux64.dat b/gdb/regformats/s390-linux64.dat
index b347b6bf33a..b63a932a558 100644
--- a/gdb/regformats/s390-linux64.dat
+++ b/gdb/regformats/s390-linux64.dat
@@ -3,6 +3,7 @@
name:s390_linux64
xmltarget:s390-linux64.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-linux64v1.dat b/gdb/regformats/s390-linux64v1.dat
index 8abd92d3a2e..71737fa58da 100644
--- a/gdb/regformats/s390-linux64v1.dat
+++ b/gdb/regformats/s390-linux64v1.dat
@@ -3,6 +3,7 @@
name:s390_linux64v1
xmltarget:s390-linux64v1.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-linux64v2.dat b/gdb/regformats/s390-linux64v2.dat
index b282025e238..b25fa04c457 100644
--- a/gdb/regformats/s390-linux64v2.dat
+++ b/gdb/regformats/s390-linux64v2.dat
@@ -3,6 +3,7 @@
name:s390_linux64v2
xmltarget:s390-linux64v2.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-te-linux64.dat b/gdb/regformats/s390-te-linux64.dat
index 28e1b8733eb..2c7bdb08d49 100644
--- a/gdb/regformats/s390-te-linux64.dat
+++ b/gdb/regformats/s390-te-linux64.dat
@@ -3,6 +3,7 @@
name:s390_te_linux64
xmltarget:s390-te-linux64.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-tevx-linux64.dat b/gdb/regformats/s390-tevx-linux64.dat
index 3db7a91546b..20d0b92acef 100644
--- a/gdb/regformats/s390-tevx-linux64.dat
+++ b/gdb/regformats/s390-tevx-linux64.dat
@@ -3,6 +3,7 @@
name:s390_tevx_linux64
xmltarget:s390-tevx-linux64.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-vx-linux64.dat b/gdb/regformats/s390-vx-linux64.dat
index 6a821fd5ac4..4ebb36bcedc 100644
--- a/gdb/regformats/s390-vx-linux64.dat
+++ b/gdb/regformats/s390-vx-linux64.dat
@@ -3,6 +3,7 @@
name:s390_vx_linux64
xmltarget:s390-vx-linux64.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390x-gs-linux64.dat b/gdb/regformats/s390x-gs-linux64.dat
index 8cd57515e51..9d44d89a9b8 100644
--- a/gdb/regformats/s390x-gs-linux64.dat
+++ b/gdb/regformats/s390x-gs-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_gs_linux64
xmltarget:s390x-gs-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-linux64.dat b/gdb/regformats/s390x-linux64.dat
index 5832c438f59..a393b584b2c 100644
--- a/gdb/regformats/s390x-linux64.dat
+++ b/gdb/regformats/s390x-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_linux64
xmltarget:s390x-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-linux64v1.dat b/gdb/regformats/s390x-linux64v1.dat
index 4d4de0a14cf..e5092d02131 100644
--- a/gdb/regformats/s390x-linux64v1.dat
+++ b/gdb/regformats/s390x-linux64v1.dat
@@ -3,6 +3,7 @@
name:s390x_linux64v1
xmltarget:s390x-linux64v1.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-linux64v2.dat b/gdb/regformats/s390x-linux64v2.dat
index b1c5f830231..7f097d5e1a3 100644
--- a/gdb/regformats/s390x-linux64v2.dat
+++ b/gdb/regformats/s390x-linux64v2.dat
@@ -3,6 +3,7 @@
name:s390x_linux64v2
xmltarget:s390x-linux64v2.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-te-linux64.dat b/gdb/regformats/s390x-te-linux64.dat
index 80f5ab127ee..2f8a7529ef7 100644
--- a/gdb/regformats/s390x-te-linux64.dat
+++ b/gdb/regformats/s390x-te-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_te_linux64
xmltarget:s390x-te-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-tevx-linux64.dat b/gdb/regformats/s390x-tevx-linux64.dat
index 2df31e68632..2624b6406f9 100644
--- a/gdb/regformats/s390x-tevx-linux64.dat
+++ b/gdb/regformats/s390x-tevx-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_tevx_linux64
xmltarget:s390x-tevx-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-vx-linux64.dat b/gdb/regformats/s390x-vx-linux64.dat
index 1d8f2b6f043..7548e022880 100644
--- a/gdb/regformats/s390x-vx-linux64.dat
+++ b/gdb/regformats/s390x-vx-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_vx_linux64
xmltarget:s390x-vx-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/tic6x-c62x-linux.dat b/gdb/regformats/tic6x-c62x-linux.dat
index 98ca39e1103..0818ace3cbb 100644
--- a/gdb/regformats/tic6x-c62x-linux.dat
+++ b/gdb/regformats/tic6x-c62x-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c62x_linux
feature:1
xmltarget:tic6x-c62x-linux.xml
expedite:A15,PC
+osabi:GNU/Linux
32:A0
32:A1
32:A2
diff --git a/gdb/regformats/tic6x-c64x-linux.dat b/gdb/regformats/tic6x-c64x-linux.dat
index 91e84baebc1..fafa53a4004 100644
--- a/gdb/regformats/tic6x-c64x-linux.dat
+++ b/gdb/regformats/tic6x-c64x-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c64x_linux
feature:1
xmltarget:tic6x-c64x-linux.xml
expedite:A15,PC
+osabi:GNU/Linux
32:A0
32:A1
32:A2
diff --git a/gdb/regformats/tic6x-c64xp-linux.dat b/gdb/regformats/tic6x-c64xp-linux.dat
index a3fa3b7cd40..56fc3d78c20 100644
--- a/gdb/regformats/tic6x-c64xp-linux.dat
+++ b/gdb/regformats/tic6x-c64xp-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c64xp_linux
feature:1
xmltarget:tic6x-c64xp-linux.xml
expedite:A15,PC
+osabi:GNU/Linux
32:A0
32:A1
32:A2
--
2.25.4
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCHv4 3/3] gdbserver: pass osabi to GDB in more target descriptions
2024-10-15 14:05 ` [PATCHv4 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
2024-10-15 14:05 ` [PATCHv4 1/3] gdb/features: set osabi in all Linux related features/*.xml files Andrew Burgess
2024-10-15 14:05 ` [PATCHv4 2/3] gdb/regformats: add osabi information to generated .dat files Andrew Burgess
@ 2024-10-15 14:05 ` Andrew Burgess
2024-10-27 20:07 ` [PATCHv5 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
3 siblings, 0 replies; 17+ messages in thread
From: Andrew Burgess @ 2024-10-15 14:05 UTC (permalink / raw)
To: gdb-patches; +Cc: Andrew Burgess
Problem Description
-------------------
On a Windows machine I built gdbserver, configured for the target
'x86_64-w64-mingw32', then on a GNU/Linux machine I built GDB with
support for all target (--enable-targets=all).
On the Windows machine I start gdbserver with a small test binary:
$ gdbserver 192.168.129.25:54321 C:\some\directory\executable.exe
On the GNU/Linux machine I start GDB without the test binary, and
connect to gdbserver.
As I have not given GDB the test binary, my expectation is that GDB
would connect to gdbserver and then download the file over the remote
protocol, but instead I was presented with this message:
(gdb) target remote 192.168.129.25:54321
Remote debugging using 192.168.129.25:54321
warning: C:\some\directory\executable.exe: No such file or directory.
0x00007ffa3e1e1741 in ?? ()
(gdb)
What I found is that if I told GDB where to find the binary, like
this:
(gdb) file target:C:/some/directory/executable.exe
A program is being debugged already.
Are you sure you want to change the file? (y or n) y
Reading C:/some/directory/executable.exe from remote target...
warning: File transfers from remote targets can be slow. Use "set sysroot" to access files locally instead.
Reading C:/some/directory/executable.exe from remote target...
Reading symbols from target:C:/some/directory/executable.exe...
(gdb)
then GDB would download the executable.
The Actual Issue
----------------
I tracked the problem down to exec_file_find (solib.c). The remote
target was passing an absolute Windows filename (beginning with "C:/"
in this case), but in exec_file_find GDB was failing the
IS_TARGET_ABSOLUTE_PATH call, and so was treating the filename as
relative.
The IS_TARGET_ABSOLUTE_PATH call was failing because GDB thought that
the file system kind was "unix", and as the filename didn't start with
a "/" it assumed the filename was not absolute.
But I'm connecting to a Windows target and 'target-file-system-kind'
was set to "auto", so GDB should be figuring out that the target
file-system is "dos-based".
Looking in effective_target_file_system_kind (filesystem.c), we find
that the logic of "auto" is delegated to the current gdbarch. However
in windows-tdep.c we see:
set_gdbarch_has_dos_based_file_system (gdbarch, 1);
So if we are using a Windows gdbarch we should have "dos-based"
filesystems. What this means is that after connecting to the remote
target GDB has selected the wrong gdbarch.
What's happening is that the target description sent back by the
remote target only includes the x86-64 registers. There's no
information about which OS we're on. As a consequence, GDB picks the
first x86-64 gdbarch which can handle the provided register set, which
happens to be a GNU/Linux gdbarch.
And indeed, there doesn't appear to be anywhere in gdbserver that sets
the osabi on the target descriptions. Some target descriptions do have
their osabi set when the description is created, e.g. in:
gdb/arch/amd64.c - Sets GNU/Linux osabi when appropriate.
gdb/arch/i386.c - Likewise.
gdb/arch/tic6x.c - Always set GNU/Linux osabi.
There are also some cases in gdb/features/*.c where the tdesc is set,
but these locations are only called from GDB, not from gdbserver.
This means that many target descriptions are created without an osabi,
gdbserver does nothing to fix this, and the description is returned to
GDB without an osabi included. This leaves GDB having to guess what
the target osabi is, and in some cases, GDB can get this wrong.
Proposed Solution
-----------------
I propose to change init_target_desc so that it requires an gdb_osabi
to be passed in, this will then be used to set the target_desc osabi
field.
I believe that within gdbserver init_target_desc is called for every
target_desc, so this should mean that every target_desc has an
opportunity to set the osabi to something sane.
I did consider passing the osabi into the code which creates the
target_desc objects, but that would require updating far more code, as
each target has its own code for creating target descriptions.
The approach taken here requires minimal changes and forces every
user of init_target_desc to think about what the correct osabi is.
In some cases, e.g. amd64, where the osabi is already set when the
target_desc is created, the init_target_desc call will override the
current value, however, we should always be replacing it with the same
actual value. i.e. if the target_desc is created with the osabi set
to GNU/Linux, then this should only happen when gdbserver is built for
GNU/Linux, in which case the init_target_desc should also be setting
the osabi to GNU/Linux.
The Tricky Bits
---------------
Some targets, like amd64, use a features based approach for creating
target_desc objects, there's a function in arch/amd64.c which creates
a target_desc, adds features too it, and returns the new target_desc.
This target_desc is then passed to an init_target_desc call within
gdbserver. This is the easy case to handle.
Then there are other targets which instead have a fixed set of xml
files, each of which is converted into a .dat file, which is then used
to generate a .cc file, which is compiled into gdbserver. The
generated .cc file creates the target_desc object and calls
init_target_desc on it. In this case though the target description
that is sent to GDB isn't generated from the target_desc object, but
is instead the contents of the fixed xml file. For this case the
osabi which we pass to init_target_desc should match the osabi that
exists in the fixed xml file.
Luckily, in the previous commit I copied the osabi information from
the fixed xml files into the .dat files. So in this commit I have
extended regdat.sh to read the osabi from the .dat file and use it in
the generated init_target_desc call.
The problem with some of these .dat base targets is that their fixed
xml files don't currently contain any osabi information, and the file
names don't indicate that they are Linux only (despite them currently
only being used from gdbserver for Linux targets), so I don't
currently feel confident adding any osabi information to these files.
An example would be features/rs6000/powerpc-64.xml. For now I've just
ignored these cases. The init_target_desc will use GDB_OSABI_UNKNOWN
which is the default. This means that for these targets nothing
changes from the current behaviour. But many other targets do now
pass the osabi back. Targets that do pass the osabi back are
improved with this commit.
Conclusion
----------
Now when I connect to the Windows remote the target description
returned includes the osabi name. With this extra information GDB
selects the correct gdbarch object, which means that GDB understands
the target has a "dos-based" file-system. With that correct GDB
understands that the filename it was given is absolute, and so fetches
the file from the remote as we'd like.
---
gdb/regformats/regdat.sh | 14 ++++++++++----
gdbserver/Makefile.in | 9 +++++----
gdbserver/linux-aarch32-tdesc.cc | 2 +-
gdbserver/linux-aarch64-tdesc.cc | 3 ++-
gdbserver/linux-arc-low.cc | 2 +-
gdbserver/linux-arm-tdesc.cc | 2 +-
gdbserver/linux-csky-low.cc | 2 +-
gdbserver/linux-loongarch-low.cc | 2 +-
gdbserver/linux-riscv-low.cc | 2 +-
gdbserver/linux-x86-tdesc.cc | 15 +++++++++++++--
gdbserver/netbsd-aarch64-low.cc | 2 +-
gdbserver/netbsd-amd64-low.cc | 2 +-
gdbserver/netbsd-i386-low.cc | 2 +-
gdbserver/tdesc.cc | 5 ++++-
gdbserver/tdesc.h | 6 ++++--
gdbserver/win32-i386-low.cc | 4 ++--
gdbserver/win32-low.h | 7 +++++++
17 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh
index 38464c65b06..49aa02a466d 100755
--- a/gdb/regformats/regdat.sh
+++ b/gdb/regformats/regdat.sh
@@ -105,7 +105,7 @@ EOF
}
-exec > new-$2
+exec > new-$3
copyright $1
echo '#include "regdef.h"'
echo '#include "tdesc.h"'
@@ -118,6 +118,7 @@ xmlarch=x
xmlosabi=x
expedite=x
feature=x
+osabi=unknown
exec < $1
while do_read
do
@@ -143,7 +144,7 @@ do
elif test "${type}" = "xmlarch"; then
xmlarch="${entry}"
continue
- elif test "${type}" = "osabi"; then
+ elif test "${type}" = "xmlosabi"; then
xmlosabi="${entry}"
continue
elif test "${type}" = "expedite"; then
@@ -152,6 +153,9 @@ do
elif test "${type}" = "feature"; then
feature="${entry}"
continue
+ elif test "${type}" = "osabi"; then
+ osabi="${entry}"
+ continue
elif test "${name}" = x; then
echo "$0: $1 does not specify \`\`name''." 1>&2
exit 1
@@ -188,11 +192,13 @@ else
fi
echo
+osabi_enum=$(grep "${osabi}" "$2" | sed 's/.*(\([^,]\+\),.*/GDB_OSABI_\1/')
+
cat <<EOF
result->xmltarget = xmltarget_${name};
#endif
- init_target_desc (result, expedite_regs_${name});
+ init_target_desc (result, expedite_regs_${name}, ${osabi_enum});
tdesc_${name} = result;
}
@@ -200,4 +206,4 @@ EOF
# close things off
exec 1>&2
-mv -- "new-$2" "$2"
+mv -- "new-$3" "$3"
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 6148ccf9121..f555ff439c4 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -488,6 +488,7 @@ stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES)
MAKEOVERRIDES =
regdat_sh = $(srcdir)/../gdb/regformats/regdat.sh
+osabi_def = $(srcdir)/../gdbsupport/osabi.def
UST_CFLAGS = \
$(ustinc) \
@@ -588,11 +589,11 @@ target/%.o: ../gdb/target/%.c
# Rules for register format descriptions. Suffix destination files with
# -generated to identify and clean them easily.
-%-generated.cc: ../gdb/regformats/%.dat $(regdat_sh)
- $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
+%-generated.cc: ../gdb/regformats/%.dat $(osabi_def) $(regdat_sh)
+ $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $(osabi_def) $@
-%-generated.cc: ../gdb/regformats/rs6000/%.dat $(regdat_sh)
- $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
+%-generated.cc: ../gdb/regformats/rs6000/%.dat $(osabi_def) $(regdat_sh)
+ $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $(osabi_def) $@
# Rule for gdbreplay.o. This is the same as COMPILE, but includes common-defs.h
# instead of server.h.
diff --git a/gdbserver/linux-aarch32-tdesc.cc b/gdbserver/linux-aarch32-tdesc.cc
index b8987752b9f..441fe668e6a 100644
--- a/gdbserver/linux-aarch32-tdesc.cc
+++ b/gdbserver/linux-aarch32-tdesc.cc
@@ -34,7 +34,7 @@ aarch32_linux_read_description ()
tdesc_aarch32 = aarch32_create_target_description (false);
static const char *expedite_regs[] = { "r11", "sp", "pc", 0 };
- init_target_desc (tdesc_aarch32, expedite_regs);
+ init_target_desc (tdesc_aarch32, expedite_regs, GDB_OSABI_LINUX);
}
return tdesc_aarch32;
}
diff --git a/gdbserver/linux-aarch64-tdesc.cc b/gdbserver/linux-aarch64-tdesc.cc
index 31ec7854cc0..39d5bccdce1 100644
--- a/gdbserver/linux-aarch64-tdesc.cc
+++ b/gdbserver/linux-aarch64-tdesc.cc
@@ -67,7 +67,8 @@ aarch64_linux_read_description (const aarch64_features &features)
expedited_registers.push_back (nullptr);
- init_target_desc (tdesc, (const char **) expedited_registers.data ());
+ init_target_desc (tdesc, (const char **) expedited_registers.data (),
+ GDB_OSABI_LINUX);
tdesc_aarch64_map[features] = tdesc;
}
diff --git a/gdbserver/linux-arc-low.cc b/gdbserver/linux-arc-low.cc
index 1bcaf6c3f91..16d8d5824aa 100644
--- a/gdbserver/linux-arc-low.cc
+++ b/gdbserver/linux-arc-low.cc
@@ -114,7 +114,7 @@ arc_linux_read_description (void)
target_desc_up tdesc = arc_create_target_description (features);
static const char *expedite_regs[] = { "sp", "status32", nullptr };
- init_target_desc (tdesc.get (), expedite_regs);
+ init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
return tdesc.release ();
}
diff --git a/gdbserver/linux-arm-tdesc.cc b/gdbserver/linux-arm-tdesc.cc
index 559f9b0f3dc..fff2e948f81 100644
--- a/gdbserver/linux-arm-tdesc.cc
+++ b/gdbserver/linux-arm-tdesc.cc
@@ -37,7 +37,7 @@ arm_linux_read_description (arm_fp_type fp_type)
tdesc = arm_create_target_description (fp_type, false);
static const char *expedite_regs[] = { "r11", "sp", "pc", 0 };
- init_target_desc (tdesc, expedite_regs);
+ init_target_desc (tdesc, expedite_regs, GDB_OSABI_LINUX);
tdesc_arm_list[fp_type] = tdesc;
}
diff --git a/gdbserver/linux-csky-low.cc b/gdbserver/linux-csky-low.cc
index 2eb5a2df17b..18a0d152b5a 100644
--- a/gdbserver/linux-csky-low.cc
+++ b/gdbserver/linux-csky-low.cc
@@ -133,7 +133,7 @@ csky_target::low_arch_setup ()
if (tdesc->expedite_regs.empty ())
{
- init_target_desc (tdesc.get (), expedite_regs);
+ init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
gdb_assert (!tdesc->expedite_regs.empty ());
}
diff --git a/gdbserver/linux-loongarch-low.cc b/gdbserver/linux-loongarch-low.cc
index 584ea64a7d9..cf7d6c0743c 100644
--- a/gdbserver/linux-loongarch-low.cc
+++ b/gdbserver/linux-loongarch-low.cc
@@ -85,7 +85,7 @@ loongarch_target::low_arch_setup ()
if (tdesc->expedite_regs.empty ())
{
- init_target_desc (tdesc.get (), expedite_regs);
+ init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
gdb_assert (!tdesc->expedite_regs.empty ());
}
current_process ()->tdesc = tdesc.release ();
diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc
index c4554c507a8..7170ad9922e 100644
--- a/gdbserver/linux-riscv-low.cc
+++ b/gdbserver/linux-riscv-low.cc
@@ -91,7 +91,7 @@ riscv_target::low_arch_setup ()
if (tdesc->expedite_regs.empty ())
{
- init_target_desc (tdesc.get (), expedite_regs);
+ init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
gdb_assert (!tdesc->expedite_regs.empty ());
}
diff --git a/gdbserver/linux-x86-tdesc.cc b/gdbserver/linux-x86-tdesc.cc
index 13c80762605..6aa5c4ab970 100644
--- a/gdbserver/linux-x86-tdesc.cc
+++ b/gdbserver/linux-x86-tdesc.cc
@@ -26,10 +26,21 @@
void
x86_linux_post_init_tdesc (target_desc *tdesc, bool is_64bit)
{
+ enum gdb_osabi osabi = GDB_OSABI_LINUX;
+
+#ifndef IN_PROCESS_AGENT
+ /* x86 target descriptions are created with the osabi already set.
+ However, init_target_desc requires us to override the already set
+ value. That's fine, out new string should match the old one. */
+ gdb_assert (tdesc_osabi_name (tdesc) != nullptr);
+ gdb_assert (strcmp (tdesc_osabi_name (tdesc),
+ gdbarch_osabi_name (osabi)) == 0);
+#endif /* ! IN_PROCESS_AGENT */
+
#ifdef __x86_64__
if (is_64bit)
- init_target_desc (tdesc, amd64_expedite_regs);
+ init_target_desc (tdesc, amd64_expedite_regs, osabi);
else
#endif
- init_target_desc (tdesc, i386_expedite_regs);
+ init_target_desc (tdesc, i386_expedite_regs, osabi);
}
diff --git a/gdbserver/netbsd-aarch64-low.cc b/gdbserver/netbsd-aarch64-low.cc
index f20a1a71773..8834e0ad894 100644
--- a/gdbserver/netbsd-aarch64-low.cc
+++ b/gdbserver/netbsd-aarch64-low.cc
@@ -98,7 +98,7 @@ netbsd_aarch64_target::low_arch_setup ()
= aarch64_create_target_description ({});
static const char *expedite_regs_aarch64[] = { "x29", "sp", "pc", NULL };
- init_target_desc (tdesc, expedite_regs_aarch64);
+ init_target_desc (tdesc, expedite_regs_aarch64, GDB_OSABI_NETBSD);
current_process ()->tdesc = tdesc;
}
diff --git a/gdbserver/netbsd-amd64-low.cc b/gdbserver/netbsd-amd64-low.cc
index b3f3aab5ec3..ad7cb430b92 100644
--- a/gdbserver/netbsd-amd64-low.cc
+++ b/gdbserver/netbsd-amd64-low.cc
@@ -193,7 +193,7 @@ netbsd_amd64_target::low_arch_setup ()
target_desc *tdesc
= amd64_create_target_description (X86_XSTATE_SSE_MASK, false, false, false);
- init_target_desc (tdesc, amd64_expedite_regs);
+ init_target_desc (tdesc, amd64_expedite_regs, GDB_OSABI_NETBSD);
current_process ()->tdesc = tdesc;
}
diff --git a/gdbserver/netbsd-i386-low.cc b/gdbserver/netbsd-i386-low.cc
index 247a39797c4..ea6fce4c6f9 100644
--- a/gdbserver/netbsd-i386-low.cc
+++ b/gdbserver/netbsd-i386-low.cc
@@ -142,7 +142,7 @@ netbsd_i386_target::low_arch_setup ()
target_desc *tdesc
= i386_create_target_description (X86_XSTATE_SSE_MASK, false, false);
- init_target_desc (tdesc, i386_expedite_regs);
+ init_target_desc (tdesc, i386_expedite_regs, GDB_OSABI_NETBSD);
current_process ()->tdesc = tdesc;
}
diff --git a/gdbserver/tdesc.cc b/gdbserver/tdesc.cc
index d052f43c76e..da1287abbbe 100644
--- a/gdbserver/tdesc.cc
+++ b/gdbserver/tdesc.cc
@@ -53,7 +53,8 @@ void target_desc::accept (tdesc_element_visitor &v) const
void
init_target_desc (struct target_desc *tdesc,
- const char **expedite_regs)
+ const char **expedite_regs,
+ enum gdb_osabi osabi)
{
int offset = 0;
@@ -88,6 +89,8 @@ init_target_desc (struct target_desc *tdesc,
int expedite_count = 0;
while (expedite_regs[expedite_count] != nullptr)
tdesc->expedite_regs.push_back (expedite_regs[expedite_count++]);
+
+ set_tdesc_osabi (tdesc, osabi);
#endif
}
diff --git a/gdbserver/tdesc.h b/gdbserver/tdesc.h
index 4796b50b4d1..9264786de51 100644
--- a/gdbserver/tdesc.h
+++ b/gdbserver/tdesc.h
@@ -20,6 +20,7 @@
#define GDBSERVER_TDESC_H
#include "gdbsupport/tdesc.h"
+#include "gdbsupport/osabi.h"
#include "regdef.h"
#include <vector>
@@ -81,10 +82,11 @@ void copy_target_description (struct target_desc *dest,
const struct target_desc *src);
/* Initialize TDESC, and then set its expedite_regs field to
- EXPEDITE_REGS. */
+ EXPEDITE_REGS and its osabi to OSABI. */
void init_target_desc (struct target_desc *tdesc,
- const char **expedite_regs);
+ const char **expedite_regs,
+ enum gdb_osabi osabi);
/* Return the current inferior's target description. Never returns
NULL. */
diff --git a/gdbserver/win32-i386-low.cc b/gdbserver/win32-i386-low.cc
index 0a761ca58ef..13f9aca99b1 100644
--- a/gdbserver/win32-i386-low.cc
+++ b/gdbserver/win32-i386-low.cc
@@ -596,12 +596,12 @@ i386_arch_setup (void)
#ifdef __x86_64__
tdesc = amd64_create_target_description (X86_XSTATE_SSE_MASK, false,
false, false);
- init_target_desc (tdesc, amd64_expedite_regs);
+ init_target_desc (tdesc, amd64_expedite_regs, WINDOWS_OSABI);
win32_tdesc = tdesc;
#endif
tdesc = i386_create_target_description (X86_XSTATE_SSE_MASK, false, false);
- init_target_desc (tdesc, i386_expedite_regs);
+ init_target_desc (tdesc, i386_expedite_regs, WINDOWS_OSABI);
#ifdef __x86_64__
wow64_win32_tdesc = tdesc;
#else
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index ff997df0a66..daed16a6ae6 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -21,6 +21,7 @@
#include <windows.h>
#include "nat/windows-nat.h"
+#include "gdbsupport/osabi.h"
struct target_desc;
@@ -31,6 +32,12 @@ extern const struct target_desc *win32_tdesc;
extern const struct target_desc *wow64_win32_tdesc;
#endif
+#ifdef __CYGWIN__
+constexpr enum gdb_osabi WINDOWS_OSABI = GDB_OSABI_CYGWIN;
+#else
+constexpr enum gdb_osabi WINDOWS_OSABI = GDB_OSABI_WINDOWS;
+#endif
+
struct win32_target_ops
{
/* Architecture-specific setup. */
--
2.25.4
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCHv5 0/3] Returning osabi from gdbserer in more cases
2024-10-15 14:05 ` [PATCHv4 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
` (2 preceding siblings ...)
2024-10-15 14:05 ` [PATCHv4 3/3] gdbserver: pass osabi to GDB in more target descriptions Andrew Burgess
@ 2024-10-27 20:07 ` Andrew Burgess
2024-10-27 20:07 ` [PATCHv5 1/3] gdb/features: set osabi in all Linux related features/*.xml files Andrew Burgess
` (2 more replies)
3 siblings, 3 replies; 17+ messages in thread
From: Andrew Burgess @ 2024-10-27 20:07 UTC (permalink / raw)
To: gdb-patches; +Cc: Andrew Burgess
In v5:
- Rebased to current HEAD.
- Retested.
In v4:
- Updated a default value of osabi in gdb/regformats/regdat.sh in
patch #3 which fixed a build failure highlighted by the sourceware
CI testing.
- Rebased onto current master.
---
This series replaces patch #5 which I posted here:
https://inbox.sourceware.org/gdb-patches/77fa25e6f6fd213f89ebceb7c1fcf33010cc8e39.1728407374.git.aburgess@redhat.com
I did merge that patch, but then CI testing flagged build errors on a
number of targets.
Unfortunately I'd overlooked that we have two ways of creating
target_desc objects within gdbserver. The (I think) older approach
that uses fixed xml files, and the newer (I think) features based
approach.
My changes handled the features based approach, but completely
overlooked the fixed xml file approach.
This series should fix that oversight.
Patches #1 and #2 do some prep work.
Then patch #3 makes the important change. The general approach is
unchange from my original attempt, but thanks to the groundwork in the
first two patches I'm now able to also update the fixed xml file
targets too.
I have done some testing of this version on a couple of targets that
use the fixed xml approach, so I'm pretty confident this is now OK.
But I have also pushed a try- branch for some additional confidence.
Thanks,
Andrew
---
Andrew Burgess (3):
gdb/features: set osabi in all Linux related features/*.xml files
gdb/regformats: add osabi information to generated .dat files
gdbserver: pass osabi to GDB in more target descriptions
gdb/features/Makefile | 2 +
gdb/features/mips64-dsp-linux.c | 2 +
gdb/features/mips64-dsp-linux.xml | 1 +
gdb/features/mips64-linux.c | 2 +
gdb/features/mips64-linux.xml | 1 +
gdb/features/print-osabi.xsl | 39 +++++++++++++++++++
gdb/features/s390-gs-linux64.c | 2 +
gdb/features/s390-gs-linux64.xml | 1 +
gdb/features/s390-linux32.c | 2 +
gdb/features/s390-linux32.xml | 1 +
gdb/features/s390-linux32v1.c | 2 +
gdb/features/s390-linux32v1.xml | 1 +
gdb/features/s390-linux32v2.c | 2 +
gdb/features/s390-linux32v2.xml | 1 +
gdb/features/s390-linux64.c | 2 +
gdb/features/s390-linux64.xml | 1 +
gdb/features/s390-linux64v1.c | 2 +
gdb/features/s390-linux64v1.xml | 1 +
gdb/features/s390-linux64v2.c | 2 +
gdb/features/s390-linux64v2.xml | 1 +
gdb/features/s390-te-linux64.c | 2 +
gdb/features/s390-te-linux64.xml | 1 +
gdb/features/s390-tevx-linux64.c | 2 +
gdb/features/s390-tevx-linux64.xml | 1 +
gdb/features/s390-vx-linux64.c | 2 +
gdb/features/s390-vx-linux64.xml | 1 +
gdb/features/s390x-gs-linux64.c | 2 +
gdb/features/s390x-gs-linux64.xml | 1 +
gdb/features/s390x-linux64.c | 2 +
gdb/features/s390x-linux64.xml | 1 +
gdb/features/s390x-linux64v1.c | 2 +
gdb/features/s390x-linux64v1.xml | 1 +
gdb/features/s390x-linux64v2.c | 2 +
gdb/features/s390x-linux64v2.xml | 1 +
gdb/features/s390x-te-linux64.c | 2 +
gdb/features/s390x-te-linux64.xml | 1 +
gdb/features/s390x-tevx-linux64.c | 2 +
gdb/features/s390x-tevx-linux64.xml | 1 +
gdb/features/s390x-vx-linux64.c | 2 +
gdb/features/s390x-vx-linux64.xml | 1 +
gdb/regformats/mips-dsp-linux.dat | 1 +
gdb/regformats/mips-linux.dat | 1 +
gdb/regformats/mips64-dsp-linux.dat | 1 +
gdb/regformats/mips64-linux.dat | 1 +
gdb/regformats/nios2-linux.dat | 1 +
gdb/regformats/or1k-linux.dat | 1 +
gdb/regformats/regdat.sh | 14 +++++--
gdb/regformats/rs6000/powerpc-32.dat | 1 +
gdb/regformats/rs6000/powerpc-32l.dat | 1 +
gdb/regformats/rs6000/powerpc-64l.dat | 1 +
gdb/regformats/rs6000/powerpc-altivec32l.dat | 1 +
gdb/regformats/rs6000/powerpc-altivec64l.dat | 1 +
gdb/regformats/rs6000/powerpc-e500l.dat | 1 +
gdb/regformats/rs6000/powerpc-isa205-32l.dat | 1 +
gdb/regformats/rs6000/powerpc-isa205-64l.dat | 1 +
.../rs6000/powerpc-isa205-altivec32l.dat | 1 +
.../rs6000/powerpc-isa205-altivec64l.dat | 1 +
.../rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat | 1 +
.../rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat | 1 +
.../rs6000/powerpc-isa205-vsx32l.dat | 1 +
.../rs6000/powerpc-isa205-vsx64l.dat | 1 +
.../rs6000/powerpc-isa207-htm-vsx32l.dat | 1 +
.../rs6000/powerpc-isa207-htm-vsx64l.dat | 1 +
.../rs6000/powerpc-isa207-vsx32l.dat | 1 +
.../rs6000/powerpc-isa207-vsx64l.dat | 1 +
gdb/regformats/rs6000/powerpc-vsx32l.dat | 1 +
gdb/regformats/rs6000/powerpc-vsx64l.dat | 1 +
gdb/regformats/s390-gs-linux64.dat | 1 +
gdb/regformats/s390-linux32.dat | 1 +
gdb/regformats/s390-linux32v1.dat | 1 +
gdb/regformats/s390-linux32v2.dat | 1 +
gdb/regformats/s390-linux64.dat | 1 +
gdb/regformats/s390-linux64v1.dat | 1 +
gdb/regformats/s390-linux64v2.dat | 1 +
gdb/regformats/s390-te-linux64.dat | 1 +
gdb/regformats/s390-tevx-linux64.dat | 1 +
gdb/regformats/s390-vx-linux64.dat | 1 +
gdb/regformats/s390x-gs-linux64.dat | 1 +
gdb/regformats/s390x-linux64.dat | 1 +
gdb/regformats/s390x-linux64v1.dat | 1 +
gdb/regformats/s390x-linux64v2.dat | 1 +
gdb/regformats/s390x-te-linux64.dat | 1 +
gdb/regformats/s390x-tevx-linux64.dat | 1 +
gdb/regformats/s390x-vx-linux64.dat | 1 +
gdb/regformats/tic6x-c62x-linux.dat | 1 +
gdb/regformats/tic6x-c64x-linux.dat | 1 +
gdb/regformats/tic6x-c64xp-linux.dat | 1 +
gdbserver/Makefile.in | 9 +++--
gdbserver/linux-aarch32-tdesc.cc | 2 +-
gdbserver/linux-aarch64-tdesc.cc | 3 +-
gdbserver/linux-arc-low.cc | 2 +-
gdbserver/linux-arm-tdesc.cc | 2 +-
gdbserver/linux-csky-low.cc | 2 +-
gdbserver/linux-loongarch-low.cc | 2 +-
gdbserver/linux-riscv-low.cc | 2 +-
gdbserver/linux-x86-tdesc.cc | 15 ++++++-
gdbserver/netbsd-aarch64-low.cc | 2 +-
gdbserver/netbsd-amd64-low.cc | 2 +-
gdbserver/netbsd-i386-low.cc | 2 +-
gdbserver/tdesc.cc | 5 ++-
gdbserver/tdesc.h | 6 ++-
gdbserver/win32-i386-low.cc | 4 +-
gdbserver/win32-low.h | 7 ++++
103 files changed, 200 insertions(+), 25 deletions(-)
create mode 100644 gdb/features/print-osabi.xsl
base-commit: a723c56efb07c4f8b3f6a3ed4b878a2f8f5572cc
--
2.25.4
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCHv5 1/3] gdb/features: set osabi in all Linux related features/*.xml files
2024-10-27 20:07 ` [PATCHv5 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
@ 2024-10-27 20:07 ` Andrew Burgess
2024-10-31 2:17 ` Kevin Buettner
2024-10-27 20:07 ` [PATCHv5 2/3] gdb/regformats: add osabi information to generated .dat files Andrew Burgess
2024-10-27 20:07 ` [PATCHv5 3/3] gdbserver: pass osabi to GDB in more target descriptions Andrew Burgess
2 siblings, 1 reply; 17+ messages in thread
From: Andrew Burgess @ 2024-10-27 20:07 UTC (permalink / raw)
To: gdb-patches; +Cc: Andrew Burgess
Some of the top level (i.e. those that contain the <target> element)
xml files in gdb/features/ are clearly Linux only. I conclude this
based on the files names containing the string "linux".
I think that all of these files should have the <osabi> element
included with the value "GNU/Linux".
This commits adds the <osabi> element where I believe it is
appropriate and regenerates the associated .c files.
The benefit of this change is that gdbserver, which makes use of these
files, will now send the osabi back in more cases. Sending back more
descriptive target descriptions is a good thing as this makes it
easier for GDB to select the correct gdbarch.
---
gdb/features/mips64-dsp-linux.c | 2 ++
gdb/features/mips64-dsp-linux.xml | 1 +
gdb/features/mips64-linux.c | 2 ++
gdb/features/mips64-linux.xml | 1 +
gdb/features/s390-gs-linux64.c | 2 ++
gdb/features/s390-gs-linux64.xml | 1 +
gdb/features/s390-linux32.c | 2 ++
gdb/features/s390-linux32.xml | 1 +
gdb/features/s390-linux32v1.c | 2 ++
gdb/features/s390-linux32v1.xml | 1 +
gdb/features/s390-linux32v2.c | 2 ++
gdb/features/s390-linux32v2.xml | 1 +
gdb/features/s390-linux64.c | 2 ++
gdb/features/s390-linux64.xml | 1 +
gdb/features/s390-linux64v1.c | 2 ++
gdb/features/s390-linux64v1.xml | 1 +
gdb/features/s390-linux64v2.c | 2 ++
gdb/features/s390-linux64v2.xml | 1 +
gdb/features/s390-te-linux64.c | 2 ++
gdb/features/s390-te-linux64.xml | 1 +
gdb/features/s390-tevx-linux64.c | 2 ++
gdb/features/s390-tevx-linux64.xml | 1 +
gdb/features/s390-vx-linux64.c | 2 ++
gdb/features/s390-vx-linux64.xml | 1 +
gdb/features/s390x-gs-linux64.c | 2 ++
gdb/features/s390x-gs-linux64.xml | 1 +
gdb/features/s390x-linux64.c | 2 ++
gdb/features/s390x-linux64.xml | 1 +
gdb/features/s390x-linux64v1.c | 2 ++
gdb/features/s390x-linux64v1.xml | 1 +
gdb/features/s390x-linux64v2.c | 2 ++
gdb/features/s390x-linux64v2.xml | 1 +
gdb/features/s390x-te-linux64.c | 2 ++
gdb/features/s390x-te-linux64.xml | 1 +
gdb/features/s390x-tevx-linux64.c | 2 ++
gdb/features/s390x-tevx-linux64.xml | 1 +
gdb/features/s390x-vx-linux64.c | 2 ++
gdb/features/s390x-vx-linux64.xml | 1 +
38 files changed, 57 insertions(+)
diff --git a/gdb/features/mips64-dsp-linux.c b/gdb/features/mips64-dsp-linux.c
index 7ea0bb704f4..646f5487f49 100644
--- a/gdb/features/mips64-dsp-linux.c
+++ b/gdb/features/mips64-dsp-linux.c
@@ -11,6 +11,8 @@ initialize_tdesc_mips64_dsp_linux (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("mips"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.mips.cpu");
diff --git a/gdb/features/mips64-dsp-linux.xml b/gdb/features/mips64-dsp-linux.xml
index 69518e496c4..6c108555490 100644
--- a/gdb/features/mips64-dsp-linux.xml
+++ b/gdb/features/mips64-dsp-linux.xml
@@ -8,6 +8,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>mips</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="mips64-cpu.xml"/>
<xi:include href="mips64-cp0.xml"/>
<xi:include href="mips64-fpu.xml"/>
diff --git a/gdb/features/mips64-linux.c b/gdb/features/mips64-linux.c
index f4dcf8bc109..98b3d34448d 100644
--- a/gdb/features/mips64-linux.c
+++ b/gdb/features/mips64-linux.c
@@ -11,6 +11,8 @@ initialize_tdesc_mips64_linux (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("mips"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.mips.cpu");
diff --git a/gdb/features/mips64-linux.xml b/gdb/features/mips64-linux.xml
index 4c99206b5bd..f861982a8e9 100644
--- a/gdb/features/mips64-linux.xml
+++ b/gdb/features/mips64-linux.xml
@@ -8,6 +8,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>mips</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="mips64-cpu.xml"/>
<xi:include href="mips64-cp0.xml"/>
<xi:include href="mips64-fpu.xml"/>
diff --git a/gdb/features/s390-gs-linux64.c b/gdb/features/s390-gs-linux64.c
index 49ea08b2c39..ab6ad6f21e3 100644
--- a/gdb/features/s390-gs-linux64.c
+++ b/gdb/features/s390-gs-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_gs_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-gs-linux64.xml b/gdb/features/s390-gs-linux64.xml
index 035e794643d..e33e8a42f6b 100644
--- a/gdb/features/s390-gs-linux64.xml
+++ b/gdb/features/s390-gs-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32.c b/gdb/features/s390-linux32.c
index 43ceb9c008e..e45321a2099 100644
--- a/gdb/features/s390-linux32.c
+++ b/gdb/features/s390-linux32.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32.xml b/gdb/features/s390-linux32.xml
index 4225e5cb120..6a51c21d07c 100644
--- a/gdb/features/s390-linux32.xml
+++ b/gdb/features/s390-linux32.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core32.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32v1.c b/gdb/features/s390-linux32v1.c
index 291784fdac7..cea14c16969 100644
--- a/gdb/features/s390-linux32v1.c
+++ b/gdb/features/s390-linux32v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32v1 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32v1.xml b/gdb/features/s390-linux32v1.xml
index 60f8ab650ea..63780765f98 100644
--- a/gdb/features/s390-linux32v1.xml
+++ b/gdb/features/s390-linux32v1.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core32.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux32v2.c b/gdb/features/s390-linux32v2.c
index 6fa26daa537..182ab2f0b60 100644
--- a/gdb/features/s390-linux32v2.c
+++ b/gdb/features/s390-linux32v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux32v2 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux32v2.xml b/gdb/features/s390-linux32v2.xml
index 58b1478ee4f..0646ce3f2e0 100644
--- a/gdb/features/s390-linux32v2.xml
+++ b/gdb/features/s390-linux32v2.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core32.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64.c b/gdb/features/s390-linux64.c
index 74c338c1fa6..8bcec095174 100644
--- a/gdb/features/s390-linux64.c
+++ b/gdb/features/s390-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64.xml b/gdb/features/s390-linux64.xml
index dcd50296983..e8d8f03eae7 100644
--- a/gdb/features/s390-linux64.xml
+++ b/gdb/features/s390-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64v1.c b/gdb/features/s390-linux64v1.c
index 0aebbdb6b7a..3a6394b513d 100644
--- a/gdb/features/s390-linux64v1.c
+++ b/gdb/features/s390-linux64v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64v1 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64v1.xml b/gdb/features/s390-linux64v1.xml
index a849e793acd..fc63a165236 100644
--- a/gdb/features/s390-linux64v1.xml
+++ b/gdb/features/s390-linux64v1.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-linux64v2.c b/gdb/features/s390-linux64v2.c
index 3b3b4916ac3..5ff9a5709ef 100644
--- a/gdb/features/s390-linux64v2.c
+++ b/gdb/features/s390-linux64v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_linux64v2 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-linux64v2.xml b/gdb/features/s390-linux64v2.xml
index 4bbfb09b2fb..3d0c9f9b210 100644
--- a/gdb/features/s390-linux64v2.xml
+++ b/gdb/features/s390-linux64v2.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-te-linux64.c b/gdb/features/s390-te-linux64.c
index d49e7441313..2abddd53bfa 100644
--- a/gdb/features/s390-te-linux64.c
+++ b/gdb/features/s390-te-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_te_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-te-linux64.xml b/gdb/features/s390-te-linux64.xml
index e141e0b789c..399053a0319 100644
--- a/gdb/features/s390-te-linux64.xml
+++ b/gdb/features/s390-te-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-tevx-linux64.c b/gdb/features/s390-tevx-linux64.c
index ffe1ddf4ee1..8e38a5cf81f 100644
--- a/gdb/features/s390-tevx-linux64.c
+++ b/gdb/features/s390-tevx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_tevx_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-tevx-linux64.xml b/gdb/features/s390-tevx-linux64.xml
index f9dc796e66d..2dbb0399b9c 100644
--- a/gdb/features/s390-tevx-linux64.xml
+++ b/gdb/features/s390-tevx-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390-vx-linux64.c b/gdb/features/s390-vx-linux64.c
index 30262a63fce..1ce5ad3671a 100644
--- a/gdb/features/s390-vx-linux64.c
+++ b/gdb/features/s390-vx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390_vx_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:31-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390-vx-linux64.xml b/gdb/features/s390-vx-linux64.xml
index fe55fb22565..6b32bf8130b 100644
--- a/gdb/features/s390-vx-linux64.xml
+++ b/gdb/features/s390-vx-linux64.xml
@@ -11,6 +11,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:31-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-gs-linux64.c b/gdb/features/s390x-gs-linux64.c
index 501b3b24061..76b8124863a 100644
--- a/gdb/features/s390x-gs-linux64.c
+++ b/gdb/features/s390x-gs-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_gs_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-gs-linux64.xml b/gdb/features/s390x-gs-linux64.xml
index 6131aaa9e38..c41e460d91c 100644
--- a/gdb/features/s390x-gs-linux64.xml
+++ b/gdb/features/s390x-gs-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64.c b/gdb/features/s390x-linux64.c
index 8655d5a6116..eb6b181f599 100644
--- a/gdb/features/s390x-linux64.c
+++ b/gdb/features/s390x-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64.xml b/gdb/features/s390x-linux64.xml
index a70f6372c25..31afe82dadc 100644
--- a/gdb/features/s390x-linux64.xml
+++ b/gdb/features/s390x-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64v1.c b/gdb/features/s390x-linux64v1.c
index 11bfd85c995..6b43f88ac84 100644
--- a/gdb/features/s390x-linux64v1.c
+++ b/gdb/features/s390x-linux64v1.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64v1 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64v1.xml b/gdb/features/s390x-linux64v1.xml
index ffc0505202e..8aa26b4f587 100644
--- a/gdb/features/s390x-linux64v1.xml
+++ b/gdb/features/s390x-linux64v1.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-linux64v2.c b/gdb/features/s390x-linux64v2.c
index 400b1af4485..eeba787ec7b 100644
--- a/gdb/features/s390x-linux64v2.c
+++ b/gdb/features/s390x-linux64v2.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_linux64v2 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-linux64v2.xml b/gdb/features/s390x-linux64v2.xml
index 4b2abc60dad..3769a75db40 100644
--- a/gdb/features/s390x-linux64v2.xml
+++ b/gdb/features/s390x-linux64v2.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-te-linux64.c b/gdb/features/s390x-te-linux64.c
index 74883e30fe8..0fec2b0bd02 100644
--- a/gdb/features/s390x-te-linux64.c
+++ b/gdb/features/s390x-te-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_te_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-te-linux64.xml b/gdb/features/s390x-te-linux64.xml
index b38c7c0ac12..c48831d54e5 100644
--- a/gdb/features/s390x-te-linux64.xml
+++ b/gdb/features/s390x-te-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-tevx-linux64.c b/gdb/features/s390x-tevx-linux64.c
index 1d45d6044c1..c1b890045d3 100644
--- a/gdb/features/s390x-tevx-linux64.c
+++ b/gdb/features/s390x-tevx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_tevx_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-tevx-linux64.xml b/gdb/features/s390x-tevx-linux64.xml
index 2d7672e1dca..a53bfff5ac7 100644
--- a/gdb/features/s390x-tevx-linux64.xml
+++ b/gdb/features/s390x-tevx-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
diff --git a/gdb/features/s390x-vx-linux64.c b/gdb/features/s390x-vx-linux64.c
index 4de6585a227..af57e052eab 100644
--- a/gdb/features/s390x-vx-linux64.c
+++ b/gdb/features/s390x-vx-linux64.c
@@ -11,6 +11,8 @@ initialize_tdesc_s390x_vx_linux64 (void)
target_desc_up result = allocate_target_description ();
set_tdesc_architecture (result.get (), bfd_scan_arch ("s390:64-bit"));
+ set_tdesc_osabi (result.get (), GDB_OSABI_LINUX);
+
struct tdesc_feature *feature;
feature = tdesc_create_feature (result.get (), "org.gnu.gdb.s390.core");
diff --git a/gdb/features/s390x-vx-linux64.xml b/gdb/features/s390x-vx-linux64.xml
index 8903f1871e2..fcf75deb588 100644
--- a/gdb/features/s390x-vx-linux64.xml
+++ b/gdb/features/s390x-vx-linux64.xml
@@ -10,6 +10,7 @@
<!DOCTYPE target SYSTEM "gdb-target.dtd">
<target>
<architecture>s390:64-bit</architecture>
+ <osabi>GNU/Linux</osabi>
<xi:include href="s390x-core64.xml"/>
<xi:include href="s390-acr.xml"/>
<xi:include href="s390-fpr.xml"/>
--
2.25.4
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCHv5 1/3] gdb/features: set osabi in all Linux related features/*.xml files
2024-10-27 20:07 ` [PATCHv5 1/3] gdb/features: set osabi in all Linux related features/*.xml files Andrew Burgess
@ 2024-10-31 2:17 ` Kevin Buettner
0 siblings, 0 replies; 17+ messages in thread
From: Kevin Buettner @ 2024-10-31 2:17 UTC (permalink / raw)
To: Andrew Burgess; +Cc: gdb-patches
On Sun, 27 Oct 2024 20:07:40 +0000
Andrew Burgess <aburgess@redhat.com> wrote:
> Some of the top level (i.e. those that contain the <target> element)
> xml files in gdb/features/ are clearly Linux only. I conclude this
> based on the files names containing the string "linux".
>
> I think that all of these files should have the <osabi> element
> included with the value "GNU/Linux".
>
> This commits adds the <osabi> element where I believe it is
> appropriate and regenerates the associated .c files.
>
> The benefit of this change is that gdbserver, which makes use of these
> files, will now send the osabi back in more cases. Sending back more
> descriptive target descriptions is a good thing as this makes it
> easier for GDB to select the correct gdbarch.
LGTM.
Approved-by: Kevin Buettner <kevinb@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCHv5 2/3] gdb/regformats: add osabi information to generated .dat files
2024-10-27 20:07 ` [PATCHv5 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
2024-10-27 20:07 ` [PATCHv5 1/3] gdb/features: set osabi in all Linux related features/*.xml files Andrew Burgess
@ 2024-10-27 20:07 ` Andrew Burgess
2024-10-31 2:20 ` Kevin Buettner
2024-10-27 20:07 ` [PATCHv5 3/3] gdbserver: pass osabi to GDB in more target descriptions Andrew Burgess
2 siblings, 1 reply; 17+ messages in thread
From: Andrew Burgess @ 2024-10-27 20:07 UTC (permalink / raw)
To: gdb-patches; +Cc: Andrew Burgess
Some gdbserver targets generate their target description based on the
gdb/regformats/*.dat files. These .dat files are generated from a
matching xml file in gdb/features/.
Lets consider a concrete example:
Take gdb/features/or1k-linux.xml, this file is processed by
gdb/features/Makefile to create gdb/regformats/or1k-linux.dat.
When gdbserver is built for the or1k target the file
or1k-linux-generated.cc is generated using the
gdb/regformats/regdat.sh script. This .cc file is then compiled and
linked into gdbserver.
The or1k-linux-generated.cc file contains the function
init_registers_or1k_linux which is called from within gdbserver, this
function creates a target_desc object and sets its xmltarget field to
a fixed string. This fixed string is the xml filename that was
originally used to generate the xml file, in this case or1k-linux.xml.
Additionally, as part of the gdbserver build the file or1k-linux.xml
is converted to a string and placed in the file
xml-builtin-generated.cc which is then built into gdbserver.
Now when GDB asks gdbserver for the target description, gdbserver
returns the fixed xmltarget string, which is the name of an xml file.
GDB will then ask gdbserver for that file and gdbserver will return
the contents of that file thanks to the xml-builtin-generated.cc
file's contents.
This is all rather complicated, but it does work. So what's the
problem that I'm fixing?
Well or1k-linux.xml does contain the osabi information, so this will
be returned from gdbserver to GDB. That's good.
However, the target_desc object created in init_registers_or1k_linux
will not have its osabi set correctly.
Now this doesn't really matter too much except
init_registers_or1k_linux includes a call to init_target_desc.
In the next commit I want to extend init_target_desc to require an
osabi to be passed in. The motivation for this will be explained in
the next commit, but if we accept for a moment that this is something
that should be done, then the question is what osabi should we use in
init_registers_or1k_linux?
Ideally we'd use the osabi which is set in or1k-linux.xml. If we do
that then everything will remain consistent, which is a good thing.
And so, to get the osabi from or1k-linux.xml into
init_registers_or1k_linux, we first need to get the osabi information
into or1k-linux.dat file, and this is what this commit does.
I've added a new xsl script print-osabi.xsl and updated
gdb/features/Makefile to make use of this script. Then I regenerated
all of the .dat files. Now every .dat file contains either:
osabi:GNU/Linux
osabi:unknown
The first is for xml files containing <osabi>GNU/Linux</osabi> and the
second is for xml files that don't contain an osabi element.
This commit doesn't attempt to make use of the osabi information in
the .dat files, that will come in the next commit. There should be no
user visible changes after this commit.
---
gdb/features/Makefile | 2 +
gdb/features/print-osabi.xsl | 39 +++++++++++++++++++
gdb/regformats/mips-dsp-linux.dat | 1 +
gdb/regformats/mips-linux.dat | 1 +
gdb/regformats/mips64-dsp-linux.dat | 1 +
gdb/regformats/mips64-linux.dat | 1 +
gdb/regformats/nios2-linux.dat | 1 +
gdb/regformats/or1k-linux.dat | 1 +
gdb/regformats/rs6000/powerpc-32.dat | 1 +
gdb/regformats/rs6000/powerpc-32l.dat | 1 +
gdb/regformats/rs6000/powerpc-64l.dat | 1 +
gdb/regformats/rs6000/powerpc-altivec32l.dat | 1 +
gdb/regformats/rs6000/powerpc-altivec64l.dat | 1 +
gdb/regformats/rs6000/powerpc-e500l.dat | 1 +
gdb/regformats/rs6000/powerpc-isa205-32l.dat | 1 +
gdb/regformats/rs6000/powerpc-isa205-64l.dat | 1 +
.../rs6000/powerpc-isa205-altivec32l.dat | 1 +
.../rs6000/powerpc-isa205-altivec64l.dat | 1 +
.../rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat | 1 +
.../rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat | 1 +
.../rs6000/powerpc-isa205-vsx32l.dat | 1 +
.../rs6000/powerpc-isa205-vsx64l.dat | 1 +
.../rs6000/powerpc-isa207-htm-vsx32l.dat | 1 +
.../rs6000/powerpc-isa207-htm-vsx64l.dat | 1 +
.../rs6000/powerpc-isa207-vsx32l.dat | 1 +
.../rs6000/powerpc-isa207-vsx64l.dat | 1 +
gdb/regformats/rs6000/powerpc-vsx32l.dat | 1 +
gdb/regformats/rs6000/powerpc-vsx64l.dat | 1 +
gdb/regformats/s390-gs-linux64.dat | 1 +
gdb/regformats/s390-linux32.dat | 1 +
gdb/regformats/s390-linux32v1.dat | 1 +
gdb/regformats/s390-linux32v2.dat | 1 +
gdb/regformats/s390-linux64.dat | 1 +
gdb/regformats/s390-linux64v1.dat | 1 +
gdb/regformats/s390-linux64v2.dat | 1 +
gdb/regformats/s390-te-linux64.dat | 1 +
gdb/regformats/s390-tevx-linux64.dat | 1 +
gdb/regformats/s390-vx-linux64.dat | 1 +
gdb/regformats/s390x-gs-linux64.dat | 1 +
gdb/regformats/s390x-linux64.dat | 1 +
gdb/regformats/s390x-linux64v1.dat | 1 +
gdb/regformats/s390x-linux64v2.dat | 1 +
gdb/regformats/s390x-te-linux64.dat | 1 +
gdb/regformats/s390x-tevx-linux64.dat | 1 +
gdb/regformats/s390x-vx-linux64.dat | 1 +
gdb/regformats/tic6x-c62x-linux.dat | 1 +
gdb/regformats/tic6x-c64x-linux.dat | 1 +
gdb/regformats/tic6x-c64xp-linux.dat | 1 +
48 files changed, 87 insertions(+)
create mode 100644 gdb/features/print-osabi.xsl
diff --git a/gdb/features/Makefile b/gdb/features/Makefile
index 01b327cbce1..4f42d00cf9b 100644
--- a/gdb/features/Makefile
+++ b/gdb/features/Makefile
@@ -191,6 +191,8 @@ $(outdir)/%.dat: %.xml number-regs.xsl sort-regs.xsl gdbserver-regs.xsl
echo "xmltarget:$(<F)" >> $(outdir)/$*.tmp
echo "expedite:$(if $($*-expedite),$($*-expedite),$($(firstword $(subst -, ,$(notdir $*)))-expedite))" \
>> $(outdir)/$*.tmp
+ $(XSLTPROC) --path "$(PWD)" --xinclude print-osabi.xsl $< \
+ >> $(outdir)/$*.tmp
$(XSLTPROC) --path "$(PWD)" --xinclude number-regs.xsl $< | \
$(XSLTPROC) sort-regs.xsl - | \
$(XSLTPROC) gdbserver-regs.xsl - >> $(outdir)/$*.tmp
diff --git a/gdb/features/print-osabi.xsl b/gdb/features/print-osabi.xsl
new file mode 100644
index 00000000000..77f9931de52
--- /dev/null
+++ b/gdb/features/print-osabi.xsl
@@ -0,0 +1,39 @@
+<!--
+
+ Copyright (C) 2024 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ 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 <http://www.gnu.org/licenses/>.
+
+-->
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output method="text"/>
+ <xsl:variable name="total" select="count(/target/osabi)"/>
+ <xsl:template match = "/target">
+ <xsl:text>osabi:</xsl:text>
+ <xsl:choose>
+ <xsl:when test="osabi">
+ <xsl:value-of select="osabi"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>unknown</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text>
+</xsl:text>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/gdb/regformats/mips-dsp-linux.dat b/gdb/regformats/mips-dsp-linux.dat
index ce37bf38bdb..dd222857887 100644
--- a/gdb/regformats/mips-dsp-linux.dat
+++ b/gdb/regformats/mips-dsp-linux.dat
@@ -3,6 +3,7 @@
name:mips_dsp_linux
xmltarget:mips-dsp-linux.xml
expedite:r29,pc
+osabi:GNU/Linux
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/mips-linux.dat b/gdb/regformats/mips-linux.dat
index d95e2c9ed45..d333602dad1 100644
--- a/gdb/regformats/mips-linux.dat
+++ b/gdb/regformats/mips-linux.dat
@@ -3,6 +3,7 @@
name:mips_linux
xmltarget:mips-linux.xml
expedite:r29,pc
+osabi:GNU/Linux
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/mips64-dsp-linux.dat b/gdb/regformats/mips64-dsp-linux.dat
index e73df93d69b..5712424c0b6 100644
--- a/gdb/regformats/mips64-dsp-linux.dat
+++ b/gdb/regformats/mips64-dsp-linux.dat
@@ -3,6 +3,7 @@
name:mips64_dsp_linux
xmltarget:mips64-dsp-linux.xml
expedite:r29,pc
+osabi:GNU/Linux
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/mips64-linux.dat b/gdb/regformats/mips64-linux.dat
index 6770c8f6545..843320d46be 100644
--- a/gdb/regformats/mips64-linux.dat
+++ b/gdb/regformats/mips64-linux.dat
@@ -3,6 +3,7 @@
name:mips64_linux
xmltarget:mips64-linux.xml
expedite:r29,pc
+osabi:GNU/Linux
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/nios2-linux.dat b/gdb/regformats/nios2-linux.dat
index fe4af2f4f36..ecfca72ec6d 100644
--- a/gdb/regformats/nios2-linux.dat
+++ b/gdb/regformats/nios2-linux.dat
@@ -3,6 +3,7 @@
name:nios2_linux
xmltarget:nios2-linux.xml
expedite:sp,pc
+osabi:GNU/Linux
32:zero
32:at
32:r2
diff --git a/gdb/regformats/or1k-linux.dat b/gdb/regformats/or1k-linux.dat
index 7b64646fc65..d2d94c65c95 100644
--- a/gdb/regformats/or1k-linux.dat
+++ b/gdb/regformats/or1k-linux.dat
@@ -3,6 +3,7 @@
name:or1k_linux
xmltarget:or1k-linux.xml
expedite:r1,npc
+osabi:GNU/Linux
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-32.dat b/gdb/regformats/rs6000/powerpc-32.dat
index 266636b11f9..f85f95df06f 100644
--- a/gdb/regformats/rs6000/powerpc-32.dat
+++ b/gdb/regformats/rs6000/powerpc-32.dat
@@ -3,6 +3,7 @@
name:powerpc_32
xmltarget:powerpc-32.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-32l.dat b/gdb/regformats/rs6000/powerpc-32l.dat
index 2c8ccbe49b9..286f1a5d88f 100644
--- a/gdb/regformats/rs6000/powerpc-32l.dat
+++ b/gdb/regformats/rs6000/powerpc-32l.dat
@@ -3,6 +3,7 @@
name:powerpc_32l
xmltarget:powerpc-32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-64l.dat b/gdb/regformats/rs6000/powerpc-64l.dat
index 10f43b16241..b304c614e4d 100644
--- a/gdb/regformats/rs6000/powerpc-64l.dat
+++ b/gdb/regformats/rs6000/powerpc-64l.dat
@@ -3,6 +3,7 @@
name:powerpc_64l
xmltarget:powerpc-64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-altivec32l.dat b/gdb/regformats/rs6000/powerpc-altivec32l.dat
index c792a2f9616..3b1740bf041 100644
--- a/gdb/regformats/rs6000/powerpc-altivec32l.dat
+++ b/gdb/regformats/rs6000/powerpc-altivec32l.dat
@@ -3,6 +3,7 @@
name:powerpc_altivec32l
xmltarget:powerpc-altivec32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-altivec64l.dat b/gdb/regformats/rs6000/powerpc-altivec64l.dat
index a806141b6ee..6cd79eaf37a 100644
--- a/gdb/regformats/rs6000/powerpc-altivec64l.dat
+++ b/gdb/regformats/rs6000/powerpc-altivec64l.dat
@@ -3,6 +3,7 @@
name:powerpc_altivec64l
xmltarget:powerpc-altivec64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-e500l.dat b/gdb/regformats/rs6000/powerpc-e500l.dat
index 750eafed7ca..44d96d1478e 100644
--- a/gdb/regformats/rs6000/powerpc-e500l.dat
+++ b/gdb/regformats/rs6000/powerpc-e500l.dat
@@ -3,6 +3,7 @@
name:powerpc_e500l
xmltarget:powerpc-e500l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-32l.dat b/gdb/regformats/rs6000/powerpc-isa205-32l.dat
index 7227d06c977..61f06e0f142 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_32l
xmltarget:powerpc-isa205-32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-64l.dat b/gdb/regformats/rs6000/powerpc-isa205-64l.dat
index 13a72c7eb8f..bd62eb9fdfa 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_64l
xmltarget:powerpc-isa205-64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat b/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
index 051724c6132..1e9da0f9443 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-altivec32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_altivec32l
xmltarget:powerpc-isa205-altivec32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat b/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
index 867e8213516..7944d39e053 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-altivec64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_altivec64l
xmltarget:powerpc-isa205-altivec64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
index 31a7d02e95c..c0337380781 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_ppr_dscr_vsx32l
xmltarget:powerpc-isa205-ppr-dscr-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
index 74c8feb3eea..91cd86f06e0 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-ppr-dscr-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_ppr_dscr_vsx64l
xmltarget:powerpc-isa205-ppr-dscr-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
index fa05cae8594..72e7f6863ae 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_vsx32l
xmltarget:powerpc-isa205-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
index 75bd4539ad0..ff5e8bd62a4 100644
--- a/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa205-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa205_vsx64l
xmltarget:powerpc-isa205-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
index c19416db868..8c38c537d63 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa207_htm_vsx32l
xmltarget:powerpc-isa207-htm-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
index 38359959fd7..4a4acebffe4 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-htm-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa207_htm_vsx64l
xmltarget:powerpc-isa207-htm-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat b/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
index 0718d72d930..36891b3615d 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa207_vsx32l
xmltarget:powerpc-isa207-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat b/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
index 510c6c87dad..28515f7cde8 100644
--- a/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-isa207-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_isa207_vsx64l
xmltarget:powerpc-isa207-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/rs6000/powerpc-vsx32l.dat b/gdb/regformats/rs6000/powerpc-vsx32l.dat
index 6db3e38d5f2..2ff89796331 100644
--- a/gdb/regformats/rs6000/powerpc-vsx32l.dat
+++ b/gdb/regformats/rs6000/powerpc-vsx32l.dat
@@ -3,6 +3,7 @@
name:powerpc_vsx32l
xmltarget:powerpc-vsx32l.xml
expedite:r1,pc
+osabi:unknown
32:r0
32:r1
32:r2
diff --git a/gdb/regformats/rs6000/powerpc-vsx64l.dat b/gdb/regformats/rs6000/powerpc-vsx64l.dat
index bc0a45512c8..4b780382bcf 100644
--- a/gdb/regformats/rs6000/powerpc-vsx64l.dat
+++ b/gdb/regformats/rs6000/powerpc-vsx64l.dat
@@ -3,6 +3,7 @@
name:powerpc_vsx64l
xmltarget:powerpc-vsx64l.xml
expedite:r1,pc
+osabi:unknown
64:r0
64:r1
64:r2
diff --git a/gdb/regformats/s390-gs-linux64.dat b/gdb/regformats/s390-gs-linux64.dat
index 130c8ecc026..ced8c8c66bc 100644
--- a/gdb/regformats/s390-gs-linux64.dat
+++ b/gdb/regformats/s390-gs-linux64.dat
@@ -3,6 +3,7 @@
name:s390_gs_linux64
xmltarget:s390-gs-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-linux32.dat b/gdb/regformats/s390-linux32.dat
index 545dd0fb915..1a494bc532e 100644
--- a/gdb/regformats/s390-linux32.dat
+++ b/gdb/regformats/s390-linux32.dat
@@ -3,6 +3,7 @@
name:s390_linux32
xmltarget:s390-linux32.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0
diff --git a/gdb/regformats/s390-linux32v1.dat b/gdb/regformats/s390-linux32v1.dat
index b9e7fc89730..9d26f2e8762 100644
--- a/gdb/regformats/s390-linux32v1.dat
+++ b/gdb/regformats/s390-linux32v1.dat
@@ -3,6 +3,7 @@
name:s390_linux32v1
xmltarget:s390-linux32v1.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0
diff --git a/gdb/regformats/s390-linux32v2.dat b/gdb/regformats/s390-linux32v2.dat
index 220af5e3dfb..33bd546404d 100644
--- a/gdb/regformats/s390-linux32v2.dat
+++ b/gdb/regformats/s390-linux32v2.dat
@@ -3,6 +3,7 @@
name:s390_linux32v2
xmltarget:s390-linux32v2.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0
diff --git a/gdb/regformats/s390-linux64.dat b/gdb/regformats/s390-linux64.dat
index b347b6bf33a..b63a932a558 100644
--- a/gdb/regformats/s390-linux64.dat
+++ b/gdb/regformats/s390-linux64.dat
@@ -3,6 +3,7 @@
name:s390_linux64
xmltarget:s390-linux64.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-linux64v1.dat b/gdb/regformats/s390-linux64v1.dat
index 8abd92d3a2e..71737fa58da 100644
--- a/gdb/regformats/s390-linux64v1.dat
+++ b/gdb/regformats/s390-linux64v1.dat
@@ -3,6 +3,7 @@
name:s390_linux64v1
xmltarget:s390-linux64v1.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-linux64v2.dat b/gdb/regformats/s390-linux64v2.dat
index b282025e238..b25fa04c457 100644
--- a/gdb/regformats/s390-linux64v2.dat
+++ b/gdb/regformats/s390-linux64v2.dat
@@ -3,6 +3,7 @@
name:s390_linux64v2
xmltarget:s390-linux64v2.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-te-linux64.dat b/gdb/regformats/s390-te-linux64.dat
index 28e1b8733eb..2c7bdb08d49 100644
--- a/gdb/regformats/s390-te-linux64.dat
+++ b/gdb/regformats/s390-te-linux64.dat
@@ -3,6 +3,7 @@
name:s390_te_linux64
xmltarget:s390-te-linux64.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-tevx-linux64.dat b/gdb/regformats/s390-tevx-linux64.dat
index 3db7a91546b..20d0b92acef 100644
--- a/gdb/regformats/s390-tevx-linux64.dat
+++ b/gdb/regformats/s390-tevx-linux64.dat
@@ -3,6 +3,7 @@
name:s390_tevx_linux64
xmltarget:s390-tevx-linux64.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390-vx-linux64.dat b/gdb/regformats/s390-vx-linux64.dat
index 6a821fd5ac4..4ebb36bcedc 100644
--- a/gdb/regformats/s390-vx-linux64.dat
+++ b/gdb/regformats/s390-vx-linux64.dat
@@ -3,6 +3,7 @@
name:s390_vx_linux64
xmltarget:s390-vx-linux64.xml
expedite:r14l,r15l,pswa
+osabi:GNU/Linux
32:pswm
32:pswa
32:r0h
diff --git a/gdb/regformats/s390x-gs-linux64.dat b/gdb/regformats/s390x-gs-linux64.dat
index 8cd57515e51..9d44d89a9b8 100644
--- a/gdb/regformats/s390x-gs-linux64.dat
+++ b/gdb/regformats/s390x-gs-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_gs_linux64
xmltarget:s390x-gs-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-linux64.dat b/gdb/regformats/s390x-linux64.dat
index 5832c438f59..a393b584b2c 100644
--- a/gdb/regformats/s390x-linux64.dat
+++ b/gdb/regformats/s390x-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_linux64
xmltarget:s390x-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-linux64v1.dat b/gdb/regformats/s390x-linux64v1.dat
index 4d4de0a14cf..e5092d02131 100644
--- a/gdb/regformats/s390x-linux64v1.dat
+++ b/gdb/regformats/s390x-linux64v1.dat
@@ -3,6 +3,7 @@
name:s390x_linux64v1
xmltarget:s390x-linux64v1.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-linux64v2.dat b/gdb/regformats/s390x-linux64v2.dat
index b1c5f830231..7f097d5e1a3 100644
--- a/gdb/regformats/s390x-linux64v2.dat
+++ b/gdb/regformats/s390x-linux64v2.dat
@@ -3,6 +3,7 @@
name:s390x_linux64v2
xmltarget:s390x-linux64v2.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-te-linux64.dat b/gdb/regformats/s390x-te-linux64.dat
index 80f5ab127ee..2f8a7529ef7 100644
--- a/gdb/regformats/s390x-te-linux64.dat
+++ b/gdb/regformats/s390x-te-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_te_linux64
xmltarget:s390x-te-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-tevx-linux64.dat b/gdb/regformats/s390x-tevx-linux64.dat
index 2df31e68632..2624b6406f9 100644
--- a/gdb/regformats/s390x-tevx-linux64.dat
+++ b/gdb/regformats/s390x-tevx-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_tevx_linux64
xmltarget:s390x-tevx-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/s390x-vx-linux64.dat b/gdb/regformats/s390x-vx-linux64.dat
index 1d8f2b6f043..7548e022880 100644
--- a/gdb/regformats/s390x-vx-linux64.dat
+++ b/gdb/regformats/s390x-vx-linux64.dat
@@ -3,6 +3,7 @@
name:s390x_vx_linux64
xmltarget:s390x-vx-linux64.xml
expedite:r14,r15,pswa
+osabi:GNU/Linux
64:pswm
64:pswa
64:r0
diff --git a/gdb/regformats/tic6x-c62x-linux.dat b/gdb/regformats/tic6x-c62x-linux.dat
index 98ca39e1103..0818ace3cbb 100644
--- a/gdb/regformats/tic6x-c62x-linux.dat
+++ b/gdb/regformats/tic6x-c62x-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c62x_linux
feature:1
xmltarget:tic6x-c62x-linux.xml
expedite:A15,PC
+osabi:GNU/Linux
32:A0
32:A1
32:A2
diff --git a/gdb/regformats/tic6x-c64x-linux.dat b/gdb/regformats/tic6x-c64x-linux.dat
index 91e84baebc1..fafa53a4004 100644
--- a/gdb/regformats/tic6x-c64x-linux.dat
+++ b/gdb/regformats/tic6x-c64x-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c64x_linux
feature:1
xmltarget:tic6x-c64x-linux.xml
expedite:A15,PC
+osabi:GNU/Linux
32:A0
32:A1
32:A2
diff --git a/gdb/regformats/tic6x-c64xp-linux.dat b/gdb/regformats/tic6x-c64xp-linux.dat
index a3fa3b7cd40..56fc3d78c20 100644
--- a/gdb/regformats/tic6x-c64xp-linux.dat
+++ b/gdb/regformats/tic6x-c64xp-linux.dat
@@ -4,6 +4,7 @@ name:tic6x_c64xp_linux
feature:1
xmltarget:tic6x-c64xp-linux.xml
expedite:A15,PC
+osabi:GNU/Linux
32:A0
32:A1
32:A2
--
2.25.4
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCHv5 2/3] gdb/regformats: add osabi information to generated .dat files
2024-10-27 20:07 ` [PATCHv5 2/3] gdb/regformats: add osabi information to generated .dat files Andrew Burgess
@ 2024-10-31 2:20 ` Kevin Buettner
0 siblings, 0 replies; 17+ messages in thread
From: Kevin Buettner @ 2024-10-31 2:20 UTC (permalink / raw)
To: Andrew Burgess; +Cc: gdb-patches
On Sun, 27 Oct 2024 20:07:41 +0000
Andrew Burgess <aburgess@redhat.com> wrote:
> Some gdbserver targets generate their target description based on the
> gdb/regformats/*.dat files. These .dat files are generated from a
> matching xml file in gdb/features/.
>
> Lets consider a concrete example:
>
> Take gdb/features/or1k-linux.xml, this file is processed by
> gdb/features/Makefile to create gdb/regformats/or1k-linux.dat.
>
> When gdbserver is built for the or1k target the file
> or1k-linux-generated.cc is generated using the
> gdb/regformats/regdat.sh script. This .cc file is then compiled and
> linked into gdbserver.
>
> The or1k-linux-generated.cc file contains the function
> init_registers_or1k_linux which is called from within gdbserver, this
> function creates a target_desc object and sets its xmltarget field to
> a fixed string. This fixed string is the xml filename that was
> originally used to generate the xml file, in this case or1k-linux.xml.
>
> Additionally, as part of the gdbserver build the file or1k-linux.xml
> is converted to a string and placed in the file
> xml-builtin-generated.cc which is then built into gdbserver.
>
> Now when GDB asks gdbserver for the target description, gdbserver
> returns the fixed xmltarget string, which is the name of an xml file.
> GDB will then ask gdbserver for that file and gdbserver will return
> the contents of that file thanks to the xml-builtin-generated.cc
> file's contents.
>
> This is all rather complicated, but it does work. So what's the
> problem that I'm fixing?
>
> Well or1k-linux.xml does contain the osabi information, so this will
> be returned from gdbserver to GDB. That's good.
>
> However, the target_desc object created in init_registers_or1k_linux
> will not have its osabi set correctly.
>
> Now this doesn't really matter too much except
> init_registers_or1k_linux includes a call to init_target_desc.
>
> In the next commit I want to extend init_target_desc to require an
> osabi to be passed in. The motivation for this will be explained in
> the next commit, but if we accept for a moment that this is something
> that should be done, then the question is what osabi should we use in
> init_registers_or1k_linux?
>
> Ideally we'd use the osabi which is set in or1k-linux.xml. If we do
> that then everything will remain consistent, which is a good thing.
>
> And so, to get the osabi from or1k-linux.xml into
> init_registers_or1k_linux, we first need to get the osabi information
> into or1k-linux.dat file, and this is what this commit does.
>
> I've added a new xsl script print-osabi.xsl and updated
> gdb/features/Makefile to make use of this script. Then I regenerated
> all of the .dat files. Now every .dat file contains either:
>
> osabi:GNU/Linux
> osabi:unknown
>
> The first is for xml files containing <osabi>GNU/Linux</osabi> and the
> second is for xml files that don't contain an osabi element.
>
> This commit doesn't attempt to make use of the osabi information in
> the .dat files, that will come in the next commit. There should be no
> user visible changes after this commit.
Thanks for the detail explanation!
Based on your problem description, etc, these changes make sense to
me. Also, as there should be no user visible changes, I think this is
good to go in.
Approved-by: Kevin Buettner <kevinb@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCHv5 3/3] gdbserver: pass osabi to GDB in more target descriptions
2024-10-27 20:07 ` [PATCHv5 0/3] Returning osabi from gdbserer in more cases Andrew Burgess
2024-10-27 20:07 ` [PATCHv5 1/3] gdb/features: set osabi in all Linux related features/*.xml files Andrew Burgess
2024-10-27 20:07 ` [PATCHv5 2/3] gdb/regformats: add osabi information to generated .dat files Andrew Burgess
@ 2024-10-27 20:07 ` Andrew Burgess
2024-10-31 2:28 ` Kevin Buettner
2 siblings, 1 reply; 17+ messages in thread
From: Andrew Burgess @ 2024-10-27 20:07 UTC (permalink / raw)
To: gdb-patches; +Cc: Andrew Burgess
Problem Description
-------------------
On a Windows machine I built gdbserver, configured for the target
'x86_64-w64-mingw32', then on a GNU/Linux machine I built GDB with
support for all target (--enable-targets=all).
On the Windows machine I start gdbserver with a small test binary:
$ gdbserver 192.168.129.25:54321 C:\some\directory\executable.exe
On the GNU/Linux machine I start GDB without the test binary, and
connect to gdbserver.
As I have not given GDB the test binary, my expectation is that GDB
would connect to gdbserver and then download the file over the remote
protocol, but instead I was presented with this message:
(gdb) target remote 192.168.129.25:54321
Remote debugging using 192.168.129.25:54321
warning: C:\some\directory\executable.exe: No such file or directory.
0x00007ffa3e1e1741 in ?? ()
(gdb)
What I found is that if I told GDB where to find the binary, like
this:
(gdb) file target:C:/some/directory/executable.exe
A program is being debugged already.
Are you sure you want to change the file? (y or n) y
Reading C:/some/directory/executable.exe from remote target...
warning: File transfers from remote targets can be slow. Use "set sysroot" to access files locally instead.
Reading C:/some/directory/executable.exe from remote target...
Reading symbols from target:C:/some/directory/executable.exe...
(gdb)
then GDB would download the executable.
The Actual Issue
----------------
I tracked the problem down to exec_file_find (solib.c). The remote
target was passing an absolute Windows filename (beginning with "C:/"
in this case), but in exec_file_find GDB was failing the
IS_TARGET_ABSOLUTE_PATH call, and so was treating the filename as
relative.
The IS_TARGET_ABSOLUTE_PATH call was failing because GDB thought that
the file system kind was "unix", and as the filename didn't start with
a "/" it assumed the filename was not absolute.
But I'm connecting to a Windows target and 'target-file-system-kind'
was set to "auto", so GDB should be figuring out that the target
file-system is "dos-based".
Looking in effective_target_file_system_kind (filesystem.c), we find
that the logic of "auto" is delegated to the current gdbarch. However
in windows-tdep.c we see:
set_gdbarch_has_dos_based_file_system (gdbarch, 1);
So if we are using a Windows gdbarch we should have "dos-based"
filesystems. What this means is that after connecting to the remote
target GDB has selected the wrong gdbarch.
What's happening is that the target description sent back by the
remote target only includes the x86-64 registers. There's no
information about which OS we're on. As a consequence, GDB picks the
first x86-64 gdbarch which can handle the provided register set, which
happens to be a GNU/Linux gdbarch.
And indeed, there doesn't appear to be anywhere in gdbserver that sets
the osabi on the target descriptions. Some target descriptions do have
their osabi set when the description is created, e.g. in:
gdb/arch/amd64.c - Sets GNU/Linux osabi when appropriate.
gdb/arch/i386.c - Likewise.
gdb/arch/tic6x.c - Always set GNU/Linux osabi.
There are also some cases in gdb/features/*.c where the tdesc is set,
but these locations are only called from GDB, not from gdbserver.
This means that many target descriptions are created without an osabi,
gdbserver does nothing to fix this, and the description is returned to
GDB without an osabi included. This leaves GDB having to guess what
the target osabi is, and in some cases, GDB can get this wrong.
Proposed Solution
-----------------
I propose to change init_target_desc so that it requires an gdb_osabi
to be passed in, this will then be used to set the target_desc osabi
field.
I believe that within gdbserver init_target_desc is called for every
target_desc, so this should mean that every target_desc has an
opportunity to set the osabi to something sane.
I did consider passing the osabi into the code which creates the
target_desc objects, but that would require updating far more code, as
each target has its own code for creating target descriptions.
The approach taken here requires minimal changes and forces every
user of init_target_desc to think about what the correct osabi is.
In some cases, e.g. amd64, where the osabi is already set when the
target_desc is created, the init_target_desc call will override the
current value, however, we should always be replacing it with the same
actual value. i.e. if the target_desc is created with the osabi set
to GNU/Linux, then this should only happen when gdbserver is built for
GNU/Linux, in which case the init_target_desc should also be setting
the osabi to GNU/Linux.
The Tricky Bits
---------------
Some targets, like amd64, use a features based approach for creating
target_desc objects, there's a function in arch/amd64.c which creates
a target_desc, adds features too it, and returns the new target_desc.
This target_desc is then passed to an init_target_desc call within
gdbserver. This is the easy case to handle.
Then there are other targets which instead have a fixed set of xml
files, each of which is converted into a .dat file, which is then used
to generate a .cc file, which is compiled into gdbserver. The
generated .cc file creates the target_desc object and calls
init_target_desc on it. In this case though the target description
that is sent to GDB isn't generated from the target_desc object, but
is instead the contents of the fixed xml file. For this case the
osabi which we pass to init_target_desc should match the osabi that
exists in the fixed xml file.
Luckily, in the previous commit I copied the osabi information from
the fixed xml files into the .dat files. So in this commit I have
extended regdat.sh to read the osabi from the .dat file and use it in
the generated init_target_desc call.
The problem with some of these .dat base targets is that their fixed
xml files don't currently contain any osabi information, and the file
names don't indicate that they are Linux only (despite them currently
only being used from gdbserver for Linux targets), so I don't
currently feel confident adding any osabi information to these files.
An example would be features/rs6000/powerpc-64.xml. For now I've just
ignored these cases. The init_target_desc will use GDB_OSABI_UNKNOWN
which is the default. This means that for these targets nothing
changes from the current behaviour. But many other targets do now
pass the osabi back. Targets that do pass the osabi back are
improved with this commit.
Conclusion
----------
Now when I connect to the Windows remote the target description
returned includes the osabi name. With this extra information GDB
selects the correct gdbarch object, which means that GDB understands
the target has a "dos-based" file-system. With that correct GDB
understands that the filename it was given is absolute, and so fetches
the file from the remote as we'd like.
---
gdb/regformats/regdat.sh | 14 ++++++++++----
gdbserver/Makefile.in | 9 +++++----
gdbserver/linux-aarch32-tdesc.cc | 2 +-
gdbserver/linux-aarch64-tdesc.cc | 3 ++-
gdbserver/linux-arc-low.cc | 2 +-
gdbserver/linux-arm-tdesc.cc | 2 +-
gdbserver/linux-csky-low.cc | 2 +-
gdbserver/linux-loongarch-low.cc | 2 +-
gdbserver/linux-riscv-low.cc | 2 +-
gdbserver/linux-x86-tdesc.cc | 15 +++++++++++++--
gdbserver/netbsd-aarch64-low.cc | 2 +-
gdbserver/netbsd-amd64-low.cc | 2 +-
gdbserver/netbsd-i386-low.cc | 2 +-
gdbserver/tdesc.cc | 5 ++++-
gdbserver/tdesc.h | 6 ++++--
gdbserver/win32-i386-low.cc | 4 ++--
gdbserver/win32-low.h | 7 +++++++
17 files changed, 56 insertions(+), 25 deletions(-)
diff --git a/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh
index 38464c65b06..49aa02a466d 100755
--- a/gdb/regformats/regdat.sh
+++ b/gdb/regformats/regdat.sh
@@ -105,7 +105,7 @@ EOF
}
-exec > new-$2
+exec > new-$3
copyright $1
echo '#include "regdef.h"'
echo '#include "tdesc.h"'
@@ -118,6 +118,7 @@ xmlarch=x
xmlosabi=x
expedite=x
feature=x
+osabi=unknown
exec < $1
while do_read
do
@@ -143,7 +144,7 @@ do
elif test "${type}" = "xmlarch"; then
xmlarch="${entry}"
continue
- elif test "${type}" = "osabi"; then
+ elif test "${type}" = "xmlosabi"; then
xmlosabi="${entry}"
continue
elif test "${type}" = "expedite"; then
@@ -152,6 +153,9 @@ do
elif test "${type}" = "feature"; then
feature="${entry}"
continue
+ elif test "${type}" = "osabi"; then
+ osabi="${entry}"
+ continue
elif test "${name}" = x; then
echo "$0: $1 does not specify \`\`name''." 1>&2
exit 1
@@ -188,11 +192,13 @@ else
fi
echo
+osabi_enum=$(grep "${osabi}" "$2" | sed 's/.*(\([^,]\+\),.*/GDB_OSABI_\1/')
+
cat <<EOF
result->xmltarget = xmltarget_${name};
#endif
- init_target_desc (result, expedite_regs_${name});
+ init_target_desc (result, expedite_regs_${name}, ${osabi_enum});
tdesc_${name} = result;
}
@@ -200,4 +206,4 @@ EOF
# close things off
exec 1>&2
-mv -- "new-$2" "$2"
+mv -- "new-$3" "$3"
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 6148ccf9121..f555ff439c4 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -488,6 +488,7 @@ stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES)
MAKEOVERRIDES =
regdat_sh = $(srcdir)/../gdb/regformats/regdat.sh
+osabi_def = $(srcdir)/../gdbsupport/osabi.def
UST_CFLAGS = \
$(ustinc) \
@@ -588,11 +589,11 @@ target/%.o: ../gdb/target/%.c
# Rules for register format descriptions. Suffix destination files with
# -generated to identify and clean them easily.
-%-generated.cc: ../gdb/regformats/%.dat $(regdat_sh)
- $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
+%-generated.cc: ../gdb/regformats/%.dat $(osabi_def) $(regdat_sh)
+ $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $(osabi_def) $@
-%-generated.cc: ../gdb/regformats/rs6000/%.dat $(regdat_sh)
- $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
+%-generated.cc: ../gdb/regformats/rs6000/%.dat $(osabi_def) $(regdat_sh)
+ $(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $(osabi_def) $@
# Rule for gdbreplay.o. This is the same as COMPILE, but includes common-defs.h
# instead of server.h.
diff --git a/gdbserver/linux-aarch32-tdesc.cc b/gdbserver/linux-aarch32-tdesc.cc
index b8987752b9f..441fe668e6a 100644
--- a/gdbserver/linux-aarch32-tdesc.cc
+++ b/gdbserver/linux-aarch32-tdesc.cc
@@ -34,7 +34,7 @@ aarch32_linux_read_description ()
tdesc_aarch32 = aarch32_create_target_description (false);
static const char *expedite_regs[] = { "r11", "sp", "pc", 0 };
- init_target_desc (tdesc_aarch32, expedite_regs);
+ init_target_desc (tdesc_aarch32, expedite_regs, GDB_OSABI_LINUX);
}
return tdesc_aarch32;
}
diff --git a/gdbserver/linux-aarch64-tdesc.cc b/gdbserver/linux-aarch64-tdesc.cc
index 31ec7854cc0..39d5bccdce1 100644
--- a/gdbserver/linux-aarch64-tdesc.cc
+++ b/gdbserver/linux-aarch64-tdesc.cc
@@ -67,7 +67,8 @@ aarch64_linux_read_description (const aarch64_features &features)
expedited_registers.push_back (nullptr);
- init_target_desc (tdesc, (const char **) expedited_registers.data ());
+ init_target_desc (tdesc, (const char **) expedited_registers.data (),
+ GDB_OSABI_LINUX);
tdesc_aarch64_map[features] = tdesc;
}
diff --git a/gdbserver/linux-arc-low.cc b/gdbserver/linux-arc-low.cc
index 1bcaf6c3f91..16d8d5824aa 100644
--- a/gdbserver/linux-arc-low.cc
+++ b/gdbserver/linux-arc-low.cc
@@ -114,7 +114,7 @@ arc_linux_read_description (void)
target_desc_up tdesc = arc_create_target_description (features);
static const char *expedite_regs[] = { "sp", "status32", nullptr };
- init_target_desc (tdesc.get (), expedite_regs);
+ init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
return tdesc.release ();
}
diff --git a/gdbserver/linux-arm-tdesc.cc b/gdbserver/linux-arm-tdesc.cc
index 559f9b0f3dc..fff2e948f81 100644
--- a/gdbserver/linux-arm-tdesc.cc
+++ b/gdbserver/linux-arm-tdesc.cc
@@ -37,7 +37,7 @@ arm_linux_read_description (arm_fp_type fp_type)
tdesc = arm_create_target_description (fp_type, false);
static const char *expedite_regs[] = { "r11", "sp", "pc", 0 };
- init_target_desc (tdesc, expedite_regs);
+ init_target_desc (tdesc, expedite_regs, GDB_OSABI_LINUX);
tdesc_arm_list[fp_type] = tdesc;
}
diff --git a/gdbserver/linux-csky-low.cc b/gdbserver/linux-csky-low.cc
index 2eb5a2df17b..18a0d152b5a 100644
--- a/gdbserver/linux-csky-low.cc
+++ b/gdbserver/linux-csky-low.cc
@@ -133,7 +133,7 @@ csky_target::low_arch_setup ()
if (tdesc->expedite_regs.empty ())
{
- init_target_desc (tdesc.get (), expedite_regs);
+ init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
gdb_assert (!tdesc->expedite_regs.empty ());
}
diff --git a/gdbserver/linux-loongarch-low.cc b/gdbserver/linux-loongarch-low.cc
index 584ea64a7d9..cf7d6c0743c 100644
--- a/gdbserver/linux-loongarch-low.cc
+++ b/gdbserver/linux-loongarch-low.cc
@@ -85,7 +85,7 @@ loongarch_target::low_arch_setup ()
if (tdesc->expedite_regs.empty ())
{
- init_target_desc (tdesc.get (), expedite_regs);
+ init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
gdb_assert (!tdesc->expedite_regs.empty ());
}
current_process ()->tdesc = tdesc.release ();
diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc
index c4554c507a8..7170ad9922e 100644
--- a/gdbserver/linux-riscv-low.cc
+++ b/gdbserver/linux-riscv-low.cc
@@ -91,7 +91,7 @@ riscv_target::low_arch_setup ()
if (tdesc->expedite_regs.empty ())
{
- init_target_desc (tdesc.get (), expedite_regs);
+ init_target_desc (tdesc.get (), expedite_regs, GDB_OSABI_LINUX);
gdb_assert (!tdesc->expedite_regs.empty ());
}
diff --git a/gdbserver/linux-x86-tdesc.cc b/gdbserver/linux-x86-tdesc.cc
index 13c80762605..6aa5c4ab970 100644
--- a/gdbserver/linux-x86-tdesc.cc
+++ b/gdbserver/linux-x86-tdesc.cc
@@ -26,10 +26,21 @@
void
x86_linux_post_init_tdesc (target_desc *tdesc, bool is_64bit)
{
+ enum gdb_osabi osabi = GDB_OSABI_LINUX;
+
+#ifndef IN_PROCESS_AGENT
+ /* x86 target descriptions are created with the osabi already set.
+ However, init_target_desc requires us to override the already set
+ value. That's fine, out new string should match the old one. */
+ gdb_assert (tdesc_osabi_name (tdesc) != nullptr);
+ gdb_assert (strcmp (tdesc_osabi_name (tdesc),
+ gdbarch_osabi_name (osabi)) == 0);
+#endif /* ! IN_PROCESS_AGENT */
+
#ifdef __x86_64__
if (is_64bit)
- init_target_desc (tdesc, amd64_expedite_regs);
+ init_target_desc (tdesc, amd64_expedite_regs, osabi);
else
#endif
- init_target_desc (tdesc, i386_expedite_regs);
+ init_target_desc (tdesc, i386_expedite_regs, osabi);
}
diff --git a/gdbserver/netbsd-aarch64-low.cc b/gdbserver/netbsd-aarch64-low.cc
index f20a1a71773..8834e0ad894 100644
--- a/gdbserver/netbsd-aarch64-low.cc
+++ b/gdbserver/netbsd-aarch64-low.cc
@@ -98,7 +98,7 @@ netbsd_aarch64_target::low_arch_setup ()
= aarch64_create_target_description ({});
static const char *expedite_regs_aarch64[] = { "x29", "sp", "pc", NULL };
- init_target_desc (tdesc, expedite_regs_aarch64);
+ init_target_desc (tdesc, expedite_regs_aarch64, GDB_OSABI_NETBSD);
current_process ()->tdesc = tdesc;
}
diff --git a/gdbserver/netbsd-amd64-low.cc b/gdbserver/netbsd-amd64-low.cc
index b3f3aab5ec3..ad7cb430b92 100644
--- a/gdbserver/netbsd-amd64-low.cc
+++ b/gdbserver/netbsd-amd64-low.cc
@@ -193,7 +193,7 @@ netbsd_amd64_target::low_arch_setup ()
target_desc *tdesc
= amd64_create_target_description (X86_XSTATE_SSE_MASK, false, false, false);
- init_target_desc (tdesc, amd64_expedite_regs);
+ init_target_desc (tdesc, amd64_expedite_regs, GDB_OSABI_NETBSD);
current_process ()->tdesc = tdesc;
}
diff --git a/gdbserver/netbsd-i386-low.cc b/gdbserver/netbsd-i386-low.cc
index 247a39797c4..ea6fce4c6f9 100644
--- a/gdbserver/netbsd-i386-low.cc
+++ b/gdbserver/netbsd-i386-low.cc
@@ -142,7 +142,7 @@ netbsd_i386_target::low_arch_setup ()
target_desc *tdesc
= i386_create_target_description (X86_XSTATE_SSE_MASK, false, false);
- init_target_desc (tdesc, i386_expedite_regs);
+ init_target_desc (tdesc, i386_expedite_regs, GDB_OSABI_NETBSD);
current_process ()->tdesc = tdesc;
}
diff --git a/gdbserver/tdesc.cc b/gdbserver/tdesc.cc
index d052f43c76e..da1287abbbe 100644
--- a/gdbserver/tdesc.cc
+++ b/gdbserver/tdesc.cc
@@ -53,7 +53,8 @@ void target_desc::accept (tdesc_element_visitor &v) const
void
init_target_desc (struct target_desc *tdesc,
- const char **expedite_regs)
+ const char **expedite_regs,
+ enum gdb_osabi osabi)
{
int offset = 0;
@@ -88,6 +89,8 @@ init_target_desc (struct target_desc *tdesc,
int expedite_count = 0;
while (expedite_regs[expedite_count] != nullptr)
tdesc->expedite_regs.push_back (expedite_regs[expedite_count++]);
+
+ set_tdesc_osabi (tdesc, osabi);
#endif
}
diff --git a/gdbserver/tdesc.h b/gdbserver/tdesc.h
index 4796b50b4d1..9264786de51 100644
--- a/gdbserver/tdesc.h
+++ b/gdbserver/tdesc.h
@@ -20,6 +20,7 @@
#define GDBSERVER_TDESC_H
#include "gdbsupport/tdesc.h"
+#include "gdbsupport/osabi.h"
#include "regdef.h"
#include <vector>
@@ -81,10 +82,11 @@ void copy_target_description (struct target_desc *dest,
const struct target_desc *src);
/* Initialize TDESC, and then set its expedite_regs field to
- EXPEDITE_REGS. */
+ EXPEDITE_REGS and its osabi to OSABI. */
void init_target_desc (struct target_desc *tdesc,
- const char **expedite_regs);
+ const char **expedite_regs,
+ enum gdb_osabi osabi);
/* Return the current inferior's target description. Never returns
NULL. */
diff --git a/gdbserver/win32-i386-low.cc b/gdbserver/win32-i386-low.cc
index 0a761ca58ef..13f9aca99b1 100644
--- a/gdbserver/win32-i386-low.cc
+++ b/gdbserver/win32-i386-low.cc
@@ -596,12 +596,12 @@ i386_arch_setup (void)
#ifdef __x86_64__
tdesc = amd64_create_target_description (X86_XSTATE_SSE_MASK, false,
false, false);
- init_target_desc (tdesc, amd64_expedite_regs);
+ init_target_desc (tdesc, amd64_expedite_regs, WINDOWS_OSABI);
win32_tdesc = tdesc;
#endif
tdesc = i386_create_target_description (X86_XSTATE_SSE_MASK, false, false);
- init_target_desc (tdesc, i386_expedite_regs);
+ init_target_desc (tdesc, i386_expedite_regs, WINDOWS_OSABI);
#ifdef __x86_64__
wow64_win32_tdesc = tdesc;
#else
diff --git a/gdbserver/win32-low.h b/gdbserver/win32-low.h
index ff997df0a66..daed16a6ae6 100644
--- a/gdbserver/win32-low.h
+++ b/gdbserver/win32-low.h
@@ -21,6 +21,7 @@
#include <windows.h>
#include "nat/windows-nat.h"
+#include "gdbsupport/osabi.h"
struct target_desc;
@@ -31,6 +32,12 @@ extern const struct target_desc *win32_tdesc;
extern const struct target_desc *wow64_win32_tdesc;
#endif
+#ifdef __CYGWIN__
+constexpr enum gdb_osabi WINDOWS_OSABI = GDB_OSABI_CYGWIN;
+#else
+constexpr enum gdb_osabi WINDOWS_OSABI = GDB_OSABI_WINDOWS;
+#endif
+
struct win32_target_ops
{
/* Architecture-specific setup. */
--
2.25.4
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [PATCHv5 3/3] gdbserver: pass osabi to GDB in more target descriptions
2024-10-27 20:07 ` [PATCHv5 3/3] gdbserver: pass osabi to GDB in more target descriptions Andrew Burgess
@ 2024-10-31 2:28 ` Kevin Buettner
2024-10-31 9:43 ` Andrew Burgess
0 siblings, 1 reply; 17+ messages in thread
From: Kevin Buettner @ 2024-10-31 2:28 UTC (permalink / raw)
To: Andrew Burgess; +Cc: gdb-patches
On Sun, 27 Oct 2024 20:07:42 +0000
Andrew Burgess <aburgess@redhat.com> wrote:
> Problem Description
> -------------------
>
> On a Windows machine I built gdbserver, configured for the target
> 'x86_64-w64-mingw32', then on a GNU/Linux machine I built GDB with
> support for all target (--enable-targets=all).
>
> On the Windows machine I start gdbserver with a small test binary:
>
> $ gdbserver 192.168.129.25:54321 C:\some\directory\executable.exe
>
> On the GNU/Linux machine I start GDB without the test binary, and
> connect to gdbserver.
>
> As I have not given GDB the test binary, my expectation is that GDB
> would connect to gdbserver and then download the file over the remote
> protocol, but instead I was presented with this message:
>
> (gdb) target remote 192.168.129.25:54321
> Remote debugging using 192.168.129.25:54321
> warning: C:\some\directory\executable.exe: No such file or directory.
> 0x00007ffa3e1e1741 in ?? ()
> (gdb)
>
> What I found is that if I told GDB where to find the binary, like
> this:
>
> (gdb) file target:C:/some/directory/executable.exe
> A program is being debugged already.
> Are you sure you want to change the file? (y or n) y
> Reading C:/some/directory/executable.exe from remote target...
> warning: File transfers from remote targets can be slow. Use "set sysroot" to access files locally instead.
> Reading C:/some/directory/executable.exe from remote target...
> Reading symbols from target:C:/some/directory/executable.exe...
> (gdb)
>
> then GDB would download the executable.
>
> The Actual Issue
> ----------------
>
> I tracked the problem down to exec_file_find (solib.c). The remote
> target was passing an absolute Windows filename (beginning with "C:/"
> in this case), but in exec_file_find GDB was failing the
> IS_TARGET_ABSOLUTE_PATH call, and so was treating the filename as
> relative.
>
> The IS_TARGET_ABSOLUTE_PATH call was failing because GDB thought that
> the file system kind was "unix", and as the filename didn't start with
> a "/" it assumed the filename was not absolute.
>
> But I'm connecting to a Windows target and 'target-file-system-kind'
> was set to "auto", so GDB should be figuring out that the target
> file-system is "dos-based".
>
> Looking in effective_target_file_system_kind (filesystem.c), we find
> that the logic of "auto" is delegated to the current gdbarch. However
> in windows-tdep.c we see:
>
> set_gdbarch_has_dos_based_file_system (gdbarch, 1);
>
> So if we are using a Windows gdbarch we should have "dos-based"
> filesystems. What this means is that after connecting to the remote
> target GDB has selected the wrong gdbarch.
>
> What's happening is that the target description sent back by the
> remote target only includes the x86-64 registers. There's no
> information about which OS we're on. As a consequence, GDB picks the
> first x86-64 gdbarch which can handle the provided register set, which
> happens to be a GNU/Linux gdbarch.
>
> And indeed, there doesn't appear to be anywhere in gdbserver that sets
> the osabi on the target descriptions. Some target descriptions do have
> their osabi set when the description is created, e.g. in:
>
> gdb/arch/amd64.c - Sets GNU/Linux osabi when appropriate.
> gdb/arch/i386.c - Likewise.
> gdb/arch/tic6x.c - Always set GNU/Linux osabi.
>
> There are also some cases in gdb/features/*.c where the tdesc is set,
> but these locations are only called from GDB, not from gdbserver.
>
> This means that many target descriptions are created without an osabi,
> gdbserver does nothing to fix this, and the description is returned to
> GDB without an osabi included. This leaves GDB having to guess what
> the target osabi is, and in some cases, GDB can get this wrong.
>
> Proposed Solution
> -----------------
>
> I propose to change init_target_desc so that it requires an gdb_osabi
> to be passed in, this will then be used to set the target_desc osabi
> field.
>
> I believe that within gdbserver init_target_desc is called for every
> target_desc, so this should mean that every target_desc has an
> opportunity to set the osabi to something sane.
>
> I did consider passing the osabi into the code which creates the
> target_desc objects, but that would require updating far more code, as
> each target has its own code for creating target descriptions.
> The approach taken here requires minimal changes and forces every
> user of init_target_desc to think about what the correct osabi is.
>
> In some cases, e.g. amd64, where the osabi is already set when the
> target_desc is created, the init_target_desc call will override the
> current value, however, we should always be replacing it with the same
> actual value. i.e. if the target_desc is created with the osabi set
> to GNU/Linux, then this should only happen when gdbserver is built for
> GNU/Linux, in which case the init_target_desc should also be setting
> the osabi to GNU/Linux.
>
> The Tricky Bits
> ---------------
>
> Some targets, like amd64, use a features based approach for creating
> target_desc objects, there's a function in arch/amd64.c which creates
> a target_desc, adds features too it, and returns the new target_desc.
> This target_desc is then passed to an init_target_desc call within
> gdbserver. This is the easy case to handle.
>
> Then there are other targets which instead have a fixed set of xml
> files, each of which is converted into a .dat file, which is then used
> to generate a .cc file, which is compiled into gdbserver. The
> generated .cc file creates the target_desc object and calls
> init_target_desc on it. In this case though the target description
> that is sent to GDB isn't generated from the target_desc object, but
> is instead the contents of the fixed xml file. For this case the
> osabi which we pass to init_target_desc should match the osabi that
> exists in the fixed xml file.
>
> Luckily, in the previous commit I copied the osabi information from
> the fixed xml files into the .dat files. So in this commit I have
> extended regdat.sh to read the osabi from the .dat file and use it in
> the generated init_target_desc call.
>
> The problem with some of these .dat base targets is that their fixed
> xml files don't currently contain any osabi information, and the file
> names don't indicate that they are Linux only (despite them currently
> only being used from gdbserver for Linux targets), so I don't
> currently feel confident adding any osabi information to these files.
> An example would be features/rs6000/powerpc-64.xml. For now I've just
> ignored these cases. The init_target_desc will use GDB_OSABI_UNKNOWN
> which is the default. This means that for these targets nothing
> changes from the current behaviour. But many other targets do now
> pass the osabi back. Targets that do pass the osabi back are
> improved with this commit.
>
> Conclusion
> ----------
>
> Now when I connect to the Windows remote the target description
> returned includes the osabi name. With this extra information GDB
> selects the correct gdbarch object, which means that GDB understands
> the target has a "dos-based" file-system. With that correct GDB
> understands that the filename it was given is absolute, and so fetches
> the file from the remote as we'd like.
The approach that you've taken makes sense to me, but I'm not an
expert in this area. Therefore, I don't feel comfortable giving an
"Approved-by" for this particular patch. That said, I don't think it
makes sense for it to languish on the mailing list, so I recommend
that you approve it if there are no other comments within a week or
so.
Reviewed-by: Kevin Buettner <kevinb@redhat.com>
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCHv5 3/3] gdbserver: pass osabi to GDB in more target descriptions
2024-10-31 2:28 ` Kevin Buettner
@ 2024-10-31 9:43 ` Andrew Burgess
2024-11-12 13:46 ` Andrew Burgess
0 siblings, 1 reply; 17+ messages in thread
From: Andrew Burgess @ 2024-10-31 9:43 UTC (permalink / raw)
To: Kevin Buettner; +Cc: gdb-patches
Kevin Buettner <kevinb@redhat.com> writes:
> On Sun, 27 Oct 2024 20:07:42 +0000
> Andrew Burgess <aburgess@redhat.com> wrote:
>
>> Problem Description
>> -------------------
>>
>> On a Windows machine I built gdbserver, configured for the target
>> 'x86_64-w64-mingw32', then on a GNU/Linux machine I built GDB with
>> support for all target (--enable-targets=all).
>>
>> On the Windows machine I start gdbserver with a small test binary:
>>
>> $ gdbserver 192.168.129.25:54321 C:\some\directory\executable.exe
>>
>> On the GNU/Linux machine I start GDB without the test binary, and
>> connect to gdbserver.
>>
>> As I have not given GDB the test binary, my expectation is that GDB
>> would connect to gdbserver and then download the file over the remote
>> protocol, but instead I was presented with this message:
>>
>> (gdb) target remote 192.168.129.25:54321
>> Remote debugging using 192.168.129.25:54321
>> warning: C:\some\directory\executable.exe: No such file or directory.
>> 0x00007ffa3e1e1741 in ?? ()
>> (gdb)
>>
>> What I found is that if I told GDB where to find the binary, like
>> this:
>>
>> (gdb) file target:C:/some/directory/executable.exe
>> A program is being debugged already.
>> Are you sure you want to change the file? (y or n) y
>> Reading C:/some/directory/executable.exe from remote target...
>> warning: File transfers from remote targets can be slow. Use "set sysroot" to access files locally instead.
>> Reading C:/some/directory/executable.exe from remote target...
>> Reading symbols from target:C:/some/directory/executable.exe...
>> (gdb)
>>
>> then GDB would download the executable.
>>
>> The Actual Issue
>> ----------------
>>
>> I tracked the problem down to exec_file_find (solib.c). The remote
>> target was passing an absolute Windows filename (beginning with "C:/"
>> in this case), but in exec_file_find GDB was failing the
>> IS_TARGET_ABSOLUTE_PATH call, and so was treating the filename as
>> relative.
>>
>> The IS_TARGET_ABSOLUTE_PATH call was failing because GDB thought that
>> the file system kind was "unix", and as the filename didn't start with
>> a "/" it assumed the filename was not absolute.
>>
>> But I'm connecting to a Windows target and 'target-file-system-kind'
>> was set to "auto", so GDB should be figuring out that the target
>> file-system is "dos-based".
>>
>> Looking in effective_target_file_system_kind (filesystem.c), we find
>> that the logic of "auto" is delegated to the current gdbarch. However
>> in windows-tdep.c we see:
>>
>> set_gdbarch_has_dos_based_file_system (gdbarch, 1);
>>
>> So if we are using a Windows gdbarch we should have "dos-based"
>> filesystems. What this means is that after connecting to the remote
>> target GDB has selected the wrong gdbarch.
>>
>> What's happening is that the target description sent back by the
>> remote target only includes the x86-64 registers. There's no
>> information about which OS we're on. As a consequence, GDB picks the
>> first x86-64 gdbarch which can handle the provided register set, which
>> happens to be a GNU/Linux gdbarch.
>>
>> And indeed, there doesn't appear to be anywhere in gdbserver that sets
>> the osabi on the target descriptions. Some target descriptions do have
>> their osabi set when the description is created, e.g. in:
>>
>> gdb/arch/amd64.c - Sets GNU/Linux osabi when appropriate.
>> gdb/arch/i386.c - Likewise.
>> gdb/arch/tic6x.c - Always set GNU/Linux osabi.
>>
>> There are also some cases in gdb/features/*.c where the tdesc is set,
>> but these locations are only called from GDB, not from gdbserver.
>>
>> This means that many target descriptions are created without an osabi,
>> gdbserver does nothing to fix this, and the description is returned to
>> GDB without an osabi included. This leaves GDB having to guess what
>> the target osabi is, and in some cases, GDB can get this wrong.
>>
>> Proposed Solution
>> -----------------
>>
>> I propose to change init_target_desc so that it requires an gdb_osabi
>> to be passed in, this will then be used to set the target_desc osabi
>> field.
>>
>> I believe that within gdbserver init_target_desc is called for every
>> target_desc, so this should mean that every target_desc has an
>> opportunity to set the osabi to something sane.
>>
>> I did consider passing the osabi into the code which creates the
>> target_desc objects, but that would require updating far more code, as
>> each target has its own code for creating target descriptions.
>> The approach taken here requires minimal changes and forces every
>> user of init_target_desc to think about what the correct osabi is.
>>
>> In some cases, e.g. amd64, where the osabi is already set when the
>> target_desc is created, the init_target_desc call will override the
>> current value, however, we should always be replacing it with the same
>> actual value. i.e. if the target_desc is created with the osabi set
>> to GNU/Linux, then this should only happen when gdbserver is built for
>> GNU/Linux, in which case the init_target_desc should also be setting
>> the osabi to GNU/Linux.
>>
>> The Tricky Bits
>> ---------------
>>
>> Some targets, like amd64, use a features based approach for creating
>> target_desc objects, there's a function in arch/amd64.c which creates
>> a target_desc, adds features too it, and returns the new target_desc.
>> This target_desc is then passed to an init_target_desc call within
>> gdbserver. This is the easy case to handle.
>>
>> Then there are other targets which instead have a fixed set of xml
>> files, each of which is converted into a .dat file, which is then used
>> to generate a .cc file, which is compiled into gdbserver. The
>> generated .cc file creates the target_desc object and calls
>> init_target_desc on it. In this case though the target description
>> that is sent to GDB isn't generated from the target_desc object, but
>> is instead the contents of the fixed xml file. For this case the
>> osabi which we pass to init_target_desc should match the osabi that
>> exists in the fixed xml file.
>>
>> Luckily, in the previous commit I copied the osabi information from
>> the fixed xml files into the .dat files. So in this commit I have
>> extended regdat.sh to read the osabi from the .dat file and use it in
>> the generated init_target_desc call.
>>
>> The problem with some of these .dat base targets is that their fixed
>> xml files don't currently contain any osabi information, and the file
>> names don't indicate that they are Linux only (despite them currently
>> only being used from gdbserver for Linux targets), so I don't
>> currently feel confident adding any osabi information to these files.
>> An example would be features/rs6000/powerpc-64.xml. For now I've just
>> ignored these cases. The init_target_desc will use GDB_OSABI_UNKNOWN
>> which is the default. This means that for these targets nothing
>> changes from the current behaviour. But many other targets do now
>> pass the osabi back. Targets that do pass the osabi back are
>> improved with this commit.
>>
>> Conclusion
>> ----------
>>
>> Now when I connect to the Windows remote the target description
>> returned includes the osabi name. With this extra information GDB
>> selects the correct gdbarch object, which means that GDB understands
>> the target has a "dos-based" file-system. With that correct GDB
>> understands that the filename it was given is absolute, and so fetches
>> the file from the remote as we'd like.
>
> The approach that you've taken makes sense to me, but I'm not an
> expert in this area. Therefore, I don't feel comfortable giving an
> "Approved-by" for this particular patch. That said, I don't think it
> makes sense for it to languish on the mailing list, so I recommend
> that you approve it if there are no other comments within a week or
> so.
>
> Reviewed-by: Kevin Buettner <kevinb@redhat.com>
Thanks for the reviews. I'll give this some additional time to see if
anyone else wants to comment.
Thanks,
Andrew
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCHv5 3/3] gdbserver: pass osabi to GDB in more target descriptions
2024-10-31 9:43 ` Andrew Burgess
@ 2024-11-12 13:46 ` Andrew Burgess
0 siblings, 0 replies; 17+ messages in thread
From: Andrew Burgess @ 2024-11-12 13:46 UTC (permalink / raw)
To: Kevin Buettner; +Cc: gdb-patches
Andrew Burgess <aburgess@redhat.com> writes:
> Kevin Buettner <kevinb@redhat.com> writes:
>
>> On Sun, 27 Oct 2024 20:07:42 +0000
>> Andrew Burgess <aburgess@redhat.com> wrote:
>>
>>> Problem Description
>>> -------------------
>>>
>>> On a Windows machine I built gdbserver, configured for the target
>>> 'x86_64-w64-mingw32', then on a GNU/Linux machine I built GDB with
>>> support for all target (--enable-targets=all).
>>>
>>> On the Windows machine I start gdbserver with a small test binary:
>>>
>>> $ gdbserver 192.168.129.25:54321 C:\some\directory\executable.exe
>>>
>>> On the GNU/Linux machine I start GDB without the test binary, and
>>> connect to gdbserver.
>>>
>>> As I have not given GDB the test binary, my expectation is that GDB
>>> would connect to gdbserver and then download the file over the remote
>>> protocol, but instead I was presented with this message:
>>>
>>> (gdb) target remote 192.168.129.25:54321
>>> Remote debugging using 192.168.129.25:54321
>>> warning: C:\some\directory\executable.exe: No such file or directory.
>>> 0x00007ffa3e1e1741 in ?? ()
>>> (gdb)
>>>
>>> What I found is that if I told GDB where to find the binary, like
>>> this:
>>>
>>> (gdb) file target:C:/some/directory/executable.exe
>>> A program is being debugged already.
>>> Are you sure you want to change the file? (y or n) y
>>> Reading C:/some/directory/executable.exe from remote target...
>>> warning: File transfers from remote targets can be slow. Use "set sysroot" to access files locally instead.
>>> Reading C:/some/directory/executable.exe from remote target...
>>> Reading symbols from target:C:/some/directory/executable.exe...
>>> (gdb)
>>>
>>> then GDB would download the executable.
>>>
>>> The Actual Issue
>>> ----------------
>>>
>>> I tracked the problem down to exec_file_find (solib.c). The remote
>>> target was passing an absolute Windows filename (beginning with "C:/"
>>> in this case), but in exec_file_find GDB was failing the
>>> IS_TARGET_ABSOLUTE_PATH call, and so was treating the filename as
>>> relative.
>>>
>>> The IS_TARGET_ABSOLUTE_PATH call was failing because GDB thought that
>>> the file system kind was "unix", and as the filename didn't start with
>>> a "/" it assumed the filename was not absolute.
>>>
>>> But I'm connecting to a Windows target and 'target-file-system-kind'
>>> was set to "auto", so GDB should be figuring out that the target
>>> file-system is "dos-based".
>>>
>>> Looking in effective_target_file_system_kind (filesystem.c), we find
>>> that the logic of "auto" is delegated to the current gdbarch. However
>>> in windows-tdep.c we see:
>>>
>>> set_gdbarch_has_dos_based_file_system (gdbarch, 1);
>>>
>>> So if we are using a Windows gdbarch we should have "dos-based"
>>> filesystems. What this means is that after connecting to the remote
>>> target GDB has selected the wrong gdbarch.
>>>
>>> What's happening is that the target description sent back by the
>>> remote target only includes the x86-64 registers. There's no
>>> information about which OS we're on. As a consequence, GDB picks the
>>> first x86-64 gdbarch which can handle the provided register set, which
>>> happens to be a GNU/Linux gdbarch.
>>>
>>> And indeed, there doesn't appear to be anywhere in gdbserver that sets
>>> the osabi on the target descriptions. Some target descriptions do have
>>> their osabi set when the description is created, e.g. in:
>>>
>>> gdb/arch/amd64.c - Sets GNU/Linux osabi when appropriate.
>>> gdb/arch/i386.c - Likewise.
>>> gdb/arch/tic6x.c - Always set GNU/Linux osabi.
>>>
>>> There are also some cases in gdb/features/*.c where the tdesc is set,
>>> but these locations are only called from GDB, not from gdbserver.
>>>
>>> This means that many target descriptions are created without an osabi,
>>> gdbserver does nothing to fix this, and the description is returned to
>>> GDB without an osabi included. This leaves GDB having to guess what
>>> the target osabi is, and in some cases, GDB can get this wrong.
>>>
>>> Proposed Solution
>>> -----------------
>>>
>>> I propose to change init_target_desc so that it requires an gdb_osabi
>>> to be passed in, this will then be used to set the target_desc osabi
>>> field.
>>>
>>> I believe that within gdbserver init_target_desc is called for every
>>> target_desc, so this should mean that every target_desc has an
>>> opportunity to set the osabi to something sane.
>>>
>>> I did consider passing the osabi into the code which creates the
>>> target_desc objects, but that would require updating far more code, as
>>> each target has its own code for creating target descriptions.
>>> The approach taken here requires minimal changes and forces every
>>> user of init_target_desc to think about what the correct osabi is.
>>>
>>> In some cases, e.g. amd64, where the osabi is already set when the
>>> target_desc is created, the init_target_desc call will override the
>>> current value, however, we should always be replacing it with the same
>>> actual value. i.e. if the target_desc is created with the osabi set
>>> to GNU/Linux, then this should only happen when gdbserver is built for
>>> GNU/Linux, in which case the init_target_desc should also be setting
>>> the osabi to GNU/Linux.
>>>
>>> The Tricky Bits
>>> ---------------
>>>
>>> Some targets, like amd64, use a features based approach for creating
>>> target_desc objects, there's a function in arch/amd64.c which creates
>>> a target_desc, adds features too it, and returns the new target_desc.
>>> This target_desc is then passed to an init_target_desc call within
>>> gdbserver. This is the easy case to handle.
>>>
>>> Then there are other targets which instead have a fixed set of xml
>>> files, each of which is converted into a .dat file, which is then used
>>> to generate a .cc file, which is compiled into gdbserver. The
>>> generated .cc file creates the target_desc object and calls
>>> init_target_desc on it. In this case though the target description
>>> that is sent to GDB isn't generated from the target_desc object, but
>>> is instead the contents of the fixed xml file. For this case the
>>> osabi which we pass to init_target_desc should match the osabi that
>>> exists in the fixed xml file.
>>>
>>> Luckily, in the previous commit I copied the osabi information from
>>> the fixed xml files into the .dat files. So in this commit I have
>>> extended regdat.sh to read the osabi from the .dat file and use it in
>>> the generated init_target_desc call.
>>>
>>> The problem with some of these .dat base targets is that their fixed
>>> xml files don't currently contain any osabi information, and the file
>>> names don't indicate that they are Linux only (despite them currently
>>> only being used from gdbserver for Linux targets), so I don't
>>> currently feel confident adding any osabi information to these files.
>>> An example would be features/rs6000/powerpc-64.xml. For now I've just
>>> ignored these cases. The init_target_desc will use GDB_OSABI_UNKNOWN
>>> which is the default. This means that for these targets nothing
>>> changes from the current behaviour. But many other targets do now
>>> pass the osabi back. Targets that do pass the osabi back are
>>> improved with this commit.
>>>
>>> Conclusion
>>> ----------
>>>
>>> Now when I connect to the Windows remote the target description
>>> returned includes the osabi name. With this extra information GDB
>>> selects the correct gdbarch object, which means that GDB understands
>>> the target has a "dos-based" file-system. With that correct GDB
>>> understands that the filename it was given is absolute, and so fetches
>>> the file from the remote as we'd like.
>>
>> The approach that you've taken makes sense to me, but I'm not an
>> expert in this area. Therefore, I don't feel comfortable giving an
>> "Approved-by" for this particular patch. That said, I don't think it
>> makes sense for it to languish on the mailing list, so I recommend
>> that you approve it if there are no other comments within a week or
>> so.
>>
>> Reviewed-by: Kevin Buettner <kevinb@redhat.com>
>
> Thanks for the reviews. I'll give this some additional time to see if
> anyone else wants to comment.
I've gone ahead and pushed this series now.
Thanks,
Andrew
^ permalink raw reply [flat|nested] 17+ messages in thread