projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New test case gdb.base/branch-to-self.exp
[deliverable/binutils-gdb.git]
/
gdb
/
m32r-linux-nat.c
diff --git
a/gdb/m32r-linux-nat.c
b/gdb/m32r-linux-nat.c
index 86b20bda29ef39471afb5bf62028dcf44a4ad6ce..aaedf7fb99296bfbf51d6ad789c4a9739ba96622 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
-2016
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,10
+23,7
@@
#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>
@@
-57,8
+52,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
+65,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;
@@
-80,23
+76,27
@@
supply_gregset (elf_gregset_t * gregsetp)
for (i = 0; i < M32R_LINUX_NUM_REGS; i++)
{
for (i = 0; i < M32R_LINUX_NUM_REGS; i++)
{
+ elf_greg_t regval;
+
switch (i)
{
case PSW_REGNUM:
switch (i)
{
case PSW_REGNUM:
- *(regp + regmap[i]) =
- ((0x00c1 & bbpsw) << 8) | ((0xc100 & psw) >> 8);
+ regval = ((0x00c1 & bbpsw) << 8) | ((0xc100 & psw) >> 8);
break;
case CBR_REGNUM:
break;
case CBR_REGNUM:
- *(regp + regmap[i]) = ((psw >> 8) & 1);
+ regval = ((psw >> 8) & 1);
+ break;
+ default:
+ regval = *(regp + regmap[i]);
break;
}
if (i != M32R_SP_REGNUM)
break;
}
if (i != M32R_SP_REGNUM)
- regcache_raw_supply (
current_regcache, i, regp + regmap[i]
);
+ regcache_raw_supply (
regcache, i, ®val
);
else if (psw & 0x8000)
else if (psw & 0x8000)
- regcache_raw_supply (
current_
regcache, i, regp + SPU_REGMAP);
+ regcache_raw_supply (regcache, i, regp + SPU_REGMAP);
else
else
- regcache_raw_supply (
current_
regcache, i, regp + SPI_REGMAP);
+ regcache_raw_supply (regcache, i, regp + SPI_REGMAP);
}
}
}
}
@@
-104,14
+104,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
@@
-119,7
+119,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;
@@
-140,11
+141,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 (regcache, i, regp + regmap[i]);
else if (psw & 0x8000)
else if (psw & 0x8000)
- regcache_raw_collect (
current_
regcache, i, regp + SPU_REGMAP);
+ regcache_raw_collect (regcache, i, regp + SPU_REGMAP);
else
else
- regcache_raw_collect (
current_
regcache, i, regp + SPI_REGMAP);
+ regcache_raw_collect (regcache, i, regp + SPI_REGMAP);
}
}
}
}
@@
-152,14
+153,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"));
@@
-171,12
+172,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
@@
-189,21
+191,22
@@
fill_fpregset (gdb_fpregset_t *fpregs, int regno)
registers). */
static void
registers). */
static void
-m32r_linux_fetch_inferior_registers (int regno)
+m32r_linux_fetch_inferior_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
int tid;
/* GNU/Linux LWP ID's are process ID's. */
{
int tid;
/* GNU/Linux LWP ID's are process ID's. */
- tid =
TIDGET
(inferior_ptid);
+ tid =
ptid_get_lwp
(inferior_ptid);
if (tid == 0)
if (tid == 0)
- tid =
PIDGET (inferior_ptid);
/* Not a threaded program. */
+ tid =
ptid_get_pid (inferior_ptid);
/* Not a threaded program. */
/* 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;
}
@@
-215,19
+218,20
@@
m32r_linux_fetch_inferior_registers (int regno)
do this for all registers (including the floating point and SSE
registers). */
static void
do this for all registers (including the floating point and SSE
registers). */
static void
-m32r_linux_store_inferior_registers (int regno)
+m32r_linux_store_inferior_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
int tid;
/* GNU/Linux LWP ID's are process ID's. */
{
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. */
+ if ((tid =
ptid_get_lwp
(inferior_ptid)) == 0)
+ tid =
ptid_get_pid (inferior_ptid);
/* Not a threaded program. */
/* 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;
}
This page took
0.02679 seconds
and
4
git commands to generate.