-/* Native-dependent code for Linux running on i386's, for GDB.
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Native-dependent code for GNU/Linux i386.
+
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009 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,
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 "gdbcore.h"
+#include "regcache.h"
+#include "target.h"
+#include "linux-nat.h"
-/* For i386_linux_skip_solib_resolver. */
-#include "symtab.h"
-#include "symfile.h"
-#include "objfiles.h"
-
+#include "gdb_assert.h"
+#include "gdb_string.h"
#include <sys/ptrace.h>
#include <sys/user.h>
#include <sys/procfs.h>
#include <sys/reg.h>
#endif
-/* Prototypes for supply_gregset etc. */
-#include "gregset.h"
+#ifndef ORIG_EAX
+#define ORIG_EAX -1
+#endif
-/* On Linux, threads are implemented as pseudo-processes, in which
- case we may be tracing more than one process at a time. In that
- case, inferior_pid will contain the main process ID and the
- individual thread (process) ID mashed together. These macros are
- used to separate them out. These definitions should be overridden
- if thread support is included. */
+#ifdef HAVE_SYS_DEBUGREG_H
+#include <sys/debugreg.h>
+#endif
+
+#ifndef DR_FIRSTADDR
+#define DR_FIRSTADDR 0
+#endif
-#if !defined (PIDGET) /* Default definition for PIDGET/TIDGET. */
-#define PIDGET(PID) PID
-#define TIDGET(PID) 0
+#ifndef DR_LASTADDR
+#define DR_LASTADDR 3
#endif
+#ifndef DR_STATUS
+#define DR_STATUS 6
+#endif
+
+#ifndef DR_CONTROL
+#define DR_CONTROL 7
+#endif
+
+/* Prototypes for supply_gregset etc. */
+#include "gregset.h"
+
+#include "i387-tdep.h"
+#include "i386-tdep.h"
+#include "i386-linux-tdep.h"
+
+/* Defines ps_err_e, struct ps_prochandle. */
+#include "gdb_proc_service.h"
+\f
-/* The register sets used in Linux ELF core-dumps are identical to the
- register sets in `struct user' that is used for a.out core-dumps,
- and is also used by `ptrace'. The corresponding types are
- `elf_gregset_t' for the general-purpose registers (with
+/* The register sets used in GNU/Linux ELF core-dumps are identical to
+ the register sets in `struct user' that is used for a.out
+ core-dumps, and is also used by `ptrace'. The corresponding types
+ are `elf_gregset_t' for the general-purpose registers (with
`elf_greg_t' the type of a single GP register) and `elf_fpregset_t'
for the floating-point registers.
EAX, ECX, EDX, EBX,
UESP, EBP, ESI, EDI,
EIP, EFL, CS, SS,
- DS, ES, FS, GS
+ DS, ES, FS, GS,
+ -1, -1, -1, -1, /* st0, st1, st2, st3 */
+ -1, -1, -1, -1, /* st4, st5, st6, st7 */
+ -1, -1, -1, -1, /* fctrl, fstat, ftag, fiseg */
+ -1, -1, -1, -1, /* fioff, foseg, fooff, fop */
+ -1, -1, -1, -1, /* xmm0, xmm1, xmm2, xmm3 */
+ -1, -1, -1, -1, /* xmm4, xmm5, xmm6, xmm6 */
+ -1, /* mxcsr */
+ ORIG_EAX
};
/* Which ptrace request retrieves which registers?
These apply to the corresponding SET requests as well. */
+
#define GETREGS_SUPPLIES(regno) \
- (0 <= (regno) && (regno) <= 15)
-#define GETFPREGS_SUPPLIES(regno) \
- (FP0_REGNUM <= (regno) && (regno) <= LAST_FPU_CTRL_REGNUM)
-#define GETXFPREGS_SUPPLIES(regno) \
- (FP0_REGNUM <= (regno) && (regno) <= MXCSR_REGNUM)
+ ((0 <= (regno) && (regno) <= 15) || (regno) == I386_LINUX_ORIG_EAX_REGNUM)
+
+#define GETFPXREGS_SUPPLIES(regno) \
+ (I386_ST0_REGNUM <= (regno) && (regno) < I386_SSE_NUM_REGS)
/* Does the current host support the GETREGS request? */
int have_ptrace_getregs =
#endif
;
-/* Does the current host support the GETXFPREGS request? The header
+/* Does the current host support the GETFPXREGS request? The header
file may or may not define it, and even if it is defined, the
kernel will return EIO if it's running on a pre-SSE processor.
- PTRACE_GETXFPREGS is a Cygnus invention, since we wrote our own
- Linux kernel patch for SSE support. That patch may or may not
- actually make it into the official distribution. If you find that
- years have gone by since this stuff was added, and Linux isn't
- using PTRACE_GETXFPREGS, that means that our patch didn't make it,
- and you can delete this, and the related code.
-
My instinct is to attach this to some architecture- or
target-specific data structure, but really, a particular GDB
process can only run on top of one kernel at a time. So it's okay
for this to be a simple variable. */
-int have_ptrace_getxfpregs =
-#ifdef HAVE_PTRACE_GETXFPREGS
+int have_ptrace_getfpxregs =
+#ifdef HAVE_PTRACE_GETFPXREGS
1
#else
0
#endif
;
-
\f
-/* Fetching registers directly from the U area, one at a time. */
-
-/* FIXME: kettenis/2000-03-05: This duplicates code from `inptrace.c'.
- The problem is that we define FETCH_INFERIOR_REGISTERS since we
- want to use our own versions of {fetch,store}_inferior_registers
- that use the GETREGS request. This means that the code in
- `infptrace.c' is #ifdef'd out. But we need to fall back on that
- code when GDB is running on top of a kernel that doesn't support
- the GETREGS request. I want to avoid changing `infptrace.c' right
- now. */
-
-#ifndef PT_READ_U
-#define PT_READ_U PTRACE_PEEKUSR
-#endif
-#ifndef PT_WRITE_U
-#define PT_WRITE_U PTRACE_POKEUSR
-#endif
-
-/* Default the type of the ptrace transfer to int. */
-#ifndef PTRACE_XFER_TYPE
-#define PTRACE_XFER_TYPE int
-#endif
-/* Registers we shouldn't try to fetch. */
-#if !defined (CANNOT_FETCH_REGISTER)
-#define CANNOT_FETCH_REGISTER(regno) 0
-#endif
+/* Accessing registers through the U area, one at a time. */
/* Fetch one register. */
static void
-fetch_register (regno)
- int regno;
+fetch_register (struct regcache *regcache, int regno)
{
- /* This isn't really an address. But ptrace thinks of it as one. */
- CORE_ADDR regaddr;
- char mess[128]; /* For messages */
- register int i;
- unsigned int offset; /* Offset of registers within the u area. */
- char buf[MAX_REGISTER_RAW_SIZE];
int tid;
+ int val;
- if (CANNOT_FETCH_REGISTER (regno))
+ gdb_assert (!have_ptrace_getregs);
+ if (regmap[regno] == -1)
{
- memset (buf, '\0', REGISTER_RAW_SIZE (regno)); /* Supply zeroes */
- supply_register (regno, buf);
+ regcache_raw_supply (regcache, regno, NULL);
return;
}
- /* Overload thread id onto process id */
- if ((tid = TIDGET (inferior_pid)) == 0)
- tid = inferior_pid; /* no thread id, just use process id */
+ /* GNU/Linux LWP ID's are process ID's. */
+ tid = TIDGET (inferior_ptid);
+ if (tid == 0)
+ tid = PIDGET (inferior_ptid); /* Not a threaded program. */
- offset = U_REGS_OFFSET;
+ errno = 0;
+ val = ptrace (PTRACE_PEEKUSER, tid, 4 * regmap[regno], 0);
+ if (errno != 0)
+ error (_("Couldn't read register %s (#%d): %s."),
+ gdbarch_register_name (get_regcache_arch (regcache), regno),
+ regno, safe_strerror (errno));
- regaddr = register_addr (regno, offset);
- for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))
- {
- errno = 0;
- *(PTRACE_XFER_TYPE *) & buf[i] = ptrace (PT_READ_U, tid,
- (PTRACE_ARG3_TYPE) regaddr, 0);
- regaddr += sizeof (PTRACE_XFER_TYPE);
- if (errno != 0)
- {
- sprintf (mess, "reading register %s (#%d)",
- REGISTER_NAME (regno), regno);
- perror_with_name (mess);
- }
- }
- supply_register (regno, buf);
+ regcache_raw_supply (regcache, regno, &val);
}
-/* Fetch register values from the inferior.
- If REGNO is negative, do this for all registers.
- Otherwise, REGNO specifies which register (so we can save time). */
-
-void
-old_fetch_inferior_registers (regno)
- int regno;
-{
- if (regno >= 0)
- {
- fetch_register (regno);
- }
- else
- {
- for (regno = 0; regno < ARCH_NUM_REGS; regno++)
- {
- fetch_register (regno);
- }
- }
-}
-
-/* Registers we shouldn't try to store. */
-#if !defined (CANNOT_STORE_REGISTER)
-#define CANNOT_STORE_REGISTER(regno) 0
-#endif
-
/* Store one register. */
static void
-store_register (regno)
- int regno;
+store_register (const struct regcache *regcache, int regno)
{
- /* This isn't really an address. But ptrace thinks of it as one. */
- CORE_ADDR regaddr;
- char mess[128]; /* For messages */
- register int i;
- unsigned int offset; /* Offset of registers within the u area. */
int tid;
-
- if (CANNOT_STORE_REGISTER (regno))
- {
- return;
- }
-
- /* Overload thread id onto process id */
- if ((tid = TIDGET (inferior_pid)) == 0)
- tid = inferior_pid; /* no thread id, just use process id */
-
- offset = U_REGS_OFFSET;
-
- regaddr = register_addr (regno, offset);
- for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))
- {
- errno = 0;
- ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) regaddr,
- *(PTRACE_XFER_TYPE *) & registers[REGISTER_BYTE (regno) + i]);
- regaddr += sizeof (PTRACE_XFER_TYPE);
- if (errno != 0)
- {
- sprintf (mess, "writing register %s (#%d)",
- REGISTER_NAME (regno), regno);
- perror_with_name (mess);
- }
- }
-}
-
-/* Store our register values back into the inferior.
- If REGNO is negative, do this for all registers.
- Otherwise, REGNO specifies which register (so we can save time). */
-
-void
-old_store_inferior_registers (regno)
- int regno;
-{
- if (regno >= 0)
- {
- store_register (regno);
- }
- else
- {
- for (regno = 0; regno < ARCH_NUM_REGS; regno++)
- {
- store_register (regno);
- }
- }
+ int val;
+
+ gdb_assert (!have_ptrace_getregs);
+ if (regmap[regno] == -1)
+ return;
+
+ /* GNU/Linux LWP ID's are process ID's. */
+ tid = TIDGET (inferior_ptid);
+ if (tid == 0)
+ tid = PIDGET (inferior_ptid); /* Not a threaded program. */
+
+ errno = 0;
+ regcache_raw_collect (regcache, regno, &val);
+ ptrace (PTRACE_POKEUSER, tid, 4 * regmap[regno], val);
+ if (errno != 0)
+ error (_("Couldn't write register %s (#%d): %s."),
+ gdbarch_register_name (get_regcache_arch (regcache), regno),
+ regno, safe_strerror (errno));
}
-
\f
+
/* Transfering the general-purpose registers between GDB, inferiors
and core files. */
-/* Fill GDB's register array with the genereal-purpose register values
+/* Fill GDB's register array with the general-purpose register values
in *GREGSETP. */
void
-supply_gregset (elf_gregset_t *gregsetp)
+supply_gregset (struct regcache *regcache, const elf_gregset_t *gregsetp)
{
- elf_greg_t *regp = (elf_greg_t *) gregsetp;
- int regi;
-
- for (regi = 0; regi < NUM_GREGS; regi++)
- supply_register (regi, (char *) (regp + regmap[regi]));
-}
-
-/* Convert the valid general-purpose register values in GDB's register
- array to `struct user' format and store them in *GREGSETP. The
- array VALID indicates which register values are valid. If VALID is
- NULL, all registers are assumed to be valid. */
+ const elf_greg_t *regp = (const elf_greg_t *) gregsetp;
+ int i;
-static void
-convert_to_gregset (elf_gregset_t *gregsetp, signed char *valid)
-{
- elf_greg_t *regp = (elf_greg_t *) gregsetp;
- int regi;
+ for (i = 0; i < I386_NUM_GREGS; i++)
+ regcache_raw_supply (regcache, i, regp + regmap[i]);
- for (regi = 0; regi < NUM_GREGS; regi++)
- if (! valid || valid[regi])
- *(regp + regmap[regi]) = * (int *) ®isters[REGISTER_BYTE (regi)];
+ if (I386_LINUX_ORIG_EAX_REGNUM
+ < gdbarch_num_regs (get_regcache_arch (regcache)))
+ regcache_raw_supply (regcache, I386_LINUX_ORIG_EAX_REGNUM,
+ regp + ORIG_EAX);
}
/* Fill register REGNO (if it is a general-purpose register) in
*GREGSETPS with the value in GDB's register array. If REGNO is -1,
do this for all registers. */
+
void
-fill_gregset (elf_gregset_t *gregsetp, int regno)
+fill_gregset (const struct regcache *regcache,
+ elf_gregset_t *gregsetp, int regno)
{
- if (regno == -1)
- {
- convert_to_gregset (gregsetp, NULL);
- return;
- }
-
- if (GETREGS_SUPPLIES (regno))
- {
- signed char valid[NUM_GREGS];
+ elf_greg_t *regp = (elf_greg_t *) gregsetp;
+ int i;
- memset (valid, 0, sizeof (valid));
- valid[regno] = 1;
+ for (i = 0; i < I386_NUM_GREGS; i++)
+ if (regno == -1 || regno == i)
+ regcache_raw_collect (regcache, i, regp + regmap[i]);
- convert_to_gregset (gregsetp, valid);
- }
+ if ((regno == -1 || regno == I386_LINUX_ORIG_EAX_REGNUM)
+ && I386_LINUX_ORIG_EAX_REGNUM
+ < gdbarch_num_regs (get_regcache_arch (regcache)))
+ regcache_raw_collect (regcache, I386_LINUX_ORIG_EAX_REGNUM,
+ regp + ORIG_EAX);
}
#ifdef HAVE_PTRACE_GETREGS
store their values in GDB's register array. */
static void
-fetch_regs (int tid)
+fetch_regs (struct regcache *regcache, int tid)
{
elf_gregset_t regs;
- int ret;
+ elf_gregset_t *regs_p = ®s;
- ret = ptrace (PTRACE_GETREGS, tid, 0, (int) ®s);
- if (ret < 0)
+ if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0)
{
if (errno == EIO)
{
return;
}
- warning ("Couldn't get registers.");
- return;
+ perror_with_name (_("Couldn't get registers"));
}
- supply_gregset (®s);
+ supply_gregset (regcache, (const elf_gregset_t *) regs_p);
}
/* Store all valid general-purpose registers in GDB's register array
into the process/thread specified by TID. */
static void
-store_regs (int tid)
+store_regs (const struct regcache *regcache, int tid, int regno)
{
elf_gregset_t regs;
- int ret;
- ret = ptrace (PTRACE_GETREGS, tid, 0, (int) ®s);
- if (ret < 0)
- {
- warning ("Couldn't get registers.");
- return;
- }
+ if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0)
+ perror_with_name (_("Couldn't get registers"));
- convert_to_gregset (®s, register_valid);
-
- ret = ptrace (PTRACE_SETREGS, tid, 0, (int) ®s);
- if (ret < 0)
- {
- warning ("Couldn't write registers.");
- return;
- }
+ fill_gregset (regcache, ®s, regno);
+
+ if (ptrace (PTRACE_SETREGS, tid, 0, (int) ®s) < 0)
+ perror_with_name (_("Couldn't write registers"));
}
#else
-static void fetch_regs (int tid) {}
-static void store_regs (int tid) {}
+static void fetch_regs (struct regcache *regcache, int tid) {}
+static void store_regs (const struct regcache *regcache, int tid, int regno) {}
#endif
-
\f
-/* Transfering floating-point registers between GDB, inferiors and cores. */
-/* What is the address of st(N) within the floating-point register set F? */
-#define FPREG_ADDR(f, n) ((char *) &(f)->st_space + (n) * 10)
+/* Transfering floating-point registers between GDB, inferiors and cores. */
/* Fill GDB's register array with the floating-point register values in
*FPREGSETP. */
void
-supply_fpregset (elf_fpregset_t *fpregsetp)
+supply_fpregset (struct regcache *regcache, const elf_fpregset_t *fpregsetp)
{
- int reg;
- long l;
-
- /* Supply the floating-point registers. */
- for (reg = 0; reg < 8; reg++)
- supply_register (FP0_REGNUM + reg, FPREG_ADDR (fpregsetp, reg));
-
- /* We have to mask off the reserved bits in *FPREGSETP before
- storing the values in GDB's register file. */
-#define supply(REGNO, MEMBER) \
- l = fpregsetp->MEMBER & 0xffff; \
- supply_register (REGNO, (char *) &l)
-
- supply (FCTRL_REGNUM, cwd);
- supply (FSTAT_REGNUM, swd);
- supply (FTAG_REGNUM, twd);
- supply_register (FCOFF_REGNUM, (char *) &fpregsetp->fip);
- supply (FDS_REGNUM, fos);
- supply_register (FDOFF_REGNUM, (char *) &fpregsetp->foo);
-
-#undef supply
-
- /* Extract the code segment and opcode from the "fcs" member. */
- l = fpregsetp->fcs & 0xffff;
- supply_register (FCS_REGNUM, (char *) &l);
-
- l = (fpregsetp->fcs >> 16) & ((1 << 11) - 1);
- supply_register (FOP_REGNUM, (char *) &l);
-}
-
-/* Convert the valid floating-point register values in GDB's register
- array to `struct user' format and store them in *FPREGSETP. The
- array VALID indicates which register values are valid. If VALID is
- NULL, all registers are assumed to be valid. */
-
-static void
-convert_to_fpregset (elf_fpregset_t *fpregsetp, signed char *valid)
-{
- int reg;
-
- /* Fill in the floating-point registers. */
- for (reg = 0; reg < 8; reg++)
- if (!valid || valid[reg])
- memcpy (FPREG_ADDR (fpregsetp, reg),
- ®isters[REGISTER_BYTE (FP0_REGNUM + reg)],
- REGISTER_RAW_SIZE(FP0_REGNUM + reg));
-
- /* We're not supposed to touch the reserved bits in *FPREGSETP. */
-
-#define fill(MEMBER, REGNO) \
- if (! valid || valid[(REGNO)]) \
- fpregsetp->MEMBER \
- = ((fpregsetp->MEMBER & ~0xffff) \
- | (* (int *) ®isters[REGISTER_BYTE (REGNO)] & 0xffff))
-
-#define fill_register(MEMBER, REGNO) \
- if (! valid || valid[(REGNO)]) \
- memcpy (&fpregsetp->MEMBER, ®isters[REGISTER_BYTE (REGNO)], \
- sizeof (fpregsetp->MEMBER))
-
- fill (cwd, FCTRL_REGNUM);
- fill (swd, FSTAT_REGNUM);
- fill (twd, FTAG_REGNUM);
- fill_register (fip, FCOFF_REGNUM);
- fill (foo, FDOFF_REGNUM);
- fill_register (fos, FDS_REGNUM);
-
-#undef fill
-#undef fill_register
-
- if (! valid || valid[FCS_REGNUM])
- fpregsetp->fcs
- = ((fpregsetp->fcs & ~0xffff)
- | (* (int *) ®isters[REGISTER_BYTE (FCS_REGNUM)] & 0xffff));
-
- if (! valid || valid[FOP_REGNUM])
- fpregsetp->fcs
- = ((fpregsetp->fcs & 0xffff)
- | ((*(int *) ®isters[REGISTER_BYTE (FOP_REGNUM)] & ((1 << 11) - 1))
- << 16));
+ i387_supply_fsave (regcache, -1, fpregsetp);
}
/* Fill register REGNO (if it is a floating-point register) in
do this for all registers. */
void
-fill_fpregset (elf_fpregset_t *fpregsetp, int regno)
+fill_fpregset (const struct regcache *regcache,
+ elf_fpregset_t *fpregsetp, int regno)
{
- if (regno == -1)
- {
- convert_to_fpregset (fpregsetp, NULL);
- return;
- }
-
- if (GETFPREGS_SUPPLIES(regno))
- {
- signed char valid[MAX_NUM_REGS];
-
- memset (valid, 0, sizeof (valid));
- valid[regno] = 1;
-
- convert_to_fpregset (fpregsetp, valid);
- }
+ i387_collect_fsave (regcache, regno, fpregsetp);
}
#ifdef HAVE_PTRACE_GETREGS
thier values in GDB's register array. */
static void
-fetch_fpregs (int tid)
+fetch_fpregs (struct regcache *regcache, int tid)
{
elf_fpregset_t fpregs;
- int ret;
- ret = ptrace (PTRACE_GETFPREGS, tid, 0, (int) &fpregs);
- if (ret < 0)
- {
- warning ("Couldn't get floating point status.");
- return;
- }
+ if (ptrace (PTRACE_GETFPREGS, tid, 0, (int) &fpregs) < 0)
+ perror_with_name (_("Couldn't get floating point status"));
- supply_fpregset (&fpregs);
+ supply_fpregset (regcache, (const elf_fpregset_t *) &fpregs);
}
/* Store all valid floating-point registers in GDB's register array
into the process/thread specified by TID. */
static void
-store_fpregs (int tid)
+store_fpregs (const struct regcache *regcache, int tid, int regno)
{
elf_fpregset_t fpregs;
- int ret;
- ret = ptrace (PTRACE_GETFPREGS, tid, 0, (int) &fpregs);
- if (ret < 0)
- {
- warning ("Couldn't get floating point status.");
- return;
- }
+ if (ptrace (PTRACE_GETFPREGS, tid, 0, (int) &fpregs) < 0)
+ perror_with_name (_("Couldn't get floating point status"));
- convert_to_fpregset (&fpregs, register_valid);
+ fill_fpregset (regcache, &fpregs, regno);
- ret = ptrace (PTRACE_SETFPREGS, tid, 0, (int) &fpregs);
- if (ret < 0)
- {
- warning ("Couldn't write floating point status.");
- return;
- }
+ if (ptrace (PTRACE_SETFPREGS, tid, 0, (int) &fpregs) < 0)
+ perror_with_name (_("Couldn't write floating point status"));
}
#else
-static void fetch_fpregs (int tid) {}
-static void store_fpregs (int tid) {}
+static void fetch_fpregs (struct regcache *regcache, int tid) {}
+static void store_fpregs (const struct regcache *regcache, int tid, int regno) {}
#endif
-
\f
-/* Transfering floating-point and SSE registers to and from GDB. */
-/* PTRACE_GETXFPREGS is a Cygnus invention, since we wrote our own
- Linux kernel patch for SSE support. That patch may or may not
- actually make it into the official distribution. If you find that
- years have gone by since this code was added, and Linux isn't using
- PTRACE_GETXFPREGS, that means that our patch didn't make it, and
- you can delete this code. */
+/* Transfering floating-point and SSE registers to and from GDB. */
-#ifdef HAVE_PTRACE_GETXFPREGS
+#ifdef HAVE_PTRACE_GETFPXREGS
/* Fill GDB's register array with the floating-point and SSE register
- values in *XFPREGS. */
+ values in *FPXREGSETP. */
-static void
-supply_xfpregset (struct user_xfpregs_struct *xfpregs)
+void
+supply_fpxregset (struct regcache *regcache,
+ const elf_fpxregset_t *fpxregsetp)
{
- int reg;
-
- /* Supply the floating-point registers. */
- for (reg = 0; reg < 8; reg++)
- supply_register (FP0_REGNUM + reg, (char *) &xfpregs->st_space[reg]);
-
- {
- supply_register (FCTRL_REGNUM, (char *) &xfpregs->cwd);
- supply_register (FSTAT_REGNUM, (char *) &xfpregs->swd);
- supply_register (FTAG_REGNUM, (char *) &xfpregs->twd);
- supply_register (FCOFF_REGNUM, (char *) &xfpregs->fip);
- supply_register (FDS_REGNUM, (char *) &xfpregs->fos);
- supply_register (FDOFF_REGNUM, (char *) &xfpregs->foo);
-
- /* Extract the code segment and opcode from the "fcs" member. */
- {
- long l;
-
- l = xfpregs->fcs & 0xffff;
- supply_register (FCS_REGNUM, (char *) &l);
-
- l = (xfpregs->fcs >> 16) & ((1 << 11) - 1);
- supply_register (FOP_REGNUM, (char *) &l);
- }
- }
-
- /* Supply the SSE registers. */
- for (reg = 0; reg < 8; reg++)
- supply_register (XMM0_REGNUM + reg, (char *) &xfpregs->xmm_space[reg]);
- supply_register (MXCSR_REGNUM, (char *) &xfpregs->mxcsr);
+ i387_supply_fxsave (regcache, -1, fpxregsetp);
}
-/* Convert the valid floating-point and SSE registers in GDB's
- register array to `struct user' format and store them in *XFPREGS.
- The array VALID indicates which registers are valid. If VALID is
- NULL, all registers are assumed to be valid. */
+/* Fill register REGNO (if it is a floating-point or SSE register) in
+ *FPXREGSETP with the value in GDB's register array. If REGNO is
+ -1, do this for all registers. */
-static void
-convert_to_xfpregset (struct user_xfpregs_struct *xfpregs,
- signed char *valid)
+void
+fill_fpxregset (const struct regcache *regcache,
+ elf_fpxregset_t *fpxregsetp, int regno)
{
- int reg;
-
- /* Fill in the floating-point registers. */
- for (reg = 0; reg < 8; reg++)
- if (!valid || valid[reg])
- memcpy (&xfpregs->st_space[reg],
- ®isters[REGISTER_BYTE (FP0_REGNUM + reg)],
- REGISTER_RAW_SIZE(FP0_REGNUM + reg));
-
-#define fill(MEMBER, REGNO) \
- if (! valid || valid[(REGNO)]) \
- memcpy (&xfpregs->MEMBER, ®isters[REGISTER_BYTE (REGNO)], \
- sizeof (xfpregs->MEMBER))
-
- fill (cwd, FCTRL_REGNUM);
- fill (swd, FSTAT_REGNUM);
- fill (twd, FTAG_REGNUM);
- fill (fip, FCOFF_REGNUM);
- fill (foo, FDOFF_REGNUM);
- fill (fos, FDS_REGNUM);
-
-#undef fill
-
- if (! valid || valid[FCS_REGNUM])
- xfpregs->fcs
- = ((xfpregs->fcs & ~0xffff)
- | (* (int *) ®isters[REGISTER_BYTE (FCS_REGNUM)] & 0xffff));
-
- if (! valid || valid[FOP_REGNUM])
- xfpregs->fcs
- = ((xfpregs->fcs & 0xffff)
- | ((*(int *) ®isters[REGISTER_BYTE (FOP_REGNUM)] & ((1 << 11) - 1))
- << 16));
-
- /* Fill in the XMM registers. */
- for (reg = 0; reg < 8; reg++)
- if (! valid || valid[reg])
- memcpy (&xfpregs->xmm_space[reg],
- ®isters[REGISTER_BYTE (XMM0_REGNUM + reg)],
- REGISTER_RAW_SIZE (XMM0_REGNUM + reg));
+ i387_collect_fxsave (regcache, regno, fpxregsetp);
}
-/* Fetch all registers covered by the PTRACE_SETXFPREGS request from
+/* Fetch all registers covered by the PTRACE_GETFPXREGS request from
process/thread TID and store their values in GDB's register array.
Return non-zero if successful, zero otherwise. */
static int
-fetch_xfpregs (int tid)
+fetch_fpxregs (struct regcache *regcache, int tid)
{
- struct user_xfpregs_struct xfpregs;
- int ret;
+ elf_fpxregset_t fpxregs;
- if (! have_ptrace_getxfpregs)
+ if (! have_ptrace_getfpxregs)
return 0;
- ret = ptrace (PTRACE_GETXFPREGS, tid, 0, &xfpregs);
- if (ret == -1)
+ if (ptrace (PTRACE_GETFPXREGS, tid, 0, (int) &fpxregs) < 0)
{
if (errno == EIO)
{
- have_ptrace_getxfpregs = 0;
+ have_ptrace_getfpxregs = 0;
return 0;
}
- warning ("Couldn't read floating-point and SSE registers.");
- return 0;
+ perror_with_name (_("Couldn't read floating-point and SSE registers"));
}
- supply_xfpregset (&xfpregs);
+ supply_fpxregset (regcache, (const elf_fpxregset_t *) &fpxregs);
return 1;
}
/* Store all valid registers in GDB's register array covered by the
- PTRACE_SETXFPREGS request into the process/thread specified by TID.
+ PTRACE_SETFPXREGS request into the process/thread specified by TID.
Return non-zero if successful, zero otherwise. */
static int
-store_xfpregs (int tid)
+store_fpxregs (const struct regcache *regcache, int tid, int regno)
{
- struct user_xfpregs_struct xfpregs;
- int ret;
+ elf_fpxregset_t fpxregs;
- if (! have_ptrace_getxfpregs)
+ if (! have_ptrace_getfpxregs)
return 0;
-
- ret = ptrace (PTRACE_GETXFPREGS, tid, 0, &xfpregs);
- if (ret == -1)
+
+ if (ptrace (PTRACE_GETFPXREGS, tid, 0, &fpxregs) == -1)
{
if (errno == EIO)
{
- have_ptrace_getxfpregs = 0;
+ have_ptrace_getfpxregs = 0;
return 0;
}
- warning ("Couldn't read floating-point and SSE registers.");
- return 0;
+ perror_with_name (_("Couldn't read floating-point and SSE registers"));
}
- convert_to_xfpregset (&xfpregs, register_valid);
+ fill_fpxregset (regcache, &fpxregs, regno);
- if (ptrace (PTRACE_SETXFPREGS, tid, 0, &xfpregs) < 0)
- {
- warning ("Couldn't write floating-point and SSE registers.");
- return 0;
- }
+ if (ptrace (PTRACE_SETFPXREGS, tid, 0, &fpxregs) == -1)
+ perror_with_name (_("Couldn't write floating-point and SSE registers"));
return 1;
}
-/* Fill the XMM registers in the register array with dummy values. For
- cases where we don't have access to the XMM registers. I think
- this is cleaner than printing a warning. For a cleaner solution,
- we should gdbarchify the i386 family. */
-
-static void
-dummy_sse_values (void)
-{
- /* C doesn't have a syntax for NaN's, so write it out as an array of
- longs. */
- static long dummy[4] = { 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff };
- static long mxcsr = 0x1f80;
- int reg;
-
- for (reg = 0; reg < 8; reg++)
- supply_register (XMM0_REGNUM + reg, (char *) dummy);
- supply_register (MXCSR_REGNUM, (char *) &mxcsr);
-}
-
#else
-/* Stub versions of the above routines, for systems that don't have
- PTRACE_GETXFPREGS. */
-static int store_xfpregs (int tid) { return 0; }
-static int fetch_xfpregs (int tid) { return 0; }
-static void dummy_sse_values (void) {}
-
-#endif
+static int fetch_fpxregs (struct regcache *regcache, int tid) { return 0; }
+static int store_fpxregs (const struct regcache *regcache, int tid, int regno) { return 0; }
+#endif /* HAVE_PTRACE_GETFPXREGS */
\f
+
/* Transferring arbitrary registers between GDB and inferior. */
/* Fetch register REGNO from the child process. If REGNO is -1, do
this for all registers (including the floating point and SSE
registers). */
-void
-fetch_inferior_registers (int regno)
+static void
+i386_linux_fetch_inferior_registers (struct regcache *regcache, int regno)
{
int tid;
/* Use the old method of peeking around in `struct user' if the
GETREGS request isn't available. */
- if (! have_ptrace_getregs)
+ if (!have_ptrace_getregs)
{
- old_fetch_inferior_registers (regno);
+ int i;
+
+ for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+ if (regno == -1 || regno == i)
+ fetch_register (regcache, i);
+
return;
}
- /* Linux LWP ID's are process ID's. */
- if ((tid = TIDGET (inferior_pid)) == 0)
- tid = inferior_pid; /* Not a threaded program. */
+ /* GNU/Linux LWP ID's are process ID's. */
+ tid = TIDGET (inferior_ptid);
+ if (tid == 0)
+ tid = PIDGET (inferior_ptid); /* Not a threaded program. */
- /* Use the PTRACE_GETXFPREGS request whenever possible, since it
+ /* Use the PTRACE_GETFPXREGS request whenever possible, since it
transfers more registers in one system call, and we'll cache the
- results. But remember that fetch_xfpregs can fail, and return
+ results. But remember that fetch_fpxregs can fail, and return
zero. */
if (regno == -1)
{
- fetch_regs (tid);
+ fetch_regs (regcache, tid);
/* The call above might reset `have_ptrace_getregs'. */
- if (! have_ptrace_getregs)
+ if (!have_ptrace_getregs)
{
- old_fetch_inferior_registers (-1);
+ i386_linux_fetch_inferior_registers (regcache, regno);
return;
}
- if (fetch_xfpregs (tid))
+ if (fetch_fpxregs (regcache, tid))
return;
- fetch_fpregs (tid);
+ fetch_fpregs (regcache, tid);
return;
}
if (GETREGS_SUPPLIES (regno))
{
- fetch_regs (tid);
+ fetch_regs (regcache, tid);
return;
}
- if (GETXFPREGS_SUPPLIES (regno))
+ if (GETFPXREGS_SUPPLIES (regno))
{
- if (fetch_xfpregs (tid))
+ if (fetch_fpxregs (regcache, tid))
return;
/* Either our processor or our kernel doesn't support the SSE
more graceful to handle differences in the register set using
gdbarch. Until then, this will at least make things work
plausibly. */
- fetch_fpregs (tid);
- dummy_sse_values ();
+ fetch_fpregs (regcache, tid);
return;
}
- internal_error ("i386-linux-nat.c (fetch_inferior_registers): "
- "got request for bad register number %d", regno);
+ internal_error (__FILE__, __LINE__,
+ _("Got request for bad register number %d."), regno);
}
/* Store register REGNO back into the child process. If REGNO is -1,
do this for all registers (including the floating point and SSE
registers). */
-void
-store_inferior_registers (int regno)
+static void
+i386_linux_store_inferior_registers (struct regcache *regcache, int regno)
{
int tid;
/* Use the old method of poking around in `struct user' if the
SETREGS request isn't available. */
- if (! have_ptrace_getregs)
+ if (!have_ptrace_getregs)
{
- old_store_inferior_registers (regno);
+ int i;
+
+ for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+ if (regno == -1 || regno == i)
+ store_register (regcache, i);
+
return;
}
- /* Linux LWP ID's are process ID's. */
- if ((tid = TIDGET (inferior_pid)) == 0)
- tid = inferior_pid; /* Not a threaded program. */
+ /* GNU/Linux LWP ID's are process ID's. */
+ tid = TIDGET (inferior_ptid);
+ if (tid == 0)
+ tid = PIDGET (inferior_ptid); /* Not a threaded program. */
- /* Use the PTRACE_SETXFPREGS requests whenever possibl, since it
+ /* Use the PTRACE_SETFPXREGS requests whenever possible, since it
transfers more registers in one system call. But remember that
- store_xfpregs can fail, and return zero. */
+ store_fpxregs can fail, and return zero. */
if (regno == -1)
{
- store_regs (tid);
- if (store_xfpregs (tid))
+ store_regs (regcache, tid, regno);
+ if (store_fpxregs (regcache, tid, regno))
return;
- store_fpregs (tid);
+ store_fpregs (regcache, tid, regno);
return;
}
if (GETREGS_SUPPLIES (regno))
{
- store_regs (tid);
+ store_regs (regcache, tid, regno);
return;
}
- if (GETXFPREGS_SUPPLIES (regno))
+ if (GETFPXREGS_SUPPLIES (regno))
{
- if (store_xfpregs (tid))
+ if (store_fpxregs (regcache, tid, regno))
return;
/* Either our processor or our kernel doesn't support the SSE
registers, so just write the FP registers in the traditional
way. */
- store_fpregs (tid);
+ store_fpregs (regcache, tid, regno);
return;
}
- internal_error ("Got request to store bad register number %d.", regno);
+ internal_error (__FILE__, __LINE__,
+ _("Got request to store bad register number %d."), regno);
}
-
\f
-/* Interpreting register set info found in core files. */
-/* Provide registers to GDB from a core file.
+/* Support for debug registers. */
+
+static unsigned long i386_linux_dr[DR_CONTROL + 1];
+
+static unsigned long
+i386_linux_dr_get (ptid_t ptid, int regnum)
+{
+ int tid;
+ unsigned long value;
+
+ tid = TIDGET (ptid);
+ if (tid == 0)
+ tid = PIDGET (ptid);
+
+ /* FIXME: kettenis/2001-03-27: 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. */
+ errno = 0;
+ value = ptrace (PTRACE_PEEKUSER, tid,
+ offsetof (struct user, u_debugreg[regnum]), 0);
+ if (errno != 0)
+#if 0
+ perror_with_name (_("Couldn't read debug register"));
+#else
+ return 0;
+#endif
+
+ return value;
+}
+
+static void
+i386_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
+{
+ int tid;
+
+ tid = TIDGET (ptid);
+ if (tid == 0)
+ tid = PIDGET (ptid);
+
+ errno = 0;
+ ptrace (PTRACE_POKEUSER, tid,
+ offsetof (struct user, u_debugreg[regnum]), value);
+ if (errno != 0)
+ perror_with_name (_("Couldn't write debug register"));
+}
+
+void
+i386_linux_dr_set_control (unsigned long control)
+{
+ struct lwp_info *lp;
+ ptid_t ptid;
- (We can't use the generic version of this function in
- core-regset.c, because Linux has *three* different kinds of
- register set notes. core-regset.c would have to call
- supply_xfpregset, which most platforms don't have.)
+ i386_linux_dr[DR_CONTROL] = control;
+ ALL_LWPS (lp, ptid)
+ i386_linux_dr_set (ptid, DR_CONTROL, control);
+}
- CORE_REG_SECT points to an array of bytes, which are the contents
- of a `note' from a core file which BFD thinks might contain
- register contents. CORE_REG_SIZE is its size.
+void
+i386_linux_dr_set_addr (int regnum, CORE_ADDR addr)
+{
+ struct lwp_info *lp;
+ ptid_t ptid;
- WHICH says which register set corelow suspects this is:
- 0 --- the general-purpose register set, in elf_gregset_t format
- 2 --- the floating-point register set, in elf_fpregset_t format
- 3 --- the extended floating-point register set, in struct
- user_xfpregs_struct format
+ gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR);
- REG_ADDR isn't used on Linux. */
+ i386_linux_dr[DR_FIRSTADDR + regnum] = addr;
+ ALL_LWPS (lp, ptid)
+ i386_linux_dr_set (ptid, DR_FIRSTADDR + regnum, addr);
+}
+
+void
+i386_linux_dr_reset_addr (int regnum)
+{
+ i386_linux_dr_set_addr (regnum, 0);
+}
+
+unsigned long
+i386_linux_dr_get_status (void)
+{
+ return i386_linux_dr_get (inferior_ptid, DR_STATUS);
+}
static void
-fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
- int which, CORE_ADDR reg_addr)
+i386_linux_new_thread (ptid_t ptid)
{
- elf_gregset_t gregset;
- elf_fpregset_t fpregset;
+ int i;
- switch (which)
- {
- case 0:
- if (core_reg_size != sizeof (gregset))
- warning ("Wrong size gregset in core file.");
- else
- {
- memcpy (&gregset, core_reg_sect, sizeof (gregset));
- supply_gregset (&gregset);
- }
- break;
+ for (i = DR_FIRSTADDR; i <= DR_LASTADDR; i++)
+ i386_linux_dr_set (ptid, i, i386_linux_dr[i]);
- case 2:
- if (core_reg_size != sizeof (fpregset))
- warning ("Wrong size fpregset in core file.");
- else
- {
- memcpy (&fpregset, core_reg_sect, sizeof (fpregset));
- supply_fpregset (&fpregset);
- }
- break;
-
-#ifdef HAVE_PTRACE_GETXFPREGS
- {
- struct user_xfpregs_struct xfpregset;
-
- case 3:
- if (core_reg_size != sizeof (xfpregset))
- warning ("Wrong size user_xfpregs_struct in core file.");
- else
- {
- memcpy (&xfpregset, core_reg_sect, sizeof (xfpregset));
- supply_xfpregset (&xfpregset);
- }
- break;
- }
+ i386_linux_dr_set (ptid, DR_CONTROL, i386_linux_dr[DR_CONTROL]);
+}
+\f
+
+/* Called by libthread_db. Returns a pointer to the thread local
+ storage (or its descriptor). */
+
+ps_err_e
+ps_get_thread_area (const struct ps_prochandle *ph,
+ lwpid_t lwpid, int idx, void **base)
+{
+ /* NOTE: cagney/2003-08-26: The definition of this buffer is found
+ in the kernel header <asm-i386/ldt.h>. It, after padding, is 4 x
+ 4 byte integers in size: `entry_number', `base_addr', `limit',
+ and a bunch of status bits.
+
+ The values returned by this ptrace call should be part of the
+ regcache buffer, and ps_get_thread_area should channel its
+ request through the regcache. That way remote targets could
+ provide the value using the remote protocol and not this direct
+ call.
+
+ Is this function needed? I'm guessing that the `base' is the
+ address of a a descriptor that libthread_db uses to find the
+ thread local address base that GDB needs. Perhaps that
+ descriptor is defined by the ABI. Anyway, given that
+ libthread_db calls this function without prompting (gdb
+ requesting tls base) I guess it needs info in there anyway. */
+ unsigned int desc[4];
+ gdb_assert (sizeof (int) == 4);
+
+#ifndef PTRACE_GET_THREAD_AREA
+#define PTRACE_GET_THREAD_AREA 25
#endif
- default:
- /* We've covered all the kinds of registers we know about here,
- so this must be something we wouldn't know what to do with
- anyway. Just ignore it. */
- break;
- }
-}
+ if (ptrace (PTRACE_GET_THREAD_AREA, lwpid,
+ (void *) idx, (unsigned long) &desc) < 0)
+ return PS_ERR;
+ *(int *)base = desc[1];
+ return PS_OK;
+}
\f
-/* The instruction for a Linux system call is:
+
+/* The instruction for a GNU/Linux system call is:
int $0x80
or 0xcd 0x80. */
#define LINUX_SYSCALL_LEN (sizeof linux_syscall)
/* The system call number is stored in the %eax register. */
-#define LINUX_SYSCALL_REGNUM 0 /* %eax */
+#define LINUX_SYSCALL_REGNUM I386_EAX_REGNUM
/* We are specifically interested in the sigreturn and rt_sigreturn
system calls. */
If STEP is nonzero, single-step it.
If SIGNAL is nonzero, give it that signal. */
-void
-child_resume (int pid, int step, enum target_signal signal)
+static void
+i386_linux_resume (ptid_t ptid, int step, enum target_signal signal)
{
- int request = PTRACE_CONT;
+ int pid = PIDGET (ptid);
- if (pid == -1)
- /* Resume all threads. */
- /* I think this only gets used in the non-threaded case, where "resume
- all threads" and "resume inferior_pid" are the same. */
- pid = inferior_pid;
+ int request = PTRACE_CONT;
if (step)
{
- CORE_ADDR pc = read_pc_pid (pid);
- unsigned char buf[LINUX_SYSCALL_LEN];
+ struct regcache *regcache = get_thread_regcache (pid_to_ptid (pid));
+ ULONGEST pc;
+ gdb_byte buf[LINUX_SYSCALL_LEN];
request = PTRACE_SINGLESTEP;
+ regcache_cooked_read_unsigned
+ (regcache, gdbarch_pc_regnum (get_regcache_arch (regcache)), &pc);
+
/* Returning from a signal trampoline is done by calling a
special system call (sigreturn or rt_sigreturn, see
i386-linux-tdep.c for more information). This system call
that's about to be restored, and set the trace flag there. */
/* First check if PC is at a system call. */
- if (read_memory_nobpt (pc, (char *) buf, LINUX_SYSCALL_LEN) == 0
+ if (target_read_memory (pc, buf, LINUX_SYSCALL_LEN) == 0
&& memcmp (buf, linux_syscall, LINUX_SYSCALL_LEN) == 0)
{
- int syscall = read_register_pid (LINUX_SYSCALL_REGNUM, pid);
+ ULONGEST syscall;
+ regcache_cooked_read_unsigned (regcache,
+ LINUX_SYSCALL_REGNUM, &syscall);
/* Then check the system call number. */
if (syscall == SYS_sigreturn || syscall == SYS_rt_sigreturn)
{
- CORE_ADDR sp = read_register (SP_REGNUM);
- CORE_ADDR addr = sp;
+ ULONGEST sp, addr;
unsigned long int eflags;
-
+
+ regcache_cooked_read_unsigned (regcache, I386_ESP_REGNUM, &sp);
if (syscall == SYS_rt_sigreturn)
addr = read_memory_integer (sp + 8, 4) + 20;
+ else
+ addr = sp;
/* Set the trace flag in the context that's about to be
restored. */
addr += LINUX_SIGCONTEXT_EFLAGS_OFFSET;
- read_memory (addr, (char *) &eflags, 4);
+ read_memory (addr, (gdb_byte *) &eflags, 4);
eflags |= 0x0100;
- write_memory (addr, (char *) &eflags, 4);
+ write_memory (addr, (gdb_byte *) &eflags, 4);
}
}
}
if (ptrace (request, pid, 0, target_signal_to_host (signal)) == -1)
- perror_with_name ("ptrace");
+ perror_with_name (("ptrace"));
}
-\f
-/* Calling functions in shared libraries. */
-/* FIXME: kettenis/2000-03-05: Doesn't this belong in a
- target-dependent file? The function
- `i386_linux_skip_solib_resolver' is mentioned in
- `config/i386/tm-linux.h'. */
-
-/* Find the minimal symbol named NAME, and return both the minsym
- struct and its objfile. This probably ought to be in minsym.c, but
- everything there is trying to deal with things like C++ and
- SOFUN_ADDRESS_MAYBE_TURQUOISE, ... Since this is so simple, it may
- be considered too special-purpose for general consumption. */
-
-static struct minimal_symbol *
-find_minsym_and_objfile (char *name, struct objfile **objfile_p)
-{
- struct objfile *objfile;
-
- ALL_OBJFILES (objfile)
- {
- struct minimal_symbol *msym;
-
- ALL_OBJFILE_MSYMBOLS (objfile, msym)
- {
- if (SYMBOL_NAME (msym)
- && STREQ (SYMBOL_NAME (msym), name))
- {
- *objfile_p = objfile;
- return msym;
- }
- }
- }
+static void (*super_post_startup_inferior) (ptid_t ptid);
- return 0;
+static void
+i386_linux_child_post_startup_inferior (ptid_t ptid)
+{
+ i386_cleanup_dregs ();
+ super_post_startup_inferior (ptid);
}
-
-static CORE_ADDR
-skip_hurd_resolver (CORE_ADDR pc)
+void
+_initialize_i386_linux_nat (void)
{
- /* The HURD dynamic linker is part of the GNU C library, so many
- GNU/Linux distributions use it. (All ELF versions, as far as I
- know.) An unresolved PLT entry points to "_dl_runtime_resolve",
- which calls "fixup" to patch the PLT, and then passes control to
- the function.
-
- We look for the symbol `_dl_runtime_resolve', and find `fixup' in
- the same objfile. If we are at the entry point of `fixup', then
- we set a breakpoint at the return address (at the top of the
- stack), and continue.
-
- It's kind of gross to do all these checks every time we're
- called, since they don't change once the executable has gotten
- started. But this is only a temporary hack --- upcoming versions
- of Linux will provide a portable, efficient interface for
- debugging programs that use shared libraries. */
+ struct target_ops *t;
- struct objfile *objfile;
- struct minimal_symbol *resolver
- = find_minsym_and_objfile ("_dl_runtime_resolve", &objfile);
+ /* Fill in the generic GNU/Linux methods. */
+ t = linux_target ();
- if (resolver)
- {
- struct minimal_symbol *fixup
- = lookup_minimal_symbol ("fixup", 0, objfile);
-
- if (fixup && SYMBOL_VALUE_ADDRESS (fixup) == pc)
- return (SAVED_PC_AFTER_CALL (get_current_frame ()));
- }
-
- return 0;
-}
-
-/* See the comments for SKIP_SOLIB_RESOLVER at the top of infrun.c.
- This function:
- 1) decides whether a PLT has sent us into the linker to resolve
- a function reference, and
- 2) if so, tells us where to set a temporary breakpoint that will
- trigger when the dynamic linker is done. */
-
-CORE_ADDR
-i386_linux_skip_solib_resolver (CORE_ADDR pc)
-{
- CORE_ADDR result;
+ i386_use_watchpoints (t);
- /* Plug in functions for other kinds of resolvers here. */
- result = skip_hurd_resolver (pc);
- if (result)
- return result;
+ /* Override the default ptrace resume method. */
+ t->to_resume = i386_linux_resume;
- return 0;
-}
+ /* Override the GNU/Linux inferior startup hook. */
+ super_post_startup_inferior = t->to_post_startup_inferior;
+ t->to_post_startup_inferior = i386_linux_child_post_startup_inferior;
-\f
-/* Register that we are able to handle Linux ELF core file formats. */
+ /* Add our register access methods. */
+ t->to_fetch_registers = i386_linux_fetch_inferior_registers;
+ t->to_store_registers = i386_linux_store_inferior_registers;
-static struct core_fns linux_elf_core_fns =
-{
- bfd_target_elf_flavour, /* core_flavour */
- default_check_format, /* check_format */
- default_core_sniffer, /* core_sniffer */
- fetch_core_registers, /* core_read_registers */
- NULL /* next */
-};
-
-void
-_initialize_i386_linux_nat ()
-{
- add_core_fns (&linux_elf_core_fns);
+ /* Register the target. */
+ linux_nat_add_target (t);
+ linux_nat_set_new_thread (t, i386_linux_new_thread);
}