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: Don't skip prologue for explicit line breakpoints in assembler
[deliverable/binutils-gdb.git]
/
gdb
/
spu-linux-nat.c
diff --git
a/gdb/spu-linux-nat.c
b/gdb/spu-linux-nat.c
index c289bb75fe1abb9a5c48dff60208ee9b3c9b94e9..90a9f002848b484a359956c76273a8b8414954cd 100644
(file)
--- a/
gdb/spu-linux-nat.c
+++ b/
gdb/spu-linux-nat.c
@@
-1,5
+1,5
@@
/* SPU native-dependent code for GDB, the GNU debugger.
/* SPU native-dependent code for GDB, the GNU debugger.
- Copyright (C) 2006-201
8
Free Software Foundation, Inc.
+ Copyright (C) 2006-201
9
Free Software Foundation, Inc.
Contributed by Ulrich Weigand <uweigand@de.ibm.com>.
Contributed by Ulrich Weigand <uweigand@de.ibm.com>.
@@
-26,7
+26,7
@@
#include "inf-ptrace.h"
#include "regcache.h"
#include "symfile.h"
#include "inf-ptrace.h"
#include "regcache.h"
#include "symfile.h"
-#include "gdb_wait.h"
+#include "
common/
gdb_wait.h"
#include "gdbthread.h"
#include "gdb_bfd.h"
#include "gdbthread.h"
#include "gdb_bfd.h"
@@
-69,9
+69,9
@@
fetch_ppc_register (int regno)
{
PTRACE_TYPE_RET res;
{
PTRACE_TYPE_RET res;
- int tid =
ptid_get_lwp (inferior_ptid
);
+ int tid =
inferior_ptid.lwp (
);
if (tid == 0)
if (tid == 0)
- tid =
ptid_get_pid (inferior_ptid
);
+ tid =
inferior_ptid.pid (
);
#ifndef __powerpc64__
/* If running as a 32-bit process on a 64-bit system, we attempt
#ifndef __powerpc64__
/* If running as a 32-bit process on a 64-bit system, we attempt
@@
-154,9
+154,9
@@
fetch_ppc_memory (ULONGEST memaddr, gdb_byte *myaddr, int len)
/ sizeof (PTRACE_TYPE_RET));
PTRACE_TYPE_RET *buffer;
/ sizeof (PTRACE_TYPE_RET));
PTRACE_TYPE_RET *buffer;
- int tid =
ptid_get_lwp (inferior_ptid
);
+ int tid =
inferior_ptid.lwp (
);
if (tid == 0)
if (tid == 0)
- tid =
ptid_get_pid (inferior_ptid
);
+ tid =
inferior_ptid.pid (
);
buffer = (PTRACE_TYPE_RET *) alloca (count * sizeof (PTRACE_TYPE_RET));
for (i = 0; i < count; i++, addr += sizeof (PTRACE_TYPE_RET))
buffer = (PTRACE_TYPE_RET *) alloca (count * sizeof (PTRACE_TYPE_RET));
for (i = 0; i < count; i++, addr += sizeof (PTRACE_TYPE_RET))
@@
-184,9
+184,9
@@
store_ppc_memory (ULONGEST memaddr, const gdb_byte *myaddr, int len)
/ sizeof (PTRACE_TYPE_RET));
PTRACE_TYPE_RET *buffer;
/ sizeof (PTRACE_TYPE_RET));
PTRACE_TYPE_RET *buffer;
- int tid =
ptid_get_lwp (inferior_ptid
);
+ int tid =
inferior_ptid.lwp (
);
if (tid == 0)
if (tid == 0)
- tid =
ptid_get_pid (inferior_ptid
);
+ tid =
inferior_ptid.pid (
);
buffer = (PTRACE_TYPE_RET *) alloca (count * sizeof (PTRACE_TYPE_RET));
buffer = (PTRACE_TYPE_RET *) alloca (count * sizeof (PTRACE_TYPE_RET));
@@
-259,7
+259,7
@@
spu_proc_xfer_spu (const char *annex, gdb_byte *readbuf,
char buf[128];
int fd = 0;
int ret = -1;
char buf[128];
int fd = 0;
int ret = -1;
- int pid =
ptid_get_pid (inferior_ptid
);
+ int pid =
inferior_ptid.pid (
);
if (!annex)
return TARGET_XFER_EOF;
if (!annex)
return TARGET_XFER_EOF;
@@
-422,9
+422,9
@@
spu_linux_nat_target::post_startup_inferior (ptid_t ptid)
int fd;
ULONGEST addr;
int fd;
ULONGEST addr;
- int tid = ptid
_get_lwp (ptid
);
+ int tid = ptid
.lwp (
);
if (tid == 0)
if (tid == 0)
- tid = ptid
_get_pid (ptid
);
+ tid = ptid
.pid (
);
while (!parse_spufs_run (&fd, &addr))
{
while (!parse_spufs_run (&fd, &addr))
{
@@
-459,8
+459,8
@@
spu_linux_nat_target::post_attach (int pid)
/* Wait for child PTID to do something. Return id of the child,
minus_one_ptid in case of error; store status into *OURSTATUS. */
ptid_t
/* Wait for child PTID to do something. Return id of the child,
minus_one_ptid in case of error; store status into *OURSTATUS. */
ptid_t
-spu_linux_nat_target::
:
wait (ptid_t ptid, struct target_waitstatus *ourstatus,
-
int options)
+spu_linux_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
+ int options)
{
int save_errno;
int status;
{
int save_errno;
int status;
@@
-471,17
+471,17
@@
spu_linux_nat_target:::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
set_sigint_trap (); /* Causes SIGINT to be passed on to the
attached process. */
set_sigint_trap (); /* Causes SIGINT to be passed on to the
attached process. */
- pid = waitpid (ptid
_get_pid (ptid
), &status, 0);
+ pid = waitpid (ptid
.pid (
), &status, 0);
if (pid == -1 && errno == ECHILD)
/* Try again with __WCLONE to check cloned processes. */
if (pid == -1 && errno == ECHILD)
/* Try again with __WCLONE to check cloned processes. */
- pid = waitpid (ptid
_get_pid (ptid
), &status, __WCLONE);
+ pid = waitpid (ptid
.pid (
), &status, __WCLONE);
save_errno = errno;
/* Make sure we don't report an event for the exit of the
original program, if we've detached from it. */
if (pid != -1 && !WIFSTOPPED (status)
save_errno = errno;
/* Make sure we don't report an event for the exit of the
original program, if we've detached from it. */
if (pid != -1 && !WIFSTOPPED (status)
- && pid !=
ptid_get_pid (inferior_ptid
))
+ && pid !=
inferior_ptid.pid (
))
{
pid = -1;
save_errno = EINTR;
{
pid = -1;
save_errno = EINTR;
@@
-503,7
+503,7
@@
spu_linux_nat_target:::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
}
store_waitstatus (ourstatus, status);
}
store_waitstatus (ourstatus, status);
- return p
id_to_ptid
(pid);
+ return p
tid_t
(pid);
}
/* Override the fetch_inferior_register routine. */
}
/* Override the fetch_inferior_register routine. */
@@
-516,7
+516,7
@@
spu_linux_nat_target::fetch_registers (struct regcache *regcache, int regno)
/* Since we use functions that rely on inferior_ptid, we need to set and
restore it. */
scoped_restore save_ptid
/* Since we use functions that rely on inferior_ptid, we need to set and
restore it. */
scoped_restore save_ptid
- = make_scoped_restore (&inferior_ptid, regcache
_get_ptid (regcache
));
+ = make_scoped_restore (&inferior_ptid, regcache
->ptid (
));
/* We must be stopped on a spu_run system call. */
if (!parse_spufs_run (&fd, &addr))
/* We must be stopped on a spu_run system call. */
if (!parse_spufs_run (&fd, &addr))
@@
-529,7
+529,7
@@
spu_linux_nat_target::fetch_registers (struct regcache *regcache, int regno)
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
gdb_byte buf[4];
store_unsigned_integer (buf, 4, byte_order, fd);
enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
gdb_byte buf[4];
store_unsigned_integer (buf, 4, byte_order, fd);
- regcache
_raw_supply (regcache,
SPU_ID_REGNUM, buf);
+ regcache
->raw_supply (
SPU_ID_REGNUM, buf);
}
/* The NPC register is found at ADDR. */
}
/* The NPC register is found at ADDR. */
@@
-537,7
+537,7
@@
spu_linux_nat_target::fetch_registers (struct regcache *regcache, int regno)
{
gdb_byte buf[4];
if (fetch_ppc_memory (addr, buf, 4) == 0)
{
gdb_byte buf[4];
if (fetch_ppc_memory (addr, buf, 4) == 0)
- regcache
_raw_supply (regcache,
SPU_PC_REGNUM, buf);
+ regcache
->raw_supply (
SPU_PC_REGNUM, buf);
}
/* The GPRs are found in the "regs" spufs file. */
}
/* The GPRs are found in the "regs" spufs file. */
@@
-553,7
+553,7
@@
spu_linux_nat_target::fetch_registers (struct regcache *regcache, int regno)
== TARGET_XFER_OK)
&& len == sizeof buf)
for (i = 0; i < SPU_NUM_GPRS; i++)
== TARGET_XFER_OK)
&& len == sizeof buf)
for (i = 0; i < SPU_NUM_GPRS; i++)
- regcache
_raw_supply (regcache,
i, buf + i*16);
+ regcache
->raw_supply (
i, buf + i*16);
}
}
}
}
@@
-567,7
+567,7
@@
spu_linux_nat_target::store_registers (struct regcache *regcache, int regno)
/* Since we use functions that rely on inferior_ptid, we need to set and
restore it. */
scoped_restore save_ptid
/* Since we use functions that rely on inferior_ptid, we need to set and
restore it. */
scoped_restore save_ptid
- = make_scoped_restore (&inferior_ptid, regcache
_get_ptid (regcache
));
+ = make_scoped_restore (&inferior_ptid, regcache
->ptid (
));
/* We must be stopped on a spu_run system call. */
if (!parse_spufs_run (&fd, &addr))
/* We must be stopped on a spu_run system call. */
if (!parse_spufs_run (&fd, &addr))
@@
-577,7
+577,7
@@
spu_linux_nat_target::store_registers (struct regcache *regcache, int regno)
if (regno == -1 || regno == SPU_PC_REGNUM)
{
gdb_byte buf[4];
if (regno == -1 || regno == SPU_PC_REGNUM)
{
gdb_byte buf[4];
- regcache
_raw_collect (regcache,
SPU_PC_REGNUM, buf);
+ regcache
->raw_collect (
SPU_PC_REGNUM, buf);
store_ppc_memory (addr, buf, 4);
}
store_ppc_memory (addr, buf, 4);
}
@@
-590,7
+590,7
@@
spu_linux_nat_target::store_registers (struct regcache *regcache, int regno)
ULONGEST len;
for (i = 0; i < SPU_NUM_GPRS; i++)
ULONGEST len;
for (i = 0; i < SPU_NUM_GPRS; i++)
- regcache
_raw_collect (regcache,
i, buf + i*16);
+ regcache
->raw_collect (
i, buf + i*16);
xsnprintf (annex, sizeof annex, "%d/regs", fd);
spu_proc_xfer_spu (annex, NULL, buf, 0, sizeof buf, &len);
xsnprintf (annex, sizeof annex, "%d/regs", fd);
spu_proc_xfer_spu (annex, NULL, buf, 0, sizeof buf, &len);
This page took
0.026142 seconds
and
4
git commands to generate.