[RFC] GDBserver unit test to i386_tdesc

This patch adds a unit test in GDBserver to test dynamically created
target descriptions equal to these pre-generated ones.

gdb/gdbserver:

2017-06-06  Yao Qi  <yao.qi@linaro.org>

	* linux-x86-tdesc.c (i386_tdesc_test): New function.
	(initialize_low_tdesc): Call register_self_test.
	* tdesc.h: TODO.

diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c
index f247a3cd5d07cf78b072ba1405e025739583cc28..06e5bf910ce9515e288eff94f7fd2f3f633bc829 100644 (file)
--- a/gdb/gdbserver/linux-x86-tdesc.c
+++ b/gdb/gdbserver/linux-x86-tdesc.c
@@ -61,6 +61,47 @@ extern const struct target_desc *tdesc_i386_mpx_linux;
 
 static const struct target_desc *i386_tdescs[X86_TDESC_LAST] = { };
 
+#if defined GDB_SELF_TEST && !defined IN_PROCESS_AGENT
+#include "selftest.h"
+
+namespace selftests {
+namespace gdbserver {
+static void
+i386_tdesc_test ()
+{
+  const struct target_desc *tdesc = i386_get_ipa_tdesc (X86_TDESC_MMX);
+
+  SELF_CHECK (*tdesc == *tdesc_i386_mmx_linux);
+  delete tdesc;
+
+  tdesc = i386_get_ipa_tdesc (X86_TDESC_SSE);
+  SELF_CHECK (*tdesc == *tdesc_i386_linux);
+  delete tdesc;
+
+  tdesc = i386_get_ipa_tdesc (X86_TDESC_AVX);
+  SELF_CHECK (*tdesc == *tdesc_i386_avx_linux);
+  delete tdesc;
+
+  tdesc = i386_get_ipa_tdesc (X86_TDESC_MPX);
+  SELF_CHECK (*tdesc == *tdesc_i386_mpx_linux);
+  delete tdesc;
+
+  tdesc = i386_get_ipa_tdesc (X86_TDESC_AVX_MPX);
+  SELF_CHECK (*tdesc == *tdesc_i386_avx_mpx_linux);
+  delete tdesc;
+
+  tdesc = i386_get_ipa_tdesc (X86_TDESC_AVX_AVX512);
+  SELF_CHECK (*tdesc == *tdesc_i386_avx_avx512_linux);
+  delete tdesc;
+
+  tdesc = i386_get_ipa_tdesc (X86_TDESC_AVX_MPX_AVX512_PKU);
+  SELF_CHECK (*tdesc == *tdesc_i386_avx_mpx_avx512_pku_linux);
+  delete tdesc;
+}
+}
+} // namespace selftests
+#endif /* GDB_SELF_TEST */
+
 void
 initialize_low_tdesc ()
 {
@@ -72,6 +113,10 @@ initialize_low_tdesc ()
   init_registers_i386_avx_mpx_linux ();
   init_registers_i386_avx_avx512_linux ();
   init_registers_i386_avx_mpx_avx512_pku_linux ();
+
+#if GDB_SELF_TEST
+  register_self_test (selftests::gdbserver::i386_tdesc_test);
+#endif
 #endif
 }
 

diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h
index 2d4cbfaa04d0630d104ccaf525deb2d880642106..e64f0b3b6406a31adb033b176d97ea8a8a819400 100644 (file)
--- a/gdb/gdbserver/tdesc.h
+++ b/gdb/gdbserver/tdesc.h
@@ -19,7 +19,8 @@
 #ifndef TDESC_H
 #define TDESC_H
 
-struct reg;
+#include "regdef.h"
+#include <cstring>
 
 typedef struct reg *tdesc_reg_p;
 DEF_VEC_P(tdesc_reg_p);
@@ -60,6 +61,45 @@ public:
       xfree (reg);
     VEC_free (tdesc_reg_p, reg_defs);
   }
+  bool operator!= (const target_desc &other) const
+  {
+    if (VEC_length (tdesc_reg_p, reg_defs)
+       != VEC_length (tdesc_reg_p, other.reg_defs))
+      return true;
+
+    struct reg *reg;
+
+    for (int ix = 0;
+        VEC_iterate (tdesc_reg_p, reg_defs, ix, reg);
+        ix++)
+      {
+       struct reg *reg2
+         = VEC_index (tdesc_reg_p, other.reg_defs, ix);
+
+       if (reg != reg2 && *reg != *reg2)
+         return true;
+      }
+
+    /* Compare expedite_regs.  */
+    int i = 0;
+    for (; expedite_regs[i] != NULL; i++)
+      {
+       if (strcmp (expedite_regs[i], other.expedite_regs[i]) != 0)
+         return true;
+      }
+    if (other.expedite_regs[i] != NULL)
+      return true;
+
+    if (strcmp (xmltarget, other.xmltarget) != 0)
+      return true;
+
+    return false;
+  }
+
+  bool operator== (const target_desc &other) const
+  {
+    return !(*this != other);
+  }
 #endif
 };
 

diff --git a/gdb/regformats/regdef.h b/gdb/regformats/regdef.h
index de7a010ec7558d92b97a5f020c0c3685b76b865c..ff1d40b777db70ba8b01d96945c03365854e3872 100644 (file)
--- a/gdb/regformats/regdef.h
+++ b/gdb/regformats/regdef.h
@@ -34,6 +34,18 @@ struct reg
 
   /* The size (in bits) of the value of this register, as transmitted.  */
   int size;
+
+  bool operator== (const reg &other) const
+  {
+    return (strcmp (name, other.name) == 0
+           && offset == other.offset
+           && size == other.size);
+  }
+
+  bool operator!= (const reg &other) const
+  {
+    return !(*this == other);
+  }
 };
 
 #endif /* REGDEF_H */