projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash when exiting TUI with gdb -tui
[deliverable/binutils-gdb.git]
/
gdb
/
m32r-linux-nat.c
diff --git
a/gdb/m32r-linux-nat.c
b/gdb/m32r-linux-nat.c
index 2b17aadf2fee0146f5969a0b873ee342c6ce3fc3..24beeca3b75cacc2d292aa8b1491cedd34f31f15 100644
(file)
--- a/
gdb/m32r-linux-nat.c
+++ b/
gdb/m32r-linux-nat.c
@@
-1,12
+1,12
@@
/* Native-dependent code for GNU/Linux m32r.
/* Native-dependent code for GNU/Linux m32r.
- Copyright (C) 2004
, 2005, 2006, 2007
Free Software Foundation, Inc.
+ Copyright (C) 2004
-2020
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
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,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-15,9
+15,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "inferior.h"
#include "defs.h"
#include "inferior.h"
@@
-25,12
+23,10
@@
#include "regcache.h"
#include "linux-nat.h"
#include "target.h"
#include "regcache.h"
#include "linux-nat.h"
#include "target.h"
-
-#include "gdb_assert.h"
-#include "gdb_string.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"
@@
-38,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. */
@@
-57,8
+61,9
@@
static int regmap[] = {
#define SPU_REGMAP 23
#define SPI_REGMAP 26
#define SPU_REGMAP 23
#define SPI_REGMAP 26
-/* Doee apply to the corresponding SET requests as well. */
-#define GETREGS_SUPPLIES(regno) (0 <= (regno) && (regno) <= M32R_LINUX_NUM_REGS)
+/* Doee (??) apply to the corresponding SET requests as well. */
+#define GETREGS_SUPPLIES(regno) (0 <= (regno) \
+ && (regno) <= M32R_LINUX_NUM_REGS)
\f
\f
@@
-69,9
+74,9
@@
static int regmap[] = {
in *GREGSETP. */
void
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;
+
const elf_greg_t *regp = (const
elf_greg_t *) gregsetp;
int i;
unsigned long psw, bbpsw;
int i;
unsigned long psw, bbpsw;
@@
-96,11
+101,11
@@
supply_gregset (elf_gregset_t * gregsetp)
}
if (i != M32R_SP_REGNUM)
}
if (i != M32R_SP_REGNUM)
- regcache
_raw_supply (current_regcache,
i, ®val);
+ regcache
->raw_supply (
i, ®val);
else if (psw & 0x8000)
else if (psw & 0x8000)
- regcache
_raw_supply (current_regcache,
i, regp + SPU_REGMAP);
+ regcache
->raw_supply (
i, regp + SPU_REGMAP);
else
else
- regcache
_raw_supply (current_regcache,
i, regp + SPI_REGMAP);
+ regcache
->raw_supply (
i, regp + SPI_REGMAP);
}
}
}
}
@@
-108,14
+113,14
@@
supply_gregset (elf_gregset_t * gregsetp)
store their values in GDB's register array. */
static void
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;
if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0)
perror_with_name (_("Couldn't get registers"));
{
elf_gregset_t regs;
if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0)
perror_with_name (_("Couldn't get registers"));
- supply_gregset (®s);
+ supply_gregset (
regcache, (const elf_gregset_t *)
®s);
}
/* Fill register REGNO (if it is a general-purpose register) in
}
/* Fill register REGNO (if it is a general-purpose register) in
@@
-123,7
+128,8
@@
fetch_regs (int tid)
do this for all registers. */
void
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)
{
elf_greg_t *regp = (elf_greg_t *) gregsetp;
int i;
{
elf_greg_t *regp = (elf_greg_t *) gregsetp;
int i;
@@
-144,11
+150,11
@@
fill_gregset (elf_gregset_t * gregsetp, int regno)
continue;
if (i != M32R_SP_REGNUM)
continue;
if (i != M32R_SP_REGNUM)
- regcache
_raw_collect (current_regcache,
i, regp + regmap[i]);
+ regcache
->raw_collect (
i, regp + regmap[i]);
else if (psw & 0x8000)
else if (psw & 0x8000)
- regcache
_raw_collect (current_regcache,
i, regp + SPU_REGMAP);
+ regcache
->raw_collect (
i, regp + SPU_REGMAP);
else
else
- regcache
_raw_collect (current_regcache,
i, regp + SPI_REGMAP);
+ regcache
->raw_collect (
i, regp + SPI_REGMAP);
}
}
}
}
@@
-156,14
+162,14
@@
fill_gregset (elf_gregset_t * gregsetp, int regno)
into the process/thread specified by TID. */
static void
into the process/thread specified by TID. */
static void
-store_regs (int tid, int regno)
+store_regs (
const struct regcache *regcache,
int tid, int regno)
{
elf_gregset_t regs;
if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0)
perror_with_name (_("Couldn't get registers"));
{
elf_gregset_t regs;
if (ptrace (PTRACE_GETREGS, tid, 0, (int) ®s) < 0)
perror_with_name (_("Couldn't get registers"));
- fill_gregset (®s, regno);
+ fill_gregset (
regcache,
®s, regno);
if (ptrace (PTRACE_SETREGS, tid, 0, (int) ®s) < 0)
perror_with_name (_("Couldn't write registers"));
if (ptrace (PTRACE_SETREGS, tid, 0, (int) ®s) < 0)
perror_with_name (_("Couldn't write registers"));
@@
-175,12
+181,13
@@
store_regs (int tid, int regno)
Since M32R has no floating-point registers, these functions do nothing. */
void
Since M32R has no floating-point registers, these functions do nothing. */
void
-supply_fpregset (gdb_fpregset_t *fpregs)
+supply_fpregset (
struct regcache *regcache, const
gdb_fpregset_t *fpregs)
{
}
void
{
}
void
-fill_fpregset (gdb_fpregset_t *fpregs, int regno)
+fill_fpregset (const struct regcache *regcache,
+ gdb_fpregset_t *fpregs, int regno)
{
}
\f
{
}
\f
@@
-192,22
+199,17
@@
fill_fpregset (gdb_fpregset_t *fpregs, int regno)
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 (
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 = TIDGET (inferior_ptid);
- if (tid == 0)
- tid = PIDGET (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
results. */
if (regno == -1 || GETREGS_SUPPLIES (regno))
{
/* Use the PTRACE_GETREGS request whenever possible, since it
transfers more registers in one system call, and we'll cache the
results. */
if (regno == -1 || GETREGS_SUPPLIES (regno))
{
- fetch_regs (tid);
+ fetch_regs (
regcache,
tid);
return;
}
return;
}
@@
-218,20
+220,16
@@
m32r_linux_fetch_inferior_registers (int 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). */
/* 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 (
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 = TIDGET (inferior_ptid)) == 0)
- tid = PIDGET (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. */
if (regno == -1 || GETREGS_SUPPLIES (regno))
{
/* Use the PTRACE_SETREGS request whenever possible, since it
transfers more registers in one system call. */
if (regno == -1 || GETREGS_SUPPLIES (regno))
{
- store_regs (tid, regno);
+ store_regs (
regcache,
tid, regno);
return;
}
return;
}
@@
-239,20
+237,11
@@
m32r_linux_store_inferior_registers (int regno)
_("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.027411 seconds
and
4
git commands to generate.