X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386-gnu-nat.c;h=6382ca8acb22f87978a5d73a674d81b2b63e2d35;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=9875d813485452cf8cf2aa670673854929c5142c;hpb=34a79281e4bd5d1a7f1d22a5a5be1ac2db56a3fc;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/i386-gnu-nat.c b/gdb/i386-gnu-nat.c
index 9875d81348..6382ca8acb 100644
--- a/gdb/i386-gnu-nat.c
+++ b/gdb/i386-gnu-nat.c
@@ -1,6 +1,6 @@
/* Low level interface to i386 running the GNU Hurd.
- Copyright (C) 1992-2018 Free Software Foundation, Inc.
+ Copyright (C) 1992-2020 Free Software Foundation, Inc.
This file is part of GDB.
@@ -17,6 +17,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see . */
+/* Include this first, to pick up the 'thread_info' diversion. */
+#include "gnu-nat.h"
+
/* Mach/Hurd headers are not yet ready for C++ compilation. */
extern "C"
{
@@ -34,7 +37,6 @@ extern "C"
#include "i386-tdep.h"
-#include "gnu-nat.h"
#include "inf-child.h"
#include "i387-tdep.h"
@@ -103,9 +105,8 @@ fetch_fpregs (struct regcache *regcache, struct proc *thread)
}
/* 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->ptid ();
@@ -113,10 +114,10 @@ gnu_fetch_registers (struct target_ops *ops,
/* 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)
{
@@ -194,9 +195,8 @@ store_fpregs (const struct regcache *regcache, struct proc *thread, int 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 = regcache->arch ();
@@ -205,10 +205,10 @@ gnu_store_registers (struct target_ops *ops,
/* 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)
{
@@ -392,7 +392,7 @@ i386_gnu_dr_get_reg (ptid_t ptid, int regnum)
/* 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];
@@ -425,8 +425,9 @@ i386_gnu_dr_get_control (void)
}
#endif /* i386_DEBUG_STATE */
+void _initialize_i386gnu_nat ();
void
-_initialize_i386gnu_nat (void)
+_initialize_i386gnu_nat ()
{
#ifdef i386_DEBUG_STATE
x86_dr_low.set_control = i386_gnu_dr_set_control;
@@ -438,6 +439,8 @@ _initialize_i386gnu_nat (void)
x86_set_debug_register_length (4);
#endif /* i386_DEBUG_STATE */
+ gnu_target = &the_i386_gnu_nat_target;
+
/* Register the target. */
add_inf_child_target (&the_i386_gnu_nat_target);
}