MPX for amd64

2013-06-24  Walfred Tedeschi  <walfred.tedeschi@intel.com>

	* amd64-linux-nat.c (amd64_linux_gregset32_reg_offset):
	Add MPX registers.
	(amd64_linux_read_description): Add initialization for MPX and
	AVX independently.
	* amd64-linux-tdep.c: Includes features/i386/amd64-mpx-linux.c.
	(amd64_linux_gregset_reg_offset): Add MPX registers.
	(amd64_linux_core_read_description): Add initialization for MPX
	registers.
	(_initialize_amd64_linux_tdep): Initialize MPX targets.
	* amd64-linux-tdep.h (AMD64_LINUX_RAX_REGNUM): Set it to the last
	register on the list.
	(tdesc_amd64_mpx_linux) Add new target	for MPX.
	* amd64-tdep.c: Includes features/i386/amd64-mpx.c.
	(amd64_mpx_names): MPX register names.
	(amd64_init_abi): Add MPX register while initializing the ABI.
	(_initialize_amd64_tdep): Initialize MPX targets.
	* amd64-tdep.h (amd64_regnum): Add MPX registers.
	(AMD64_NUM_REGS): Set number of registers taking MPX into account.

Change-Id: I4a785c181e2fb45e4086650b2f87426caeb2f800
Signed-off-by: Walfred Tedeschi <walfred.tedeschi@intel.com>
Conflicts:

	gdb/ChangeLog

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5df6d6a30d531d73a4a871728413871d452a89f5..f8c6fbd519f0b930d4a5c6bff5de6c2421c88eef 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,24 @@
+2013-11-20  Walfred Tedeschi  <walfred.tedeschi@intel.com>
+
+       * amd64-linux-nat.c (amd64_linux_gregset32_reg_offset):
+       Add MPX registers.
+       (amd64_linux_read_description): Add initialization for MPX and
+       AVX independently.
+       * amd64-linux-tdep.c: Includes features/i386/amd64-mpx-linux.c.
+       (amd64_linux_gregset_reg_offset): Add MPX registers.
+       (amd64_linux_core_read_description): Add initialization for MPX
+       registers.
+       (_initialize_amd64_linux_tdep): Initialize MPX targets.
+       * amd64-linux-tdep.h (AMD64_LINUX_RAX_REGNUM): Set it to the last
+       register on the list.
+       (tdesc_amd64_mpx_linux) Add new target  for MPX.
+       * amd64-tdep.c: Includes features/i386/amd64-mpx.c.
+       (amd64_mpx_names): MPX register names.
+       (amd64_init_abi): Add MPX register while initializing the ABI.
+       (_initialize_amd64_tdep): Initialize MPX targets.
+       * amd64-tdep.h (amd64_regnum): Add MPX registers.
+       (AMD64_NUM_REGS): Set number of registers taking MPX into account.
+
 2013-11-20  Walfred Tedeschi  <walfred.tedeschi@intel.com>
 
        * i386-linux-nat.c (GETXSTATEREGS_SUPPLIES): Add MPX

diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index dca3d0a0a008f803db97a9e8009e4fadebf90034..b1676ac32ea676bd0d046ce35c05decf6687968c 100644 (file)
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -100,7 +100,9 @@ static int amd64_linux_gregset32_reg_offset[] =
   -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1,
-  ORIG_RAX * 8                 /* "orig_eax" */
+  -1, -1, -1, -1,              /* MPX registers BND0 ... BND3.  */
+  -1, -1,                      /* MPX registers BNDCFGU, BNDSTATUS.  */
+  ORIG_RAX * 8,                        /* "orig_eax" */
 };
 \f
 
@@ -1094,18 +1096,41 @@ amd64_linux_read_description (struct target_ops *ops)
     }
 
   /* Check the native XCR0 only if PTRACE_GETREGSET is available.  */
