summaryrefslogtreecommitdiff
path: root/gdb/gdbserver
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@debian.org>2002-03-04 16:28:35 +0000
committerDaniel Jacobowitz <dan@debian.org>2002-03-04 16:28:35 +0000
commit22ad937948850bd69e1d82e1725d682abadcea22 (patch)
tree372cb11534095c6697b66d132dd9b9e1f788e8ec /gdb/gdbserver
parent1f9431b9ba26e40c2124490908e57aaca3697016 (diff)
downloadgdb-22ad937948850bd69e1d82e1725d682abadcea22.tar.gz
2002-03-04 Daniel Jacobowitz <drow@mvista.com>
* gdbserver/linux-low.c (PTRACE_XFER_TYPE): Change to long. (num_regs, regmap): Move inside HAVE_LINUX_USRREGS. (register_addr, REGISTER_RAW_SIZE): Likewise. (usr_store_inferior_registers): Use PTRACE_XFER_TYPE. * gdbserver/linux-x86-64-low.c: Remove extra #endif.
Diffstat (limited to 'gdb/gdbserver')
-rw-r--r--gdb/gdbserver/linux-low.c14
-rw-r--r--gdb/gdbserver/linux-x86-64-low.c3
2 files changed, 8 insertions, 9 deletions
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index b1e3d132980..4e40d0715f6 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -36,15 +36,18 @@
#include <unistd.h>
#define PTRACE_ARG3_TYPE long
-#define PTRACE_XFER_TYPE int
+#define PTRACE_XFER_TYPE long
#ifdef HAVE_LINUX_REGSETS
static int use_regsets_p = 1;
#endif
extern int errno;
+
+#ifdef HAVE_LINUX_USRREGS
extern int num_regs;
extern int regmap[];
+#endif
/* Start an inferior process and returns its pid.
ALLARGS is a vector of program-name and args. */
@@ -154,6 +157,9 @@ myresume (int step, int signal)
perror_with_name ("ptrace");
}
+
+#ifdef HAVE_LINUX_USRREGS
+
#define REGISTER_RAW_SIZE(regno) register_size((regno))
int
@@ -171,10 +177,6 @@ register_addr (int regnum)
return addr;
}
-
-
-#ifdef HAVE_LINUX_USRREGS
-
/* Fetch one register. */
static void
fetch_register (int regno)
@@ -242,7 +244,7 @@ usr_store_inferior_registers (int regno)
if (regaddr == -1)
return;
errno = 0;
- for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (int))
+ for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))
{
errno = 0;
ptrace (PTRACE_POKEUSER, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
diff --git a/gdb/gdbserver/linux-x86-64-low.c b/gdb/gdbserver/linux-x86-64-low.c
index d1766133aa0..ffb0ce7b1c8 100644
--- a/gdb/gdbserver/linux-x86-64-low.c
+++ b/gdb/gdbserver/linux-x86-64-low.c
@@ -74,6 +74,3 @@ struct regset_info target_regsets[] = {
x86_64_fill_fpregset, x86_64_store_fpregset },
{ 0, 0, -1, NULL, NULL }
};
-
-#endif /* HAVE_LINUX_REGSETS */
-