projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdb: add target_ops::supports_displaced_step
[deliverable/binutils-gdb.git]
/
gdb
/
m32r-linux-nat.c
diff --git
a/gdb/m32r-linux-nat.c
b/gdb/m32r-linux-nat.c
index 2049d6c1dddb050681f31bfa6ade22277ab0a75e..24beeca3b75cacc2d292aa8b1491cedd34f31f15 100644
(file)
--- a/
gdb/m32r-linux-nat.c
+++ b/
gdb/m32r-linux-nat.c
@@
-1,6
+1,6
@@
/* Native-dependent code for GNU/Linux m32r.
/* Native-dependent code for GNU/Linux m32r.
- Copyright (C) 2004-20
14
Free Software Foundation, Inc.
+ Copyright (C) 2004-20
20
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-23,9
+23,10
@@
#include "regcache.h"
#include "linux-nat.h"
#include "target.h"
#include "regcache.h"
#include "linux-nat.h"
#include "target.h"
-#include
<sys/ptrace.h>
+#include
"nat/gdb_ptrace.h"
#include <sys/user.h>
#include <sys/procfs.h>
#include <sys/user.h>
#include <sys/procfs.h>
+#include "inf-ptrace.h"
/* Prototypes for supply_gregset etc. */
#include "gregset.h"
/* Prototypes for supply_gregset etc. */
#include "gregset.h"
@@
-33,7
+34,15
@@
#include "m32r-tdep.h"
\f
#include "m32r-tdep.h"
\f
+class m32r_linux_nat_target final : public linux_nat_target
+{
+public:
+ /* Add our register access methods. */
+ void fetch_registers (struct regcache *, int) override;
+ void store_registers (struct regcache *, int) override;
+};
+static m32r_linux_nat_target the_m32r_linux_nat_target;
/* Since EVB register is not available for native debug, we reduce
the number of registers. */
/* Since EVB register is not available for native debug, we reduce
the number of registers. */
@@
-92,11
+101,11
@@
supply_gregset (struct regcache *regcache, const elf_gregset_t * gregsetp)
}
if (i != M32R_SP_REGNUM)
}
if (i != M32R_SP_REGNUM)
- regcache
_raw_supply (regcache,
i, ®val);
+ regcache
->raw_supply (
i, ®val);
else if (psw & 0x8000)
else if (psw & 0x8000)
- regcache
_raw_supply (regcache,
i, regp + SPU_REGMAP);
+ regcache
->raw_supply (
i, regp + SPU_REGMAP);
else
else
- regcache
_raw_supply (regcache,
i, regp + SPI_REGMAP);
+ regcache
->raw_supply (
i, regp + SPI_REGMAP);
}
}
}
}
@@
-141,11
+150,11
@@
fill_gregset (const struct regcache *regcache,
continue;
if (i != M32R_SP_REGNUM)
continue;
if (i != M32R_SP_REGNUM)
- regcache
_raw_collect (regcache,
i, regp + regmap[i]);
+ regcache
->raw_collect (
i, regp + regmap[i]);
else if (psw & 0x8000)
else if (psw & 0x8000)
- regcache
_raw_collect (regcache,
i, regp + SPU_REGMAP);
+ regcache
->raw_collect (
i, regp + SPU_REGMAP);
else
else
- regcache
_raw_collect (regcache,
i, regp + SPI_REGMAP);
+ regcache
->raw_collect (
i, regp + SPI_REGMAP);
}
}
}
}
@@
-190,16
+199,10
@@
fill_fpregset (const struct regcache *regcache,
this for all registers (including the floating point and SSE
registers). */
this for all registers (including the floating point and SSE
registers). */
-static void
-m32r_linux_fetch_inferior_registers (struct target_ops *ops,
- struct regcache *regcache, int regno)
+void
+m32r_linux_nat_target::fetch_registers (struct regcache *regcache, int regno)
{
{
- int tid;
-
- /* GNU/Linux LWP ID's are process ID's. */
- tid = ptid_get_lwp (inferior_ptid);
- if (tid == 0)
- tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */
+ pid_t tid = get_ptrace_pid (regcache->ptid ());
/* Use the PTRACE_GETREGS request whenever possible, since it
transfers more registers in one system call, and we'll cache the
/* Use the PTRACE_GETREGS request whenever possible, since it
transfers more registers in one system call, and we'll cache the
@@
-217,15
+220,10
@@
m32r_linux_fetch_inferior_registers (struct target_ops *ops,
/* Store register REGNO back into the child process. If REGNO is -1,
do this for all registers (including the floating point and SSE
registers). */
/* Store register REGNO back into the child process. If REGNO is -1,
do this for all registers (including the floating point and SSE
registers). */
-static void
-m32r_linux_store_inferior_registers (struct target_ops *ops,
- struct regcache *regcache, int regno)
+void
+m32r_linux_nat_target::store_registers (struct regcache *regcache, int regno)
{
{
- int tid;
-
- /* GNU/Linux LWP ID's are process ID's. */
- if ((tid = ptid_get_lwp (inferior_ptid)) == 0)
- tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */
+ pid_t tid = get_ptrace_pid (regcache->ptid ());
/* Use the PTRACE_SETREGS request whenever possible, since it
transfers more registers in one system call. */
/* Use the PTRACE_SETREGS request whenever possible, since it
transfers more registers in one system call. */
@@
-239,20
+237,11
@@
m32r_linux_store_inferior_registers (struct target_ops *ops,
_("Got request to store bad register number %d."), regno);
}
_("Got request to store bad register number %d."), regno);
}
-void _initialize_m32r_linux_nat (void);
-
+void _initialize_m32r_linux_nat ();
void
void
-_initialize_m32r_linux_nat (
void
)
+_initialize_m32r_linux_nat ()
{
{
- struct target_ops *t;
-
- /* Fill in the generic GNU/Linux methods. */
- t = linux_target ();
-
- /* Add our register access methods. */
- t->to_fetch_registers = m32r_linux_fetch_inferior_registers;
- t->to_store_registers = m32r_linux_store_inferior_registers;
-
/* Register the target. */
/* Register the target. */
- linux_nat_add_target (t);
+ linux_target = &the_m32r_linux_nat_target;
+ add_inf_child_target (&the_m32r_linux_nat_target);
}
}
This page took
0.025431 seconds
and
4
git commands to generate.