mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-26 19:44:11 +08:00
gdb/regformats: add osabi information to generated .dat files
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. Approved-By: Kevin Buettner <kevinb@redhat.com>
This commit is contained in:
Andrew Burgess
parent
9b5ba7e49e
commit
06e9986d02
@ -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
|
||||
|
||||
39
gdb/features/print-osabi.xsl
Normal file
39
gdb/features/print-osabi.xsl
Normal file
@ -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>
|
||||
@ -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
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:mips_linux
|
||||
xmltarget:mips-linux.xml
|
||||
expedite:r29,pc
|
||||
osabi:GNU/Linux
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -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
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:mips64_linux
|
||||
xmltarget:mips64-linux.xml
|
||||
expedite:r29,pc
|
||||
osabi:GNU/Linux
|
||||
64:r0
|
||||
64:r1
|
||||
64:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:nios2_linux
|
||||
xmltarget:nios2-linux.xml
|
||||
expedite:sp,pc
|
||||
osabi:GNU/Linux
|
||||
32:zero
|
||||
32:at
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:or1k_linux
|
||||
xmltarget:or1k-linux.xml
|
||||
expedite:r1,npc
|
||||
osabi:GNU/Linux
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_32
|
||||
xmltarget:powerpc-32.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_32l
|
||||
xmltarget:powerpc-32l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_64l
|
||||
xmltarget:powerpc-64l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
64:r0
|
||||
64:r1
|
||||
64:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_altivec32l
|
||||
xmltarget:powerpc-altivec32l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_altivec64l
|
||||
xmltarget:powerpc-altivec64l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
64:r0
|
||||
64:r1
|
||||
64:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_e500l
|
||||
xmltarget:powerpc-e500l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_isa205_32l
|
||||
xmltarget:powerpc-isa205-32l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_isa205_64l
|
||||
xmltarget:powerpc-isa205-64l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
64:r0
|
||||
64:r1
|
||||
64:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_isa205_altivec32l
|
||||
xmltarget:powerpc-isa205-altivec32l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_isa205_altivec64l
|
||||
xmltarget:powerpc-isa205-altivec64l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
64:r0
|
||||
64:r1
|
||||
64:r2
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_isa205_vsx32l
|
||||
xmltarget:powerpc-isa205-vsx32l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_isa205_vsx64l
|
||||
xmltarget:powerpc-isa205-vsx64l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
64:r0
|
||||
64:r1
|
||||
64:r2
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_isa207_vsx32l
|
||||
xmltarget:powerpc-isa207-vsx32l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_isa207_vsx64l
|
||||
xmltarget:powerpc-isa207-vsx64l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
64:r0
|
||||
64:r1
|
||||
64:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_vsx32l
|
||||
xmltarget:powerpc-vsx32l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
32:r0
|
||||
32:r1
|
||||
32:r2
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:powerpc_vsx64l
|
||||
xmltarget:powerpc-vsx64l.xml
|
||||
expedite:r1,pc
|
||||
osabi:unknown
|
||||
64:r0
|
||||
64:r1
|
||||
64:r2
|
||||
|
||||
@ -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
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390_linux32
|
||||
xmltarget:s390-linux32.xml
|
||||
expedite:r14,r15,pswa
|
||||
osabi:GNU/Linux
|
||||
32:pswm
|
||||
32:pswa
|
||||
32:r0
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390_linux32v1
|
||||
xmltarget:s390-linux32v1.xml
|
||||
expedite:r14,r15,pswa
|
||||
osabi:GNU/Linux
|
||||
32:pswm
|
||||
32:pswa
|
||||
32:r0
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390_linux32v2
|
||||
xmltarget:s390-linux32v2.xml
|
||||
expedite:r14,r15,pswa
|
||||
osabi:GNU/Linux
|
||||
32:pswm
|
||||
32:pswa
|
||||
32:r0
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390_linux64
|
||||
xmltarget:s390-linux64.xml
|
||||
expedite:r14l,r15l,pswa
|
||||
osabi:GNU/Linux
|
||||
32:pswm
|
||||
32:pswa
|
||||
32:r0h
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390_linux64v1
|
||||
xmltarget:s390-linux64v1.xml
|
||||
expedite:r14l,r15l,pswa
|
||||
osabi:GNU/Linux
|
||||
32:pswm
|
||||
32:pswa
|
||||
32:r0h
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390_linux64v2
|
||||
xmltarget:s390-linux64v2.xml
|
||||
expedite:r14l,r15l,pswa
|
||||
osabi:GNU/Linux
|
||||
32:pswm
|
||||
32:pswa
|
||||
32:r0h
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390x_linux64
|
||||
xmltarget:s390x-linux64.xml
|
||||
expedite:r14,r15,pswa
|
||||
osabi:GNU/Linux
|
||||
64:pswm
|
||||
64:pswa
|
||||
64:r0
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390x_linux64v1
|
||||
xmltarget:s390x-linux64v1.xml
|
||||
expedite:r14,r15,pswa
|
||||
osabi:GNU/Linux
|
||||
64:pswm
|
||||
64:pswa
|
||||
64:r0
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
name:s390x_linux64v2
|
||||
xmltarget:s390x-linux64v2.xml
|
||||
expedite:r14,r15,pswa
|
||||
osabi:GNU/Linux
|
||||
64:pswm
|
||||
64:pswa
|
||||
64:r0
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user