sim: unify symbol table handling

[binutils-gdb.git] / gdb / amd64bsd-nat.c

diff --git a/gdb/amd64bsd-nat.c b/gdb/amd64bsd-nat.c
index c75470c65ef5f7ba8e1c70f5461feaa18445587d..b87672ac72a628b5ec83e01d8d57aab7b5ac5a04 100644 (file)
--- a/gdb/amd64bsd-nat.c
+++ b/gdb/amd64bsd-nat.c
@@ -1,12 +1,12 @@
 /* Native-dependent code for AMD64 BSD's.
 
 /* Native-dependent code for AMD64 BSD's.
 

-   Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003-2016 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
 
    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 2 of the License, or
+   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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "inferior.h"
 
 #include "defs.h"
 #include "inferior.h"


@@ -26,7 +24,6 @@
 
 /* We include <signal.h> to make sure `struct fxsave64' is defined on
    NetBSD, since NetBSD's <machine/reg.h> needs it.  */
 
 /* We include <signal.h> to make sure `struct fxsave64' is defined on
    NetBSD, since NetBSD's <machine/reg.h> needs it.  */

-#include "gdb_assert.h"

 #include <signal.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/ptrace.h>


@@ -34,6 +31,7 @@
 
 #include "amd64-tdep.h"
 #include "amd64-nat.h"
 
 #include "amd64-tdep.h"
 #include "amd64-nat.h"

+#include "x86bsd-nat.h"

 #include "inf-ptrace.h"
 \f
 
 #include "inf-ptrace.h"
 \f
 


@@ -41,13 +39,16 @@
    for all registers (including the floating-point registers).  */
 
 static void
    for all registers (including the floating-point registers).  */
 
 static void

-amd64bsd_fetch_inferior_registers (struct regcache *regcache, int regnum)
+amd64bsd_fetch_inferior_registers (struct target_ops *ops,
+                                  struct regcache *regcache, int regnum)

 {
 {

-  if (regnum == -1 || amd64_native_gregset_supplies_p (regnum))
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+
+  if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum))

     {
       struct reg regs;
 
     {
       struct reg regs;
 

-      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
        perror_with_name (_("Couldn't get registers"));
 


@@ -56,11 +57,25 @@ amd64bsd_fetch_inferior_registers (struct regcache *regcache, int regnum)
        return;
     }
 
        return;
     }
 

-  if (regnum == -1 || !amd64_native_gregset_supplies_p (regnum))
+  if (regnum == -1 || !amd64_native_gregset_supplies_p (gdbarch, regnum))

     {
       struct fpreg fpregs;
     {
       struct fpreg fpregs;

-
-      if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+#ifdef PT_GETXSTATE_INFO
+      void *xstateregs;
+
+      if (x86bsd_xsave_len != 0)
+       {
+         xstateregs = alloca (x86bsd_xsave_len);
+         if (ptrace (PT_GETXSTATE, get_ptrace_pid (inferior_ptid),
+                     (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
+           perror_with_name (_("Couldn't get extended state status"));
+
+         amd64_supply_xsave (regcache, -1, xstateregs);
+         return;
+       }
+#endif
+
+      if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 


@@ -72,19 +87,22 @@ amd64bsd_fetch_inferior_registers (struct regcache *regcache, int regnum)
    this for all registers (including the floating-point registers).  */
 
 static void
    this for all registers (including the floating-point registers).  */
 
 static void

-amd64bsd_store_inferior_registers (struct regcache *regcache, int regnum)
+amd64bsd_store_inferior_registers (struct target_ops *ops,
+                                  struct regcache *regcache, int regnum)

 {
 {

-  if (regnum == -1 || amd64_native_gregset_supplies_p (regnum))
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+
+  if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum))

     {
       struct reg regs;
 
     {
       struct reg regs;
 

-      if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),

                   (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't get registers"));
 
       amd64_collect_native_gregset (regcache, &regs, regnum);
 
                   (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't get registers"));
 
       amd64_collect_native_gregset (regcache, &regs, regnum);
 

-      if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't write registers"));
 
                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name (_("Couldn't write registers"));
 


@@ -92,17 +110,35 @@ amd64bsd_store_inferior_registers (struct regcache *regcache, int regnum)
        return;
     }
 
        return;
     }
 

-  if (regnum == -1 || !amd64_native_gregset_supplies_p (regnum))
+  if (regnum == -1 || !amd64_native_gregset_supplies_p (gdbarch, regnum))

     {
       struct fpreg fpregs;
     {
       struct fpreg fpregs;

-
-      if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
+#ifdef PT_GETXSTATE_INFO
+      void *xstateregs;
+
+      if (x86bsd_xsave_len != 0)
+       {
+         xstateregs = alloca (x86bsd_xsave_len);
+         if (ptrace (PT_GETXSTATE, get_ptrace_pid (inferior_ptid),
+                     (PTRACE_TYPE_ARG3) xstateregs, 0) == -1)
+           perror_with_name (_("Couldn't get extended state status"));
+
+         amd64_collect_xsave (regcache, regnum, xstateregs, 0);
+
+         if (ptrace (PT_SETXSTATE, get_ptrace_pid (inferior_ptid),
+                     (PTRACE_TYPE_ARG3) xstateregs, x86bsd_xsave_len) == -1)
+           perror_with_name (_("Couldn't write extended state status"));
+         return;
+       }
+#endif
+
+      if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 
       amd64_collect_fxsave (regcache, regnum, &fpregs);
 
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't get floating point status"));
 
       amd64_collect_fxsave (regcache, regnum, &fpregs);
 

-      if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
+      if (ptrace (PT_SETFPREGS, get_ptrace_pid (inferior_ptid),

                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't write floating point status"));
     }
                  (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name (_("Couldn't write floating point status"));
     }


@@ -116,7 +152,7 @@ amd64bsd_target (void)
 {
   struct target_ops *t;
 
 {
   struct target_ops *t;
 

-  t = inf_ptrace_target ();
+  t = x86bsd_target ();

   t->to_fetch_registers = amd64bsd_fetch_inferior_registers;
   t->to_store_registers = amd64bsd_store_inferior_registers;
   return t;
   t->to_fetch_registers = amd64bsd_fetch_inferior_registers;
   t->to_store_registers = amd64bsd_store_inferior_registers;
   return t;