X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fi386-gnu-nat.c;h=087445bc6269b53d3499191d07d90f53c0b949eb;hb=e661ef01e50a2cb38c006b0fe444a1b41bfc9400;hp=3bce88a20608c1c3575a03491112c389d8f71e99;hpb=d9cb6cdcfa12368f2f639f8cd06d18b94bd98a39;p=external%2Fbinutils.git
diff --git a/gdb/i386-gnu-nat.c b/gdb/i386-gnu-nat.c
index 3bce88a..087445b 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-2017 Free Software Foundation, Inc.
+ Copyright (C) 1992-2019 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"
@@ -54,6 +56,23 @@ static int reg_offset[] =
#define REG_ADDR(state, regnum) ((char *)(state) + reg_offset[regnum])
+
+/* The i386 GNU Hurd target. */
+
+#ifdef i386_DEBUG_STATE
+using gnu_base_target = x86_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. */
@@ -86,20 +105,19 @@ 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_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)
{
@@ -121,17 +139,16 @@ gnu_fetch_registers (struct target_ops *ops,
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);
}
}
@@ -178,21 +195,20 @@ 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 = 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)
{
@@ -233,8 +249,8 @@ gnu_store_registers (struct target_ops *ops,
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..."));
@@ -248,16 +264,16 @@ gnu_store_registers (struct target_ops *ops,
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. */
@@ -376,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];
@@ -409,20 +425,10 @@ i386_gnu_dr_get_control (void)
}
#endif /* i386_DEBUG_STATE */
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_i386gnu_nat;
-
void
_initialize_i386gnu_nat (void)
{
- 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;
@@ -432,9 +438,6 @@ _initialize_i386gnu_nat (void)
x86_set_debug_register_length (4);
#endif /* i386_DEBUG_STATE */
- t->to_fetch_registers = gnu_fetch_registers;
- t->to_store_registers = gnu_store_registers;
-
/* Register the target. */
- add_target (t);
+ add_inf_child_target (&the_i386_gnu_nat_target);
}