-  if (have_ptrace_getregset
-      && (xcr0 & I386_XSTATE_AVX_MASK) == I386_XSTATE_AVX_MASK)
+  if (have_ptrace_getregset && (xcr0 & I386_XSTATE_ALL_MASK))
     {
-      if (is_64bit)
+      switch (xcr0 & I386_XSTATE_ALL_MASK)
        {
-         if (is_x32)
-           return tdesc_x32_avx_linux;
+       case I386_XSTATE_MPX_MASK:
+         if (is_64bit)
+           {
+             if (is_x32)
+               return tdesc_x32_avx_linux; /* No MPX on x32 using AVX.  */
+             else
+               return tdesc_amd64_mpx_linux;
+           }
+         else
+           return tdesc_i386_mpx_linux;
+       case I386_XSTATE_AVX_MASK:
+         if (is_64bit)
+           {
+             if (is_x32)
+               return tdesc_x32_avx_linux;
+             else
+               return tdesc_amd64_avx_linux;
+           }
+         else
+           return tdesc_i386_avx_linux;
+       default:
+         if (is_64bit)
+           {
+             if (is_x32)
+               return tdesc_x32_linux;
+             else
+               return tdesc_amd64_linux;
+           }
          else
-           return tdesc_amd64_avx_linux;
+           return tdesc_i386_linux;
        }
-      else
-       return tdesc_i386_avx_linux;
     }
   else
     {

diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 73864ec07e1546876dc6528bd74976af25663ed9..7fe92d1eea0183f9cd63fc010cce3944c7319ec7 100644 (file)
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -42,6 +42,7 @@
 
 #include "features/i386/amd64-linux.c"
 #include "features/i386/amd64-avx-linux.c"
+#include "features/i386/amd64-mpx-linux.c"
 #include "features/i386/x32-linux.c"
 #include "features/i386/x32-avx-linux.c"
 
@@ -96,6 +97,8 @@ int amd64_linux_gregset_reg_offset[] =
   -1, -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1,
   -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1,              /* MPX registers BND0 ... BND3.  */
+  -1, -1,                      /* MPX registers BNDCFGU and BNDSTATUS.  */
   15 * 8                       /* "orig_rax" */
 };
 \f
@@ -1287,8 +1290,14 @@ amd64_linux_core_read_description (struct gdbarch *gdbarch,
 {
   /* Linux/x86-64.  */
   uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd);
-  switch ((xcr0 & I386_XSTATE_AVX_MASK))
+
+  switch (xcr0 & I386_XSTATE_ALL_MASK)
     {
+    case I386_XSTATE_MPX_MASK:
+      if (gdbarch_ptr_bit (gdbarch) == 32)
+       return tdesc_x32_avx_linux;  /* No x32 MPX falling back to AVX.  */
+      else
+       return tdesc_amd64_mpx_linux;
     case I386_XSTATE_AVX_MASK:
       if (gdbarch_ptr_bit (gdbarch) == 32)
        return tdesc_x32_avx_linux;
@@ -1623,6 +1632,7 @@ _initialize_amd64_linux_tdep (void)
   /* Initialize the Linux target description.  */
   initialize_tdesc_amd64_linux ();
   initialize_tdesc_amd64_avx_linux ();
+  initialize_tdesc_amd64_mpx_linux ();
   initialize_tdesc_x32_linux ();
   initialize_tdesc_x32_avx_linux ();
 }

diff --git a/gdb/amd64-linux-tdep.h b/gdb/amd64-linux-tdep.h
index e9eaeaa77ccc626f14904464b90b8f291c7ded9a..6e85a5b1672aeb3435c4be63cd67947ce182c883 100644 (file)
--- a/gdb/amd64-linux-tdep.h
+++ b/gdb/amd64-linux-tdep.h
@@ -26,7 +26,7 @@
 /* Register number for the "orig_rax" register.  If this register
    contains a value >= 0 it is interpreted as the system call number
    that the kernel is supposed to restart.  */
-#define AMD64_LINUX_ORIG_RAX_REGNUM (AMD64_YMM15H_REGNUM + 1)
+#define AMD64_LINUX_ORIG_RAX_REGNUM (AMD64_BNDSTATUS_REGNUM + 1)
 
 /* Total number of registers for GNU/Linux.  */
 #define AMD64_LINUX_NUM_REGS (AMD64_LINUX_ORIG_RAX_REGNUM + 1)
@@ -34,6 +34,7 @@
 /* Linux target description.  */
 extern struct target_desc *tdesc_amd64_linux;
 extern struct target_desc *tdesc_amd64_avx_linux;
+extern struct target_desc *tdesc_amd64_mpx_linux;
 extern struct target_desc *tdesc_x32_linux;
 extern struct target_desc *tdesc_x32_avx_linux;
 

diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 4d6b325207ab4f0e7de4afcf06fc1639cb1c4a03..1bb72ca4fe8c3830c6c10a4440d6c860cbabcfc7 100644 (file)
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -43,6 +43,7 @@
 
 #include "features/i386/amd64.c"
 #include "features/i386/amd64-avx.c"
+#include "features/i386/amd64-mpx.c"
 #include "features/i386/x32.c"
 #include "features/i386/x32-avx.c"
 
@@ -92,6 +93,11 @@ static const char *amd64_ymmh_names[] =
   "ymm12h", "ymm13h", "ymm14h", "ymm15h"
 };
 
