2004-11-08 Andrew Cagney <cagney@gnu.org>

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

diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index 4d663fc74ca933bd7a7d21dfd1dcf22140a6ce50..349112a4ad0cfd18721fe2678603f3104855c308 100644 (file)
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -33,6 +33,8 @@
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
+#include "i386bsd-nat.h"
+#include "inf-ptrace.h"
 \f
 
 /* In older BSD versions we cannot get at some of the segment
@@ -128,15 +130,15 @@ i386bsd_collect_gregset (const struct regcache *regcache,
 /* Fetch register REGNUM from the inferior.  If REGNUM is -1, do this
    for all registers (including the floating point registers).  */
 
-void
-fetch_inferior_registers (int regnum)
+static void
+i386bsd_fetch_inferior_registers (int regnum)
 {
   if (regnum == -1 || GETREGS_SUPPLIES (regnum))
     {
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                 (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+                 (PTRACE_TYPE_ARG3) &regs, 0) == -1)
        perror_with_name ("Couldn't get registers");
 
       i386bsd_supply_gregset (current_regcache, &regs);
@@ -152,7 +154,7 @@ fetch_inferior_registers (int regnum)
 
       if (have_ptrace_xmmregs != 0
          && ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid),
-                   (PTRACE_ARG3_TYPE) xmmregs, 0) == 0)
+                   (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
        {
          have_ptrace_xmmregs = 1;
          i387_supply_fxsave (current_regcache, -1, xmmregs);
@@ -160,14 +162,14 @@ fetch_inferior_registers (int regnum)
       else
        {
           if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-                     (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+                     (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
            perror_with_name ("Couldn't get floating point status");
 
          i387_supply_fsave (current_regcache, -1, &fpregs);
        }
 #else
       if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-                 (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+                 (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
        perror_with_name ("Couldn't get floating point status");
 
       i387_supply_fsave (current_regcache, -1, &fpregs);
@@ -178,21 +180,21 @@ fetch_inferior_registers (int regnum)
 /* Store register REGNUM back into the inferior.  If REGNUM is -1, do
    this for all registers (including the floating point registers).  */
 
-void
-store_inferior_registers (int regnum)
+static void
+i386bsd_store_inferior_registers (int regnum)
 {
   if (regnum == -1 || GETREGS_SUPPLIES (regnum))
     {
       struct reg regs;
 
       if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
-                  (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+                  (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't get registers");
 
       i386bsd_collect_gregset (current_regcache, &regs, regnum);
 
       if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
-                 (PTRACE_ARG3_TYPE) &regs, 0) == -1)
+                 (PTRACE_TYPE_ARG3) &regs, 0) == -1)
         perror_with_name ("Couldn't write registers");
 
       if (regnum != -1)
@@ -207,14 +209,14 @@ store_inferior_registers (int regnum)
 
       if (have_ptrace_xmmregs != 0
          && ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid),
-                   (PTRACE_ARG3_TYPE) xmmregs, 0) == 0)
+                   (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
        {
          have_ptrace_xmmregs = 1;
 
          i387_collect_fxsave (current_regcache, regnum, xmmregs);
 
          if (ptrace (PT_SETXMMREGS, PIDGET (inferior_ptid),
-                     (PTRACE_ARG3_TYPE) xmmregs, 0) == -1)
+                     (PTRACE_TYPE_ARG3) xmmregs, 0) == -1)
             perror_with_name ("Couldn't write XMM registers");
        }
       else
@@ -222,19 +224,33 @@ store_inferior_registers (int regnum)
          have_ptrace_xmmregs = 0;
 #endif
           if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
-                     (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+                     (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
            perror_with_name ("Couldn't get floating point status");
 
           i387_collect_fsave (current_regcache, regnum, &fpregs);
 
           if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
-                     (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
+                     (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
            perror_with_name ("Couldn't write floating point status");
 #ifdef HAVE_PT_GETXMMREGS
         }
 #endif
     }
 }
+
+/* Create a prototype *BSD/i386 target.  The client can override it
+   with local methods.  */
+
+struct target_ops *
+i386bsd_target (void)
+{
+  struct target_ops *t;
+
+  t = inf_ptrace_target ();
+  t->to_fetch_registers = i386bsd_fetch_inferior_registers;
+  t->to_store_registers = i386bsd_store_inferior_registers;
+  return t;
+}
 \f
 
 /* Support for debug registers.  */
@@ -253,7 +269,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
   struct dbreg dbregs;
 
   if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid),
-              (PTRACE_ARG3_TYPE) &dbregs, 0) == -1)
+              (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
     perror_with_name ("Couldn't get debug registers");
 
   /* For some mysterious reason, some of the reserved bits in the
@@ -264,7 +280,7 @@ i386bsd_dr_set (int regnum, unsigned int value)
   DBREG_DRX ((&dbregs), regnum) = value;
 
   if (ptrace (PT_SETDBREGS, PIDGET (inferior_ptid),
-              (PTRACE_ARG3_TYPE) &dbregs, 0) == -1)
+              (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
     perror_with_name ("Couldn't write debug registers");
 }
 
@@ -301,7 +317,7 @@ i386bsd_dr_get_status (void)
      stuff to the target vector.  For now, just return zero if the
      ptrace call fails.  */
   if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid),
-             (PTRACE_ARG3_TYPE) & dbregs, 0) == -1)
+             (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
 #if 0
     perror_with_name ("Couldn't read debug registers");
 #else
@@ -357,10 +373,10 @@ _initialize_i386bsd_nat (void)
 #define SC_REG_OFFSET i386nbsd_sc_reg_offset
 #elif defined (OpenBSD)
 #define SC_REG_OFFSET i386obsd_sc_reg_offset
-#else
-#define SC_REG_OFFSET i386bsd_sc_reg_offset
 #endif
 
+#ifdef SC_REG_OFFSET
+
   /* We only check the program counter, stack pointer and frame
      pointer since these members of `struct sigcontext' are essential
      for providing backtraces.  More checks could be added, but would
@@ -410,4 +426,6 @@ Please report this to <bug-gdb@gnu.org>.",
     }
 
   SC_FP_OFFSET = offset;
+
+#endif /* SC_REG_OFFSET */
 }