X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fia64-linux-nat.c;h=cd52d2e9acac9baf3833eb78bfb3cb2f1d975ee0;hb=f42bf748e417cf9120fc57d144b6eaaf3adda247;hp=31ee479029ae664ffa88e452580ed83f297b7aea;hpb=11b5219af5c54762a68469ade4005e5dd2362f87;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index 31ee479029..cd52d2e9ac 100644
--- a/gdb/ia64-linux-nat.c
+++ b/gdb/ia64-linux-nat.c
@@ -1,7 +1,7 @@
/* Functions specific to running gdb native on IA-64 running
GNU/Linux.
- Copyright (C) 1999-2014 Free Software Foundation, Inc.
+ Copyright (C) 1999-2016 Free Software Foundation, Inc.
This file is part of GDB.
@@ -19,7 +19,6 @@
along with this program. If not, see . */
#include "defs.h"
-#include
#include "inferior.h"
#include "target.h"
#include "gdbcore.h"
@@ -28,7 +27,7 @@
#include "linux-nat.h"
#include
-#include
+#include "nat/gdb_ptrace.h"
#include "gdb_wait.h"
#ifdef HAVE_SYS_REG_H
#include
@@ -542,7 +541,9 @@ is_power_of_2 (int val)
}
static int
-ia64_linux_insert_watchpoint (CORE_ADDR addr, int len, int rw,
+ia64_linux_insert_watchpoint (struct target_ops *self,
+ CORE_ADDR addr, int len,
+ enum target_hw_bp_type type,
struct expression *cond)
{
struct lwp_info *lp;
@@ -569,7 +570,7 @@ ia64_linux_insert_watchpoint (CORE_ADDR addr, int len, int rw,
dbr_addr = (long) addr;
dbr_mask = (~(len - 1) & 0x00ffffffffffffffL); /* construct mask to match */
dbr_mask |= 0x0800000000000000L; /* Only match privilege level 3 */
- switch (rw)
+ switch (type)
{
case hw_write:
dbr_mask |= (1L << 62); /* Set w bit */
@@ -597,7 +598,8 @@ ia64_linux_insert_watchpoint (CORE_ADDR addr, int len, int rw,
static int
ia64_linux_remove_watchpoint (struct target_ops *self,
- CORE_ADDR addr, int len, int type,
+ CORE_ADDR addr, int len,
+ enum target_hw_bp_type type,
struct expression *cond)
{
int idx;
@@ -678,7 +680,8 @@ ia64_linux_stopped_by_watchpoint (struct target_ops *ops)
static int
ia64_linux_can_use_hw_breakpoint (struct target_ops *self,
- int type, int cnt, int othertype)
+ enum bptype type,
+ int cnt, int othertype)
{
return 1;
}
@@ -837,18 +840,47 @@ ia64_linux_store_registers (struct target_ops *ops,
static target_xfer_partial_ftype *super_xfer_partial;
-static LONGEST
+/* Implement the to_xfer_partial target_ops method. */
+
+static enum target_xfer_status
ia64_linux_xfer_partial (struct target_ops *ops,
enum target_object object,
const char *annex,
gdb_byte *readbuf, const gdb_byte *writebuf,
- ULONGEST offset, ULONGEST len)
+ ULONGEST offset, ULONGEST len,
+ ULONGEST *xfered_len)
{
- if (object == TARGET_OBJECT_UNWIND_TABLE && writebuf == NULL && offset == 0)
- return syscall (__NR_getunwind, readbuf, len);
+ if (object == TARGET_OBJECT_UNWIND_TABLE && readbuf != NULL)
+ {
+ static long gate_table_size;
+ gdb_byte *tmp_buf;
+ long res;
+
+ /* Probe for the table size once. */
+ if (gate_table_size == 0)
+ gate_table_size = syscall (__NR_getunwind, NULL, 0);
+ if (gate_table_size < 0)
+ return TARGET_XFER_E_IO;
+
+ if (offset >= gate_table_size)
+ return TARGET_XFER_EOF;
+
+ tmp_buf = alloca (gate_table_size);
+ res = syscall (__NR_getunwind, tmp_buf, gate_table_size);
+ if (res < 0)
+ return TARGET_XFER_E_IO;
+ gdb_assert (res == gate_table_size);
+
+ if (offset + len > gate_table_size)
+ len = gate_table_size - offset;
+
+ memcpy (readbuf, tmp_buf + offset, len);
+ *xfered_len = len;
+ return TARGET_XFER_OK;
+ }
return super_xfer_partial (ops, object, annex, readbuf, writebuf,
- offset, len);
+ offset, len, xfered_len);
}
/* For break.b instruction ia64 CPU forgets the immediate value and generates