+static const char *amd64_mpx_names[] =
+{
+  "bnd0raw", "bnd1raw", "bnd2raw", "bnd3raw", "bndcfgu", "bndstatus"
+};
+
 /* DWARF Register Number Mapping as defined in the System V psABI,
    section 3.6.  */
 
@@ -2845,6 +2851,13 @@ amd64_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
       tdep->ymm0h_regnum = AMD64_YMM0H_REGNUM;
     }
 
+  if (tdesc_find_feature (tdesc, "org.gnu.gdb.i386.mpx") != NULL)
+    {
+      tdep->mpx_register_names = amd64_mpx_names;
+      tdep->bndcfgu_regnum = AMD64_BNDCFGU_REGNUM;
+      tdep->bnd0r_regnum = AMD64_BND0R_REGNUM;
+    }
+
   tdep->num_byte_regs = 20;
   tdep->num_word_regs = 16;
   tdep->num_dword_regs = 16;
@@ -2986,6 +2999,7 @@ _initialize_amd64_tdep (void)
 {
   initialize_tdesc_amd64 ();
   initialize_tdesc_amd64_avx ();
+  initialize_tdesc_amd64_mpx ();
   initialize_tdesc_x32 ();
   initialize_tdesc_x32_avx ();
 }

diff --git a/gdb/amd64-tdep.h b/gdb/amd64-tdep.h
index 265e535a1dd015ea12c360822f09639624cb7f24..ff58c35f1fd9c64d8d4334b2e120313def5c6b33 100644 (file)
--- a/gdb/amd64-tdep.h
+++ b/gdb/amd64-tdep.h
@@ -64,13 +64,17 @@ enum amd64_regnum
   AMD64_XMM1_REGNUM,           /* %xmm1 */
   AMD64_MXCSR_REGNUM = AMD64_XMM0_REGNUM + 16,
   AMD64_YMM0H_REGNUM,          /* %ymm0h */
-  AMD64_YMM15H_REGNUM = AMD64_YMM0H_REGNUM + 15
+  AMD64_YMM15H_REGNUM = AMD64_YMM0H_REGNUM + 15,
+  AMD64_BND0R_REGNUM = AMD64_YMM15H_REGNUM + 1,
+  AMD64_BND3R_REGNUM = AMD64_BND0R_REGNUM + 3,
+  AMD64_BNDCFGU_REGNUM,
+  AMD64_BNDSTATUS_REGNUM
 };
 
 /* Number of general purpose registers.  */
 #define AMD64_NUM_GREGS                24
 
-#define AMD64_NUM_REGS         (AMD64_YMM15H_REGNUM + 1)
+#define AMD64_NUM_REGS         (AMD64_BNDSTATUS_REGNUM + 1)
 
 extern struct displaced_step_closure *amd64_displaced_step_copy_insn
   (struct gdbarch *gdbarch, CORE_ADDR from, CORE_ADDR to,