Shadow registers wronly shown by gdb on avx machine

For an unclear reason, the orig_rax register and its shadows are described in the
xml file using a register number.
This register number is correct on non avx machine, but is wrong on
avx machine, as these have more registers, which means that orig_raxs1 and s2
should have different numbers.

As no reason was found to have a register number explicitely give, remove this
regnnr from the xml file, and let gdb calculate it.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14128

diff --git a/coregrind/m_gdbserver/64bit-linux-valgrind-s1.xml b/coregrind/m_gdbserver/64bit-linux-valgrind-s1.xml
index fc1c2dd05f2af71eab50d3395c309fa970b588d0..e6d7d144be23a9244e121035e13fb6167983e91d 100644 (file)
--- a/coregrind/m_gdbserver/64bit-linux-valgrind-s1.xml
+++ b/coregrind/m_gdbserver/64bit-linux-valgrind-s1.xml
@@ -7,5 +7,5 @@
 
 <!DOCTYPE feature SYSTEM "gdb-target.dtd">
 <feature name="org.gnu.gdb.i386.linux.valgrind.s1">
-  <reg name="orig_raxs1" bitsize="64" type="int" regnum="115"/>
+  <reg name="orig_raxs1" bitsize="64" type="int"/>
 </feature>

diff --git a/coregrind/m_gdbserver/64bit-linux-valgrind-s2.xml b/coregrind/m_gdbserver/64bit-linux-valgrind-s2.xml
index 452ddec560ca12b2d6c2f0a019045b1b60def0fe..64cd12514a35afd82a2e70b513683d5a9a61d9b8 100644 (file)
--- a/coregrind/m_gdbserver/64bit-linux-valgrind-s2.xml
+++ b/coregrind/m_gdbserver/64bit-linux-valgrind-s2.xml
@@ -7,5 +7,5 @@
 
 <!DOCTYPE feature SYSTEM "gdb-target.dtd">
 <feature name="org.gnu.gdb.i386.linux.valgrind.s2">
-  <reg name="orig_raxs2" bitsize="64" type="int" regnum="173"/>
+  <reg name="orig_raxs2" bitsize="64" type="int"/>
 </feature>

diff --git a/coregrind/m_gdbserver/64bit-linux.xml b/coregrind/m_gdbserver/64bit-linux.xml
index 86092721086c0aac225cd0f750674a1f8ec11f53..9db7b7c9b8a7bc33d51d9489d5eee3de2abab369 100644 (file)
--- a/coregrind/m_gdbserver/64bit-linux.xml
+++ b/coregrind/m_gdbserver/64bit-linux.xml
@@ -7,5 +7,5 @@
 
 <!DOCTYPE feature SYSTEM "gdb-target.dtd">
 <feature name="org.gnu.gdb.i386.linux">
-  <reg name="orig_rax" bitsize="64" type="int" regnum="57"/>
+  <reg name="orig_rax" bitsize="64" type="int"/>
 </feature>