/* Low level interface to i386 running the GNU Hurd.
- Copyright (C) 1992-2017 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
This file is part of GDB.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* Include this first, to pick up the <mach.h> 'thread_info' diversion. */
+#include "gnu-nat.h"
+
/* Mach/Hurd headers are not yet ready for C++ compilation. */
extern "C"
{
#include "i386-tdep.h"
-#include "gnu-nat.h"
#include "inf-child.h"
#include "i387-tdep.h"
#define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum])
\f
+
+/* The i386 GNU Hurd target. */
+
+#ifdef i386_DEBUG_STATE
+using gnu_base_target = x86_nat_target<gnu_nat_target>;
+#else
+using gnu_base_target = gnu_nat_target;
+#endif
+
+struct i386_gnu_nat_target final : public gnu_base_target
+{
+ void fetch_registers (struct regcache *, int) override;
+ void store_registers (struct regcache *, int) override;
+};
+
+static i386_gnu_nat_target the_i386_gnu_nat_target;
+
/* Get the whole floating-point state of THREAD and record the values
of the corresponding (pseudo) registers. */
}
/* Fetch register REGNO, or all regs if REGNO is -1. */
-static void
-gnu_fetch_registers (struct target_ops *ops,
- struct regcache *regcache, int regno)
+void
+i386_gnu_nat_target::fetch_registers (struct regcache *regcache, int regno)
{
struct proc *thread;
- ptid_t ptid = regcache_get_ptid (regcache);
+ ptid_t ptid = regcache->ptid ();
/* Make sure we know about new threads. */
inf_update_procs (gnu_current_inf);
- thread = inf_tid_to_thread (gnu_current_inf, ptid_get_lwp (ptid));
+ thread = inf_tid_to_thread (gnu_current_inf, ptid.lwp ());
if (!thread)
error (_("Can't fetch registers from thread %s: No such thread"),
- target_pid_to_str (ptid));
+ target_pid_to_str (ptid).c_str ());
if (regno < I386_NUM_GREGS || regno == -1)
{
proc_debug (thread, "fetching all register");
for (i = 0; i < I386_NUM_GREGS; i++)
- regcache_raw_supply (regcache, i, REG_ADDR (state, i));
+ regcache->raw_supply (i, REG_ADDR (state, i));
thread->fetched_regs = ~0;
}
else
{
proc_debug (thread, "fetching register %s",
- gdbarch_register_name (get_regcache_arch (regcache),
+ gdbarch_register_name (regcache->arch (),
regno));
- regcache_raw_supply (regcache, regno,
- REG_ADDR (state, regno));
+ regcache->raw_supply (regno, REG_ADDR (state, regno));
thread->fetched_regs |= (1 << regno);
}
}
}
/* Store at least register REGNO, or all regs if REGNO == -1. */
-static void
-gnu_store_registers (struct target_ops *ops,
- struct regcache *regcache, int regno)
+void
+i386_gnu_nat_target::store_registers (struct regcache *regcache, int regno)
{
struct proc *thread;
- struct gdbarch *gdbarch = get_regcache_arch (regcache);
- ptid_t ptid = regcache_get_ptid (regcache);
+ struct gdbarch *gdbarch = regcache->arch ();
+ ptid_t ptid = regcache->ptid ();
/* Make sure we know about new threads. */
inf_update_procs (gnu_current_inf);
- thread = inf_tid_to_thread (gnu_current_inf, ptid_get_lwp (ptid));
+ thread = inf_tid_to_thread (gnu_current_inf, ptid.lwp ());
if (!thread)
error (_("Couldn't store registers into thread %s: No such thread"),
- target_pid_to_str (ptid));
+ target_pid_to_str (ptid).c_str ());
if (regno < I386_NUM_GREGS || regno == -1)
{
gdbarch_register_name (gdbarch, check_regno));
if (regno >= 0 && regno != check_regno)
/* Update GDB's copy of the register. */
- regcache_raw_supply (regcache, check_regno,
- REG_ADDR (state, check_regno));
+ regcache->raw_supply (check_regno,
+ REG_ADDR (state, check_regno));
else
warning (_("... also writing this register! "
"Suspicious..."));
proc_debug (thread, "storing all registers");
for (i = 0; i < I386_NUM_GREGS; i++)
- if (REG_VALID == regcache_register_status (regcache, i))
- regcache_raw_collect (regcache, i, REG_ADDR (state, i));
+ if (REG_VALID == regcache->get_register_status (i))
+ regcache->raw_collect (i, REG_ADDR (state, i));
}
else
{
proc_debug (thread, "storing register %s",
gdbarch_register_name (gdbarch, regno));
- gdb_assert (REG_VALID == regcache_register_status (regcache, regno));
- regcache_raw_collect (regcache, regno, REG_ADDR (state, regno));
+ gdb_assert (REG_VALID == regcache->get_register_status (regno));
+ regcache->raw_collect (regno, REG_ADDR (state, regno));
}
/* Restore the T bit. */
/* Make sure we know about new threads. */
inf_update_procs (gnu_current_inf);
- thread = inf_tid_to_thread (gnu_current_inf, ptid_get_lwp (ptid));
+ thread = inf_tid_to_thread (gnu_current_inf, ptid.lwp ());
i386_gnu_dr_get (®s, thread);
return regs.dr[regnum];
}
#endif /* i386_DEBUG_STATE */
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_i386gnu_nat;
-
+void _initialize_i386gnu_nat ();
void
-_initialize_i386gnu_nat (void)
+_initialize_i386gnu_nat ()
{
- struct target_ops *t;
-
- /* Fill in the generic GNU/Hurd methods. */
- t = gnu_target ();
-
#ifdef i386_DEBUG_STATE
- x86_use_watchpoints (t);
-
x86_dr_low.set_control = i386_gnu_dr_set_control;
gdb_assert (DR_FIRSTADDR == 0 && DR_LASTADDR < i386_DEBUG_STATE_COUNT);
x86_dr_low.set_addr = i386_gnu_dr_set_addr;
x86_set_debug_register_length (4);
#endif /* i386_DEBUG_STATE */
- t->to_fetch_registers = gnu_fetch_registers;
- t->to_store_registers = gnu_store_registers;
+ gnu_target = &the_i386_gnu_nat_target;
/* Register the target. */
- add_target (t);
+ add_inf_child_target (&the_i386_gnu_nat_target);
}
projects / deliverable / binutils-gdb.git / blobdiff