PR binutils/13355

[deliverable/binutils-gdb.git] / gdb / i386fbsd-nat.c

diff --git a/gdb/i386fbsd-nat.c b/gdb/i386fbsd-nat.c
index bf4bd94d8c182256a79b55fea96ce92f6c18790e..d9c2a9684589fb26c567c8cdf372ca6aa7eb4524 100644 (file)
--- a/gdb/i386fbsd-nat.c
+++ b/gdb/i386fbsd-nat.c
@@ -1,12 +1,12 @@
 /* Native-dependent code for FreeBSD/i386.
 
 /* Native-dependent code for FreeBSD/i386.
 

-   Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2007-2012 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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, 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"


@@ -30,13 +28,15 @@
 
 #include "fbsd-nat.h"
 #include "i386-tdep.h"
 
 #include "fbsd-nat.h"
 #include "i386-tdep.h"

+#include "i386-nat.h"

 #include "i386bsd-nat.h"
 
 /* Resume execution of the inferior process.  If STEP is nonzero,
    single-step it.  If SIGNAL is nonzero, give it that signal.  */
 
 static void
 #include "i386bsd-nat.h"
 
 /* Resume execution of the inferior process.  If STEP is nonzero,
    single-step it.  If SIGNAL is nonzero, give it that signal.  */
 
 static void

-i386fbsd_resume (ptid_t ptid, int step, enum target_signal signal)
+i386fbsd_resume (struct target_ops *ops,
+                ptid_t ptid, int step, enum target_signal signal)

 {
   pid_t pid = ptid_get_pid (ptid);
   int request = PT_STEP;
 {
   pid_t pid = ptid_get_pid (ptid);
   int request = PT_STEP;


@@ -49,6 +49,7 @@ i386fbsd_resume (ptid_t ptid, int step, enum target_signal signal)
 
   if (!step)
     {
 
   if (!step)
     {

+      struct regcache *regcache = get_current_regcache ();

       ULONGEST eflags;
 
       /* Workaround for a bug in FreeBSD.  Make sure that the trace
       ULONGEST eflags;
 
       /* Workaround for a bug in FreeBSD.  Make sure that the trace


@@ -61,10 +62,10 @@ i386fbsd_resume (ptid_t ptid, int step, enum target_signal signal)
         never goes through the kernel's trap() function which would
         normally clear it.  */
 
         never goes through the kernel's trap() function which would
         normally clear it.  */
 

-      regcache_cooked_read_unsigned (current_regcache, I386_EFLAGS_REGNUM,
+      regcache_cooked_read_unsigned (regcache, I386_EFLAGS_REGNUM,

                                     &eflags);
       if (eflags & 0x0100)
                                     &eflags);
       if (eflags & 0x0100)

-       regcache_cooked_write_unsigned (current_regcache, I386_EFLAGS_REGNUM,
+       regcache_cooked_write_unsigned (regcache, I386_EFLAGS_REGNUM,

                                        eflags & ~0x0100);
 
       request = PT_CONTINUE;
                                        eflags & ~0x0100);
 
       request = PT_CONTINUE;


@@ -75,7 +76,7 @@ i386fbsd_resume (ptid_t ptid, int step, enum target_signal signal)
      written a new PC value to the child.)  */
   if (ptrace (request, pid, (caddr_t) 1,
              target_signal_to_host (signal)) == -1)
      written a new PC value to the child.)  */
   if (ptrace (request, pid, (caddr_t) 1,
              target_signal_to_host (signal)) == -1)

-    perror_with_name ("ptrace");
+    perror_with_name (("ptrace"));

 }
 \f
 
 }
 \f
 


@@ -125,6 +126,21 @@ _initialize_i386fbsd_nat (void)
 
   /* Add some extra features to the common *BSD/i386 target.  */
   t = i386bsd_target ();
 
   /* Add some extra features to the common *BSD/i386 target.  */
   t = i386bsd_target ();

+
+#ifdef HAVE_PT_GETDBREGS
+
+  i386_use_watchpoints (t);
+
+  i386_dr_low.set_control = i386bsd_dr_set_control;
+  i386_dr_low.set_addr = i386bsd_dr_set_addr;
+  i386_dr_low.get_addr = i386bsd_dr_get_addr;
+  i386_dr_low.get_status = i386bsd_dr_get_status;
+  i386_dr_low.get_control = i386bsd_dr_get_control;
+  i386_set_debug_register_length (4);
+
+#endif /* HAVE_PT_GETDBREGS */
+
+

   t->to_resume = i386fbsd_resume;
   t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
   t->to_find_memory_regions = fbsd_find_memory_regions;
   t->to_resume = i386fbsd_resume;
   t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
   t->to_find_memory_regions = fbsd_find_memory_regions;


@@ -143,7 +159,7 @@ _initialize_i386fbsd_nat (void)
 #ifdef KERN_PS_STRINGS
   {
     int mib[2];
 #ifdef KERN_PS_STRINGS
   {
     int mib[2];

-    int ps_strings;
+    u_long ps_strings;

     size_t len;
 
     mib[0] = CTL_KERN;
     size_t len;
 
     mib[0] = CTL_KERN;