X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fi386bsd-nat.c;h=5d45c3384b2828c7f37bfdcff2c647e728417740;hb=93692b589dc7017d5a2fbdffdfad5f84f597d8f1;hp=ab4d14cd43432636024af41c2d1b925abcaa6151;hpb=feae6502eab5208b73767a1070a644c292c19706;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/i386bsd-nat.c b/gdb/i386bsd-nat.c
index ab4d14cd43..5d45c3384b 100644
--- a/gdb/i386bsd-nat.c
+++ b/gdb/i386bsd-nat.c
@@ -1,12 +1,12 @@
/* Native-dependent code for modern i386 BSD's.
- Copyright 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2000-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
- 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,
@@ -15,36 +15,22 @@
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 . */
#include "defs.h"
#include "inferior.h"
#include "regcache.h"
-#include "gdb_assert.h"
#include
-#include
#include
#include
#include
#include
-#ifdef HAVE_SYS_PROCFS_H
-#include
-#endif
-
-#ifndef HAVE_GREGSET_T
-typedef struct reg gregset_t;
-#endif
-
-#ifndef HAVE_FPREGSET_T
-typedef struct fpreg fpregset_t;
-#endif
-
-#include "gregset.h"
#include "i386-tdep.h"
+#include "i387-tdep.h"
+#include "i386bsd-nat.h"
+#include "inf-ptrace.h"
/* In older BSD versions we cannot get at some of the segment
@@ -52,21 +38,13 @@ typedef struct fpreg fpregset_t;
registers until the 3.0 release. We have autoconf checks for their
presence, and deal gracefully with their absence. */
-/* Registers we shouldn't try to fetch. */
-#undef CANNOT_FETCH_REGISTER
-#define CANNOT_FETCH_REGISTER(regnum) cannot_fetch_register (regnum)
-
-/* Registers we shouldn't try to store. */
-#undef CANNOT_STORE_REGISTER
-#define CANNOT_STORE_REGISTER(regnum) cannot_fetch_register (regnum)
-
-/* Offset to the gregset_t location where REG is stored. */
-#define REG_OFFSET(reg) offsetof (gregset_t, reg)
+/* Offset in `struct reg' where MEMBER is stored. */
+#define REG_OFFSET(member) offsetof (struct reg, member)
-/* At reg_offset[REGNUM] you'll find the offset to the gregset_t
- location where the GDB register REGNUM is stored. Unsupported
+/* At i386bsd_reg_offset[REGNUM] you'll find the offset in `struct
+ reg' where the GDB register REGNUM is stored. Unsupported
registers are marked with `-1'. */
-static int reg_offset[] =
+static int i386bsd_r_reg_offset[] =
{
REG_OFFSET (r_eax),
REG_OFFSET (r_ecx),
@@ -94,8 +72,6 @@ static int reg_offset[] =
#endif
};
-#define REG_ADDR(regset, regnum) ((char *) (regset) + reg_offset[regnum])
-
/* Macro to determine if a register is fetched with PT_GETREGS. */
#define GETREGS_SUPPLIES(regnum) \
((0 <= (regnum) && (regnum) <= 15))
@@ -106,117 +82,112 @@ static int reg_offset[] =
static int have_ptrace_xmmregs = -1;
#endif
-/* Return nonzero if we shouldn't try to fetch register REGNUM. */
-
-static int
-cannot_fetch_register (int regnum)
-{
- return (reg_offset[regnum] == -1);
-}
+#ifdef PT_GETXSTATE_INFO
+size_t i386bsd_xsave_len;
+#endif
-/* Transfering the registers between GDB, inferiors and core files. */
-
-/* Fill GDB's register array with the general-purpose register values
- in *GREGSETP. */
+/* Supply the general-purpose registers in GREGS, to REGCACHE. */
-void
-supply_gregset (gregset_t *gregsetp)
+static void
+i386bsd_supply_gregset (struct regcache *regcache, const void *gregs)
{
- struct regcache *regcache = current_regcache;
+ const char *regs = gregs;
int regnum;
- for (regnum = 0; regnum < I386_NUM_GREGS; regnum++)
+ for (regnum = 0; regnum < ARRAY_SIZE (i386bsd_r_reg_offset); regnum++)
{
- if (CANNOT_FETCH_REGISTER (regnum))
- regcache_raw_supply (regcache, regnum, NULL);
- else
- regcache_raw_supply (regcache, regnum, REG_ADDR (gregsetp, regnum));
+ int offset = i386bsd_r_reg_offset[regnum];
+
+ if (offset != -1)
+ regcache_raw_supply (regcache, regnum, regs + offset);
}
}
-/* Fill register REGNUM (if it is a general-purpose register) in
- *GREGSETPS with the value in GDB's register array. If REGNUM is -1,
- do this for all registers. */
+/* Collect register REGNUM from REGCACHE and store its contents in
+ GREGS. If REGNUM is -1, collect and store all appropriate
+ registers. */
-void
-fill_gregset (gregset_t *gregsetp, int regnum)
+static void
+i386bsd_collect_gregset (const struct regcache *regcache,
+ void *gregs, int regnum)
{
- struct regcache *regcache = current_regcache;
+ char *regs = gregs;
int i;
- for (i = 0; i < I386_NUM_GREGS; i++)
- if ((regnum == -1 || regnum == i) && ! CANNOT_STORE_REGISTER (i))
- regcache_raw_collect (regcache, i, REG_ADDR (gregsetp, i));
-}
-
-#include "i387-tdep.h"
-
-/* Fill GDB's register array with the floating-point register values
- in *FPREGSETP. */
-
-void
-supply_fpregset (fpregset_t *fpregsetp)
-{
- i387_supply_fsave (current_regcache, -1, fpregsetp);
-}
-
-/* Fill register REGNUM (if it is a floating-point register) in
- *FPREGSETP with the value in GDB's register array. If REGNUM is
- -1, do this for all registers. */
+ for (i = 0; i < ARRAY_SIZE (i386bsd_r_reg_offset); i++)
+ {
+ if (regnum == -1 || regnum == i)
+ {
+ int offset = i386bsd_r_reg_offset[i];
-void
-fill_fpregset (fpregset_t *fpregsetp, int regnum)
-{
- i387_collect_fsave (current_regcache, regnum, fpregsetp);
+ if (offset != -1)
+ regcache_raw_collect (regcache, i, regs + offset);
+ }
+ }
}
/* 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 (struct target_ops *ops,
+ struct regcache *regcache, int regnum)
{
if (regnum == -1 || GETREGS_SUPPLIES (regnum))
{
- gregset_t gregs;
+ struct reg regs;
- if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
- perror_with_name ("Couldn't get registers");
+ if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) ®s, 0) == -1)
+ perror_with_name (_("Couldn't get registers"));
- supply_gregset (&gregs);
+ i386bsd_supply_gregset (regcache, ®s);
if (regnum != -1)
return;
}
if (regnum == -1 || regnum >= I386_ST0_REGNUM)
{
- fpregset_t fpregs;
+ struct fpreg fpregs;
#ifdef HAVE_PT_GETXMMREGS
char xmmregs[512];
+#endif
+
+#ifdef PT_GETXSTATE_INFO
+ if (i386bsd_xsave_len != 0)
+ {
+ char *xstateregs;
+
+ xstateregs = alloca (i386bsd_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"));
+ i387_supply_xsave (regcache, -1, xstateregs);
+ return;
+ }
+#endif
+
+#ifdef HAVE_PT_GETXMMREGS
if (have_ptrace_xmmregs != 0
- && ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) xmmregs, 0) == 0)
+ && ptrace(PT_GETXMMREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
{
have_ptrace_xmmregs = 1;
- i387_supply_fxsave (current_regcache, -1, xmmregs);
+ i387_supply_fxsave (regcache, -1, xmmregs);
}
else
{
- if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
- perror_with_name ("Couldn't get floating point status");
+ have_ptrace_xmmregs = 0;
+#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"));
- i387_supply_fsave (current_regcache, -1, &fpregs);
+ i387_supply_fsave (regcache, -1, &fpregs);
+#ifdef HAVE_PT_GETXMMREGS
}
-#else
- if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
- perror_with_name ("Couldn't get floating point status");
-
- i387_supply_fsave (current_regcache, -1, &fpregs);
#endif
}
}
@@ -224,22 +195,23 @@ 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 (struct target_ops *ops,
+ struct regcache *regcache, int regnum)
{
if (regnum == -1 || GETREGS_SUPPLIES (regnum))
{
- gregset_t gregs;
+ struct reg regs;
- if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
- perror_with_name ("Couldn't get registers");
+ if (ptrace (PT_GETREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) ®s, 0) == -1)
+ perror_with_name (_("Couldn't get registers"));
- fill_gregset (&gregs, regnum);
+ i386bsd_collect_gregset (regcache, ®s, regnum);
- if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) &gregs, 0) == -1)
- perror_with_name ("Couldn't write registers");
+ if (ptrace (PT_SETREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) ®s, 0) == -1)
+ perror_with_name (_("Couldn't write registers"));
if (regnum != -1)
return;
@@ -247,40 +219,75 @@ store_inferior_registers (int regnum)
if (regnum == -1 || regnum >= I386_ST0_REGNUM)
{
- fpregset_t fpregs;
+ struct fpreg fpregs;
#ifdef HAVE_PT_GETXMMREGS
char xmmregs[512];
+#endif
+
+#ifdef PT_GETXSTATE_INFO
+ if (i386bsd_xsave_len != 0)
+ {
+ char *xstateregs;
+
+ xstateregs = alloca (i386bsd_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"));
+
+ i387_collect_xsave (regcache, -1, xstateregs, 0);
+
+ if (ptrace (PT_SETXSTATE, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) xstateregs, i386bsd_xsave_len) == -1)
+ perror_with_name (_("Couldn't write extended state status"));
+ return;
+ }
+#endif
+#ifdef HAVE_PT_GETXMMREGS
if (have_ptrace_xmmregs != 0
- && ptrace(PT_GETXMMREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) xmmregs, 0) == 0)
+ && ptrace(PT_GETXMMREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) xmmregs, 0) == 0)
{
have_ptrace_xmmregs = 1;
- i387_collect_fxsave (current_regcache, regnum, xmmregs);
+ i387_collect_fxsave (regcache, regnum, xmmregs);
- if (ptrace (PT_SETXMMREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) xmmregs, 0) == -1)
- perror_with_name ("Couldn't write XMM registers");
+ if (ptrace (PT_SETXMMREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) xmmregs, 0) == -1)
+ perror_with_name (_("Couldn't write XMM registers"));
}
else
{
have_ptrace_xmmregs = 0;
#endif
- if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
- perror_with_name ("Couldn't get floating point status");
+ if (ptrace (PT_GETFPREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) &fpregs, 0) == -1)
+ perror_with_name (_("Couldn't get floating point status"));
- i387_collect_fsave (current_regcache, regnum, &fpregs);
+ i387_collect_fsave (regcache, regnum, &fpregs);
- if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) &fpregs, 0) == -1)
- perror_with_name ("Couldn't write floating point status");
+ if (ptrace (PT_SETFPREGS, get_ptrace_pid (inferior_ptid),
+ (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;
+}
/* Support for debug registers. */
@@ -293,14 +300,26 @@ store_inferior_registers (int regnum)
#define DBREG_DRX(d, x) ((&d->dr0)[x])
#endif
+static unsigned long
+i386bsd_dr_get (ptid_t ptid, int regnum)
+{
+ struct dbreg dbregs;
+
+ if (ptrace (PT_GETDBREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
+ perror_with_name (_("Couldn't read debug registers"));
+
+ return DBREG_DRX ((&dbregs), regnum);
+}
+
static void
i386bsd_dr_set (int regnum, unsigned int value)
{
struct dbreg dbregs;
- if (ptrace (PT_GETDBREGS, PIDGET (inferior_ptid),
- (PTRACE_ARG3_TYPE) &dbregs, 0) == -1)
- perror_with_name ("Couldn't get debug registers");
+ if (ptrace (PT_GETDBREGS, get_ptrace_pid (inferior_ptid),
+ (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
debug control register get set. Mask these off, otherwise the
@@ -309,9 +328,9 @@ 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)
- perror_with_name ("Couldn't write debug registers");
+ if (ptrace (PT_SETDBREGS, get_ptrace_pid (inferior_ptid),
+ (PTRACE_TYPE_ARG3) &dbregs, 0) == -1)
+ perror_with_name (_("Couldn't write debug registers"));
}
void
@@ -328,60 +347,30 @@ i386bsd_dr_set_addr (int regnum, CORE_ADDR addr)
i386bsd_dr_set (regnum, addr);
}
-void
-i386bsd_dr_reset_addr (int regnum)
+CORE_ADDR
+i386bsd_dr_get_addr (int regnum)
{
- gdb_assert (regnum >= 0 && regnum <= 4);
-
- i386bsd_dr_set (regnum, 0);
+ return i386bsd_dr_get (inferior_ptid, regnum);
}
unsigned long
i386bsd_dr_get_status (void)
{
- struct dbreg dbregs;
-
- /* FIXME: kettenis/2001-03-31: Calling perror_with_name if the
- ptrace call fails breaks debugging remote targets. The correct
- way to fix this is to add the hardware breakpoint and watchpoint
- 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)
-#if 0
- perror_with_name ("Couldn't read debug registers");
-#else
- return 0;
-#endif
-
- return DBREG_DRX ((&dbregs), 6);
+ return i386bsd_dr_get (inferior_ptid, 6);
}
-#endif /* PT_GETDBREGS */
-
-
-/* Support for the user struct. */
-
-/* Return the address register REGNUM. BLOCKEND is the value of
- u.u_ar0, which should point to the registers. */
-
-CORE_ADDR
-register_u_addr (CORE_ADDR blockend, int regnum)
+unsigned long
+i386bsd_dr_get_control (void)
{
- return (CORE_ADDR) REG_ADDR (blockend, regnum);
+ return i386bsd_dr_get (inferior_ptid, 7);
}
-#include
-#include
+#endif /* PT_GETDBREGS */
+
-/* Return the size of the user struct. */
+/* Provide a prototype to silence -Wmissing-prototypes. */
+void _initialize_i386bsd_nat (void);
-int
-kernel_u_size (void)
-{
- return (sizeof (struct user));
-}
-
void
_initialize_i386bsd_nat (void)
{
@@ -401,10 +390,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
@@ -421,9 +410,9 @@ _initialize_i386bsd_nat (void)
if (SC_PC_OFFSET != offset)
{
- warning ("\
+ warning (_("\
offsetof (struct sigcontext, sc_pc) yields %d instead of %d.\n\
-Please report this to .",
+Please report this to ."),
offset, SC_PC_OFFSET);
}
@@ -434,9 +423,9 @@ Please report this to .",
if (SC_SP_OFFSET != offset)
{
- warning ("\
+ warning (_("\
offsetof (struct sigcontext, sc_sp) yields %d instead of %d.\n\
-Please report this to .",
+Please report this to ."),
offset, SC_SP_OFFSET);
}
@@ -447,11 +436,13 @@ Please report this to .",
if (SC_FP_OFFSET != offset)
{
- warning ("\
+ warning (_("\
offsetof (struct sigcontext, sc_fp) yields %d instead of %d.\n\
-Please report this to .",
+Please report this to ."),
offset, SC_FP_OFFSET);
}
SC_FP_OFFSET = offset;
+
+#endif /* SC_REG_OFFSET */
}