2012-11-09 18:03:10 +00:00
|
|
|
http://sourceware.org/ml/gdb-patches/2012-09/msg00629.html
|
|
|
|
|
Subject: [PATCH 3/4] Expand watchpoint lengths to LONGEST
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
--MP_/6HRlH6vpyqtSy4CYyMrX6b2
|
|
|
|
|
Content-Type: text/plain; charset=US-ASCII
|
|
|
|
|
Content-Transfer-Encoding: 7bit
|
|
|
|
|
Content-Disposition: inline
|
|
|
|
|
|
|
|
|
|
Hi,
|
|
|
|
|
|
|
|
|
|
This is part three of the bitpos expansion change. Some architectures
|
|
|
|
|
allow arbitrary length watchpoints and combined with the fact that type
|
|
|
|
|
lengths could be large enough, we need LONGEST for watchpoint lengths.
|
|
|
|
|
It is architecture dependent however, whether the LONGEST is needed or
|
|
|
|
|
not. This patch updates the signatures of watchpoint insertion and
|
|
|
|
|
removal functions of all architectures (to comply with the function
|
|
|
|
|
signatures in the callback struct), but expands types only in
|
|
|
|
|
architectures that need it. Tested on Fedora 16 x86_64.
|
|
|
|
|
|
|
|
|
|
Regards,
|
|
|
|
|
Siddhesh
|
|
|
|
|
--MP_/6HRlH6vpyqtSy4CYyMrX6b2
|
|
|
|
|
Content-Type: text/plain
|
|
|
|
|
Content-Transfer-Encoding: quoted-printable
|
|
|
|
|
Content-Disposition: attachment; filename=ChangeLog-wp
|
|
|
|
|
|
|
|
|
|
gdb/ChangeLog:
|
|
|
|
|
|
|
|
|
|
* arm-linux-nat.c (arm_linux_insert_watchpoint): Expand
|
|
|
|
|
parameter LEN to LONGEST.
|
|
|
|
|
(arm_linux_remove_watchpoint): Likewise.
|
|
|
|
|
(arm_linux_watchpoint_addr_within_range): Expand parameter
|
|
|
|
|
LENGTH to LONGEST.
|
|
|
|
|
* i386-nat.c (i386_insert_watchpoint): Expand parameter LEN to
|
|
|
|
|
LONGEST.
|
|
|
|
|
(i386_remove_watchpoint): Likewise.
|
|
|
|
|
* ia64-linux-nat.c (ia64_linux_insert_watchpoint): Likewise.
|
|
|
|
|
(ia64_linux_remove_watchpoint): Likewise.
|
|
|
|
|
* inf-ttrace.c (inf_ttrace_insert_watchpoint): Likewise.
|
|
|
|
|
Expand NUM_PAGES, PAGE to LONGEST.
|
|
|
|
|
(inf_ttrace_remove_watchpoint): Likewise.
|
|
|
|
|
* mips-linux-nat.c (mips_linux_insert_watchpoint): Expand
|
|
|
|
|
parameter LEN to LONGEST.
|
|
|
|
|
(mips_linux_remove_watchpoint): Likewise.
|
|
|
|
|
* nto-procfs.c (procfs_remove_hw_watchpoint): Likewise.
|
|
|
|
|
(procfs_insert_hw_watchpoint): Likewise.
|
|
|
|
|
* ppc-linux-nat.c (calculate_dvc): Likewise. Expand I,
|
|
|
|
|
NUM_BYTE_ENABLE to LONGEST.
|
|
|
|
|
(check_condition): Expand parameter LEN to point to LONGEST.
|
|
|
|
|
(ppc_linux_can_accel_watchpoint_condition): Expand parameter
|
|
|
|
|
LEN to LONGEST.
|
|
|
|
|
(create_watchpoint_request): Likewise.
|
|
|
|
|
(ppc_linux_insert_watchpoint): Likewise.
|
|
|
|
|
(ppc_linux_remove_watchpoint): Likewise.
|
|
|
|
|
(ppc_linux_watchpoint_addr_within_range): Expand parameter
|
|
|
|
|
LENGTH to LONGEST.
|
|
|
|
|
* procfs.c (proc_set_watchpoint): Expand parameter LEN to
|
|
|
|
|
LONGEST.
|
|
|
|
|
(procfs_set_watchpoint): Likewise.
|
|
|
|
|
(procfs_insert_watchpoint): Likewise.
|
|
|
|
|
(procfs_remove_watchpoint): Likewise.
|
|
|
|
|
* remote-m32r-sdi.c (m32r_insert_watchpoint): Likewise. Use
|
|
|
|
|
plongest to format print LEN.
|
|
|
|
|
(m32r_remove_watchpoint): Likewise.
|
|
|
|
|
* remote-mips.c (mips_insert_watchpoint): Expand parameter LEN
|
|
|
|
|
to LONGEST.
|
|
|
|
|
(mips_remove_watchpoint): Likewise.
|
|
|
|
|
* remote.c (remote_insert_watchpoint): Likewise.
|
|
|
|
|
Use phex_nz to format print LEN.
|
|
|
|
|
(remote_remove_watchpoint): Likewise.
|
|
|
|
|
(remote_watchpoint_addr_within_range): Expand parameter LENGTH
|
|
|
|
|
to LONGEST.
|
|
|
|
|
* s390-nat.c (s390_insert_watchpoint): Expand parameter LEN to
|
|
|
|
|
LONGEST.
|
|
|
|
|
(s390_remove_watchpoint): Likewise.
|
|
|
|
|
* target.c (update_current_target): Expand parameter LEN for
|
|
|
|
|
callbacks to TO_INSERT_WATCHPOINT, TO_REMOVE_WATCHPOINT,
|
|
|
|
|
TO_CAN_ACCEL_WATCHPOINT_CONDITION, to LONGEST.
|
|
|
|
|
(default_watchpoint_addr_within_range): Expand parameter
|
|
|
|
|
LENGTH to LONGEST.
|
|
|
|
|
(debug_to_can_accel_watchpoint_condition): Expand parameter LEN
|
|
|
|
|
to LONGEST. Use plongest to format print LEN.
|
|
|
|
|
(debug_to_watchpoint_addr_within_range): Expand parameter LENGTH
|
|
|
|
|
to LONGEST. Use plongest to format print LENGTH.
|
|
|
|
|
(debug_to_insert_watchpoint): Expand parameter LEN to LONGEST.
|
|
|
|
|
Use plongest to format print LEN.
|
|
|
|
|
(debug_to_remove_watchpoint): Likewise.
|
|
|
|
|
* target.h (struct target_ops): Expand parameter LEN of
|
|
|
|
|
TO_REMOVE_WATCHPOINT, TO_INSERT_WATCHPOINT,
|
|
|
|
|
TO_WATCHPOINT_ADDR_WITHIN_RANGE and
|
|
|
|
|
TO_CAN_ACCEL_WATCHPOINT_CONDITION to LONGEST.
|
|
|
|
|
|
|
|
|
|
--MP_/6HRlH6vpyqtSy4CYyMrX6b2
|
|
|
|
|
Content-Type: text/x-patch
|
|
|
|
|
Content-Transfer-Encoding: 7bit
|
|
|
|
|
Content-Disposition: attachment; filename=bitpos-wp.patch
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/arm-linux-nat.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/arm-linux-nat.c 2013-01-18 23:34:43.930106839 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/arm-linux-nat.c 2013-01-18 23:34:51.206116513 +0100
|
|
|
|
|
@@ -1105,7 +1105,7 @@ arm_linux_region_ok_for_hw_watchpoint (C
|
2012-11-09 18:03:10 +00:00
|
|
|
|
|
|
|
|
/* Insert a Hardware breakpoint. */
|
|
|
|
|
static int
|
|
|
|
|
-arm_linux_insert_watchpoint (CORE_ADDR addr, int len, int rw,
|
|
|
|
|
+arm_linux_insert_watchpoint (CORE_ADDR addr, LONGEST len, int rw,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct lwp_info *lp;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -1123,7 +1123,7 @@ arm_linux_insert_watchpoint (CORE_ADDR a
|
2012-11-09 18:03:10 +00:00
|
|
|
|
|
|
|
|
/* Remove a hardware breakpoint. */
|
|
|
|
|
static int
|
|
|
|
|
-arm_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw,
|
|
|
|
|
+arm_linux_remove_watchpoint (CORE_ADDR addr, LONGEST len, int rw,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct lwp_info *lp;
|
|
|
|
|
@@ -1180,7 +1180,7 @@ arm_linux_stopped_by_watchpoint (void)
|
|
|
|
|
static int
|
|
|
|
|
arm_linux_watchpoint_addr_within_range (struct target_ops *target,
|
|
|
|
|
CORE_ADDR addr,
|
|
|
|
|
- CORE_ADDR start, int length)
|
|
|
|
|
+ CORE_ADDR start, LONGEST length)
|
|
|
|
|
{
|
|
|
|
|
return start <= addr && start + length - 1 >= addr;
|
|
|
|
|
}
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/i386-nat.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/i386-nat.c 2013-01-18 23:34:43.931106841 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/i386-nat.c 2013-01-18 23:34:51.206116513 +0100
|
|
|
|
|
@@ -591,7 +591,7 @@ i386_update_inferior_debug_regs (struct
|
2012-11-09 18:03:10 +00:00
|
|
|
of the type TYPE. Return 0 on success, -1 on failure. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-i386_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+i386_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct i386_debug_reg_state *state = i386_debug_reg_state ();
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -628,7 +628,7 @@ i386_insert_watchpoint (CORE_ADDR addr,
|
2012-11-09 18:03:10 +00:00
|
|
|
address ADDR, whose length is LEN bytes, and for accesses of the
|
|
|
|
|
type TYPE. Return 0 on success, -1 on failure. */
|
|
|
|
|
static int
|
|
|
|
|
-i386_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+i386_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct i386_debug_reg_state *state = i386_debug_reg_state ();
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/ia64-linux-nat.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/ia64-linux-nat.c 2013-01-18 23:34:43.931106841 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/ia64-linux-nat.c 2013-01-18 23:34:51.206116513 +0100
|
2012-11-09 18:03:10 +00:00
|
|
|
@@ -542,7 +542,7 @@ is_power_of_2 (int val)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-ia64_linux_insert_watchpoint (CORE_ADDR addr, int len, int rw,
|
|
|
|
|
+ia64_linux_insert_watchpoint (CORE_ADDR addr, LONGEST len, int rw,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct lwp_info *lp;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -596,7 +596,7 @@ ia64_linux_insert_watchpoint (CORE_ADDR
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-ia64_linux_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+ia64_linux_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
int idx;
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/inf-ttrace.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/inf-ttrace.c 2013-01-18 23:34:43.932106844 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/inf-ttrace.c 2013-01-18 23:34:51.206116513 +0100
|
|
|
|
|
@@ -313,14 +313,14 @@ inf_ttrace_disable_page_protections (pid
|
2012-11-09 18:03:10 +00:00
|
|
|
type TYPE. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-inf_ttrace_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+inf_ttrace_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
const int pagesize = inf_ttrace_page_dict.pagesize;
|
|
|
|
|
pid_t pid = ptid_get_pid (inferior_ptid);
|
|
|
|
|
CORE_ADDR page_addr;
|
|
|
|
|
- int num_pages;
|
|
|
|
|
- int page;
|
|
|
|
|
+ LONGEST num_pages;
|
|
|
|
|
+ LONGEST page;
|
|
|
|
|
|
|
|
|
|
gdb_assert (type == hw_write);
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -337,14 +337,14 @@ inf_ttrace_insert_watchpoint (CORE_ADDR
|
2012-11-09 18:03:10 +00:00
|
|
|
type TYPE. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-inf_ttrace_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+inf_ttrace_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
const int pagesize = inf_ttrace_page_dict.pagesize;
|
|
|
|
|
pid_t pid = ptid_get_pid (inferior_ptid);
|
|
|
|
|
CORE_ADDR page_addr;
|
|
|
|
|
- int num_pages;
|
|
|
|
|
- int page;
|
|
|
|
|
+ LONGEST num_pages;
|
|
|
|
|
+ LONGEST page;
|
|
|
|
|
|
|
|
|
|
gdb_assert (type == hw_write);
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/mips-linux-nat.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/mips-linux-nat.c 2013-01-18 23:34:43.932106844 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/mips-linux-nat.c 2013-01-18 23:34:51.208116518 +0100
|
|
|
|
|
@@ -1017,7 +1017,7 @@ populate_regs_from_watches (struct pt_wa
|
2012-11-09 18:03:10 +00:00
|
|
|
watch. Return zero on success. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-mips_linux_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+mips_linux_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct pt_watch_regs regs;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -1067,7 +1067,7 @@ mips_linux_insert_watchpoint (CORE_ADDR
|
2012-11-09 18:03:10 +00:00
|
|
|
Return zero on success. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-mips_linux_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+mips_linux_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
int retval;
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/nto-procfs.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/nto-procfs.c 2013-01-18 23:34:43.933106847 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/nto-procfs.c 2013-01-18 23:34:51.208116518 +0100
|
2012-11-09 18:03:10 +00:00
|
|
|
@@ -69,10 +69,10 @@ static ptid_t do_attach (ptid_t ptid);
|
|
|
|
|
|
|
|
|
|
static int procfs_can_use_hw_breakpoint (int, int, int);
|
|
|
|
|
|
|
|
|
|
-static int procfs_insert_hw_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+static int procfs_insert_hw_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond);
|
|
|
|
|
|
|
|
|
|
-static int procfs_remove_hw_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+static int procfs_remove_hw_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond);
|
|
|
|
|
|
|
|
|
|
static int procfs_stopped_by_watchpoint (void);
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -1493,14 +1493,14 @@ procfs_can_use_hw_breakpoint (int type,
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-procfs_remove_hw_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+procfs_remove_hw_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
return procfs_hw_watchpoint (addr, -1, type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-procfs_insert_hw_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+procfs_insert_hw_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
return procfs_hw_watchpoint (addr, len, type);
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/ppc-linux-nat.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/ppc-linux-nat.c 2013-01-18 23:34:43.934106849 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/ppc-linux-nat.c 2013-01-18 23:34:51.208116518 +0100
|
|
|
|
|
@@ -1838,11 +1838,11 @@ can_use_watchpoint_cond_accel (void)
|
2012-11-09 18:03:10 +00:00
|
|
|
CONDITION_VALUE will hold the value which should be put in the
|
|
|
|
|
DVC register. */
|
|
|
|
|
static void
|
|
|
|
|
-calculate_dvc (CORE_ADDR addr, int len, CORE_ADDR data_value,
|
|
|
|
|
+calculate_dvc (CORE_ADDR addr, LONGEST len, CORE_ADDR data_value,
|
|
|
|
|
uint32_t *condition_mode, uint64_t *condition_value)
|
|
|
|
|
{
|
|
|
|
|
- int i, num_byte_enable, align_offset, num_bytes_off_dvc,
|
|
|
|
|
- rightmost_enabled_byte;
|
|
|
|
|
+ LONGEST i, num_byte_enable;
|
|
|
|
|
+ int align_offset, num_bytes_off_dvc, rightmost_enabled_byte;
|
|
|
|
|
CORE_ADDR addr_end_data, addr_end_dvc;
|
|
|
|
|
|
|
|
|
|
/* The DVC register compares bytes within fixed-length windows which
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -1929,7 +1929,7 @@ num_memory_accesses (struct value *v)
|
2012-11-09 18:03:10 +00:00
|
|
|
of the constant. */
|
|
|
|
|
static int
|
|
|
|
|
check_condition (CORE_ADDR watch_addr, struct expression *cond,
|
|
|
|
|
- CORE_ADDR *data_value, int *len)
|
|
|
|
|
+ CORE_ADDR *data_value, LONGEST *len)
|
|
|
|
|
{
|
|
|
|
|
int pc = 1, num_accesses_left, num_accesses_right;
|
|
|
|
|
struct value *left_val, *right_val, *left_chain, *right_chain;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -1996,7 +1996,7 @@ check_condition (CORE_ADDR watch_addr, s
|
2012-11-09 18:03:10 +00:00
|
|
|
the condition expression, thus only triggering the watchpoint when it is
|
|
|
|
|
true. */
|
|
|
|
|
static int
|
|
|
|
|
-ppc_linux_can_accel_watchpoint_condition (CORE_ADDR addr, int len, int rw,
|
|
|
|
|
+ppc_linux_can_accel_watchpoint_condition (CORE_ADDR addr, LONGEST len, int rw,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR data_value;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -2013,7 +2013,7 @@ ppc_linux_can_accel_watchpoint_condition
|
2012-11-09 18:03:10 +00:00
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
create_watchpoint_request (struct ppc_hw_breakpoint *p, CORE_ADDR addr,
|
|
|
|
|
- int len, int rw, struct expression *cond,
|
|
|
|
|
+ LONGEST len, int rw, struct expression *cond,
|
|
|
|
|
int insert)
|
|
|
|
|
{
|
|
|
|
|
if (len == 1
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -2058,7 +2058,7 @@ create_watchpoint_request (struct ppc_hw
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-ppc_linux_insert_watchpoint (CORE_ADDR addr, int len, int rw,
|
|
|
|
|
+ppc_linux_insert_watchpoint (CORE_ADDR addr, LONGEST len, int rw,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct lwp_info *lp;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -2126,7 +2126,7 @@ ppc_linux_insert_watchpoint (CORE_ADDR a
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-ppc_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw,
|
|
|
|
|
+ppc_linux_remove_watchpoint (CORE_ADDR addr, LONGEST len, int rw,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct lwp_info *lp;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -2266,7 +2266,7 @@ ppc_linux_stopped_by_watchpoint (void)
|
2012-11-09 18:03:10 +00:00
|
|
|
static int
|
|
|
|
|
ppc_linux_watchpoint_addr_within_range (struct target_ops *target,
|
|
|
|
|
CORE_ADDR addr,
|
|
|
|
|
- CORE_ADDR start, int length)
|
|
|
|
|
+ CORE_ADDR start, LONGEST length)
|
|
|
|
|
{
|
|
|
|
|
int mask;
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/procfs.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/procfs.c 2013-01-18 23:34:43.937106855 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/procfs.c 2013-01-18 23:35:12.598145073 +0100
|
|
|
|
|
@@ -2433,7 +2433,7 @@ procfs_address_to_host_pointer (CORE_ADD
|
2012-11-09 18:03:10 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-proc_set_watchpoint (procinfo *pi, CORE_ADDR addr, int len, int wflags)
|
|
|
|
|
+proc_set_watchpoint (procinfo *pi, CORE_ADDR addr, LONGEST len, int wflags)
|
|
|
|
|
{
|
|
|
|
|
#if !defined (PCWATCH) && !defined (PIOCSWATCH)
|
|
|
|
|
/* If neither or these is defined, we can't support watchpoints.
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4777,7 +4777,7 @@ procfs_pid_to_str (struct target_ops *op
|
2012-11-09 18:03:10 +00:00
|
|
|
/* Insert a watchpoint. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-procfs_set_watchpoint (ptid_t ptid, CORE_ADDR addr, int len, int rwflag,
|
|
|
|
|
+procfs_set_watchpoint (ptid_t ptid, CORE_ADDR addr, LONGEST len, int rwflag,
|
|
|
|
|
int after)
|
|
|
|
|
{
|
2013-01-19 22:41:55 +00:00
|
|
|
#ifndef AIX5
|
|
|
|
|
@@ -4897,7 +4897,7 @@ procfs_stopped_data_address (struct targ
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-procfs_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+procfs_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
if (!target_have_steppable_watchpoint
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4919,7 +4919,7 @@ procfs_insert_watchpoint (CORE_ADDR addr
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-procfs_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+procfs_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
return procfs_set_watchpoint (inferior_ptid, addr, 0, 0, 0);
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/remote-m32r-sdi.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/remote-m32r-sdi.c 2013-01-18 23:34:51.211116523 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/remote-m32r-sdi.c 2013-01-18 23:36:50.004276296 +0100
|
|
|
|
|
@@ -1417,14 +1417,15 @@ m32r_can_use_hw_watchpoint (int type, in
|
2012-11-09 18:03:10 +00:00
|
|
|
watchpoint. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-m32r_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+m32r_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (remote_debug)
|
|
|
|
|
- fprintf_unfiltered (gdb_stdlog, "m32r_insert_watchpoint(%s,%d,%d)\n",
|
2013-01-19 22:41:55 +00:00
|
|
|
- paddress (target_gdbarch (), addr), len, type);
|
2012-11-09 18:03:10 +00:00
|
|
|
+ fprintf_unfiltered (gdb_stdlog, "m32r_insert_watchpoint(%s,%s,%d)\n",
|
2013-01-19 22:41:55 +00:00
|
|
|
+ paddress (target_gdbarch (), addr), plongest (len),
|
|
|
|
|
+ type);
|
2012-11-09 18:03:10 +00:00
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_ACCESS_BREAKS; i++)
|
|
|
|
|
{
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -1442,14 +1443,15 @@ m32r_insert_watchpoint (CORE_ADDR addr,
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-m32r_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+m32r_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
if (remote_debug)
|
|
|
|
|
- fprintf_unfiltered (gdb_stdlog, "m32r_remove_watchpoint(%s,%d,%d)\n",
|
2013-01-19 22:41:55 +00:00
|
|
|
- paddress (target_gdbarch (), addr), len, type);
|
2012-11-09 18:03:10 +00:00
|
|
|
+ fprintf_unfiltered (gdb_stdlog, "m32r_remove_watchpoint(%s,%s,%d)\n",
|
2013-01-19 22:41:55 +00:00
|
|
|
+ paddress (target_gdbarch (), addr), plongest (len),
|
|
|
|
|
+ type);
|
2012-11-09 18:03:10 +00:00
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_ACCESS_BREAKS; i++)
|
|
|
|
|
{
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/remote-mips.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/remote-mips.c 2013-01-18 23:34:43.939106860 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/remote-mips.c 2013-01-18 23:34:51.212116525 +0100
|
2012-11-09 18:03:10 +00:00
|
|
|
@@ -2419,7 +2419,7 @@ calculate_mask (CORE_ADDR addr, int len)
|
|
|
|
|
watchpoint. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-mips_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+mips_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
if (mips_set_breakpoint (addr, len, type))
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -2431,7 +2431,7 @@ mips_insert_watchpoint (CORE_ADDR addr,
|
2012-11-09 18:03:10 +00:00
|
|
|
/* Remove a watchpoint. */
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-mips_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+mips_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
if (mips_clear_breakpoint (addr, len, type))
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/remote.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/remote.c 2013-01-18 23:34:43.943106869 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/remote.c 2013-01-18 23:34:51.214116529 +0100
|
|
|
|
|
@@ -8093,7 +8093,7 @@ watchpoint_to_Z_packet (int type)
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-remote_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+remote_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct remote_state *rs = get_remote_state ();
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -8108,7 +8108,7 @@ remote_insert_watchpoint (CORE_ADDR addr
|
2012-11-09 18:03:10 +00:00
|
|
|
p = strchr (rs->buf, '\0');
|
|
|
|
|
addr = remote_address_masked (addr);
|
|
|
|
|
p += hexnumstr (p, (ULONGEST) addr);
|
|
|
|
|
- xsnprintf (p, endbuf - p, ",%x", len);
|
|
|
|
|
+ xsnprintf (p, endbuf - p, ",%s", phex_nz (len, sizeof (len)));
|
|
|
|
|
|
|
|
|
|
putpkt (rs->buf);
|
|
|
|
|
getpkt (&rs->buf, &rs->buf_size, 0);
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -8128,7 +8128,7 @@ remote_insert_watchpoint (CORE_ADDR addr
|
2012-11-09 18:03:10 +00:00
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
remote_watchpoint_addr_within_range (struct target_ops *target, CORE_ADDR addr,
|
|
|
|
|
- CORE_ADDR start, int length)
|
|
|
|
|
+ CORE_ADDR start, LONGEST length)
|
|
|
|
|
{
|
|
|
|
|
CORE_ADDR diff = remote_address_masked (addr - start);
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -8137,7 +8137,7 @@ remote_watchpoint_addr_within_range (str
|
2012-11-09 18:03:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-remote_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+remote_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct remote_state *rs = get_remote_state ();
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -8152,7 +8152,7 @@ remote_remove_watchpoint (CORE_ADDR addr
|
2012-11-09 18:03:10 +00:00
|
|
|
p = strchr (rs->buf, '\0');
|
|
|
|
|
addr = remote_address_masked (addr);
|
|
|
|
|
p += hexnumstr (p, (ULONGEST) addr);
|
|
|
|
|
- xsnprintf (p, endbuf - p, ",%x", len);
|
|
|
|
|
+ xsnprintf (p, endbuf - p, ",%s", phex_nz (len, sizeof (len)));
|
|
|
|
|
putpkt (rs->buf);
|
|
|
|
|
getpkt (&rs->buf, &rs->buf_size, 0);
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/s390-nat.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/s390-nat.c 2013-01-18 23:34:43.944106871 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/s390-nat.c 2013-01-18 23:34:51.215116531 +0100
|
|
|
|
|
@@ -516,7 +516,7 @@ s390_fix_watch_points (struct lwp_info *
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-s390_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+s390_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct lwp_info *lp;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -537,7 +537,7 @@ s390_insert_watchpoint (CORE_ADDR addr,
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-s390_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+s390_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
struct lwp_info *lp;
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/target.c
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/target.c 2013-01-18 23:34:43.947106878 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/target.c 2013-01-18 23:34:51.216116533 +0100
|
2012-11-09 18:03:10 +00:00
|
|
|
@@ -49,7 +49,8 @@ static void target_info (char *, int);
|
|
|
|
|
static void default_terminal_info (char *, int);
|
|
|
|
|
|
|
|
|
|
static int default_watchpoint_addr_within_range (struct target_ops *,
|
|
|
|
|
- CORE_ADDR, CORE_ADDR, int);
|
|
|
|
|
+ CORE_ADDR, CORE_ADDR,
|
|
|
|
|
+ LONGEST);
|
|
|
|
|
|
|
|
|
|
static int default_region_ok_for_hw_watchpoint (CORE_ADDR, LONGEST);
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -114,10 +115,10 @@ static int debug_to_insert_hw_breakpoint
|
2012-11-09 18:03:10 +00:00
|
|
|
static int debug_to_remove_hw_breakpoint (struct gdbarch *,
|
|
|
|
|
struct bp_target_info *);
|
|
|
|
|
|
|
|
|
|
-static int debug_to_insert_watchpoint (CORE_ADDR, int, int,
|
|
|
|
|
+static int debug_to_insert_watchpoint (CORE_ADDR, LONGEST, int,
|
|
|
|
|
struct expression *);
|
|
|
|
|
|
|
|
|
|
-static int debug_to_remove_watchpoint (CORE_ADDR, int, int,
|
|
|
|
|
+static int debug_to_remove_watchpoint (CORE_ADDR, LONGEST, int,
|
|
|
|
|
struct expression *);
|
|
|
|
|
|
|
|
|
|
static int debug_to_stopped_by_watchpoint (void);
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -125,11 +126,12 @@ static int debug_to_stopped_by_watchpoin
|
2012-11-09 18:03:10 +00:00
|
|
|
static int debug_to_stopped_data_address (struct target_ops *, CORE_ADDR *);
|
|
|
|
|
|
|
|
|
|
static int debug_to_watchpoint_addr_within_range (struct target_ops *,
|
|
|
|
|
- CORE_ADDR, CORE_ADDR, int);
|
|
|
|
|
+ CORE_ADDR, CORE_ADDR,
|
|
|
|
|
+ LONGEST);
|
|
|
|
|
|
|
|
|
|
static int debug_to_region_ok_for_hw_watchpoint (CORE_ADDR, LONGEST);
|
|
|
|
|
|
|
|
|
|
-static int debug_to_can_accel_watchpoint_condition (CORE_ADDR, int, int,
|
|
|
|
|
+static int debug_to_can_accel_watchpoint_condition (CORE_ADDR, LONGEST, int,
|
|
|
|
|
struct expression *);
|
|
|
|
|
|
|
|
|
|
static void debug_to_terminal_init (void);
|
|
|
|
|
@@ -751,10 +753,10 @@ update_current_target (void)
|
|
|
|
|
(int (*) (struct gdbarch *, struct bp_target_info *))
|
|
|
|
|
return_minus_one);
|
|
|
|
|
de_fault (to_insert_watchpoint,
|
|
|
|
|
- (int (*) (CORE_ADDR, int, int, struct expression *))
|
|
|
|
|
+ (int (*) (CORE_ADDR, LONGEST, int, struct expression *))
|
|
|
|
|
return_minus_one);
|
|
|
|
|
de_fault (to_remove_watchpoint,
|
|
|
|
|
- (int (*) (CORE_ADDR, int, int, struct expression *))
|
|
|
|
|
+ (int (*) (CORE_ADDR, LONGEST, int, struct expression *))
|
|
|
|
|
return_minus_one);
|
|
|
|
|
de_fault (to_stopped_by_watchpoint,
|
|
|
|
|
(int (*) (void))
|
|
|
|
|
@@ -767,7 +769,7 @@ update_current_target (void)
|
|
|
|
|
de_fault (to_region_ok_for_hw_watchpoint,
|
|
|
|
|
default_region_ok_for_hw_watchpoint);
|
|
|
|
|
de_fault (to_can_accel_watchpoint_condition,
|
|
|
|
|
- (int (*) (CORE_ADDR, int, int, struct expression *))
|
|
|
|
|
+ (int (*) (CORE_ADDR, LONGEST, int, struct expression *))
|
|
|
|
|
return_zero);
|
|
|
|
|
de_fault (to_terminal_init,
|
|
|
|
|
(void (*) (void))
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -3560,7 +3562,7 @@ default_region_ok_for_hw_watchpoint (COR
|
2012-11-09 18:03:10 +00:00
|
|
|
static int
|
|
|
|
|
default_watchpoint_addr_within_range (struct target_ops *target,
|
|
|
|
|
CORE_ADDR addr,
|
|
|
|
|
- CORE_ADDR start, int length)
|
|
|
|
|
+ CORE_ADDR start, LONGEST length)
|
|
|
|
|
{
|
|
|
|
|
return addr >= start && addr < start + length;
|
|
|
|
|
}
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4267,7 +4269,7 @@ debug_to_region_ok_for_hw_watchpoint (CO
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-debug_to_can_accel_watchpoint_condition (CORE_ADDR addr, int len, int rw,
|
|
|
|
|
+debug_to_can_accel_watchpoint_condition (CORE_ADDR addr, LONGEST len, int rw,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
int retval;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4277,8 +4279,8 @@ debug_to_can_accel_watchpoint_condition
|
2012-11-09 18:03:10 +00:00
|
|
|
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
"target_can_accel_watchpoint_condition "
|
|
|
|
|
- "(%s, %d, %d, %s) = %ld\n",
|
|
|
|
|
- core_addr_to_string (addr), len, rw,
|
|
|
|
|
+ "(%s, %s, %d, %s) = %ld\n",
|
|
|
|
|
+ core_addr_to_string (addr), plongest (len), rw,
|
|
|
|
|
host_address_to_string (cond), (unsigned long) retval);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4313,7 +4315,7 @@ debug_to_stopped_data_address (struct ta
|
2012-11-09 18:03:10 +00:00
|
|
|
static int
|
|
|
|
|
debug_to_watchpoint_addr_within_range (struct target_ops *target,
|
|
|
|
|
CORE_ADDR addr,
|
|
|
|
|
- CORE_ADDR start, int length)
|
|
|
|
|
+ CORE_ADDR start, LONGEST length)
|
|
|
|
|
{
|
|
|
|
|
int retval;
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4321,9 +4323,9 @@ debug_to_watchpoint_addr_within_range (s
|
2012-11-09 18:03:10 +00:00
|
|
|
start, length);
|
|
|
|
|
|
|
|
|
|
fprintf_filtered (gdb_stdlog,
|
|
|
|
|
- "target_watchpoint_addr_within_range (%s, %s, %d) = %d\n",
|
|
|
|
|
+ "target_watchpoint_addr_within_range (%s, %s, %s) = %d\n",
|
|
|
|
|
core_addr_to_string (addr), core_addr_to_string (start),
|
|
|
|
|
- length, retval);
|
|
|
|
|
+ plongest (length), retval);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4358,7 +4360,7 @@ debug_to_remove_hw_breakpoint (struct gd
|
2012-11-09 18:03:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-debug_to_insert_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+debug_to_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
int retval;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4366,14 +4368,14 @@ debug_to_insert_watchpoint (CORE_ADDR ad
|
2012-11-09 18:03:10 +00:00
|
|
|
retval = debug_target.to_insert_watchpoint (addr, len, type, cond);
|
|
|
|
|
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
- "target_insert_watchpoint (%s, %d, %d, %s) = %ld\n",
|
|
|
|
|
- core_addr_to_string (addr), len, type,
|
|
|
|
|
+ "target_insert_watchpoint (%s, %s, %d, %s) = %ld\n",
|
|
|
|
|
+ core_addr_to_string (addr), plongest (len), type,
|
|
|
|
|
host_address_to_string (cond), (unsigned long) retval);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
-debug_to_remove_watchpoint (CORE_ADDR addr, int len, int type,
|
|
|
|
|
+debug_to_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
|
|
|
|
|
struct expression *cond)
|
|
|
|
|
{
|
|
|
|
|
int retval;
|
2013-01-19 22:41:55 +00:00
|
|
|
@@ -4381,8 +4383,8 @@ debug_to_remove_watchpoint (CORE_ADDR ad
|
2012-11-09 18:03:10 +00:00
|
|
|
retval = debug_target.to_remove_watchpoint (addr, len, type, cond);
|
|
|
|
|
|
|
|
|
|
fprintf_unfiltered (gdb_stdlog,
|
|
|
|
|
- "target_remove_watchpoint (%s, %d, %d, %s) = %ld\n",
|
|
|
|
|
- core_addr_to_string (addr), len, type,
|
|
|
|
|
+ "target_remove_watchpoint (%s, %s, %d, %s) = %ld\n",
|
|
|
|
|
+ core_addr_to_string (addr), plongest (len), type,
|
|
|
|
|
host_address_to_string (cond), (unsigned long) retval);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
2013-01-19 22:41:55 +00:00
|
|
|
Index: gdb-7.5.50.20130118/gdb/target.h
|
|
|
|
|
===================================================================
|
|
|
|
|
--- gdb-7.5.50.20130118.orig/gdb/target.h 2013-01-18 23:34:43.947106878 +0100
|
|
|
|
|
+++ gdb-7.5.50.20130118/gdb/target.h 2013-01-18 23:34:51.217116536 +0100
|
2012-11-09 18:03:10 +00:00
|
|
|
@@ -466,8 +466,8 @@ struct target_ops
|
|
|
|
|
|
|
|
|
|
/* Documentation of what the two routines below are expected to do is
|
|
|
|
|
provided with the corresponding target_* macros. */
|
|
|
|
|
- int (*to_remove_watchpoint) (CORE_ADDR, int, int, struct expression *);
|
|
|
|
|
- int (*to_insert_watchpoint) (CORE_ADDR, int, int, struct expression *);
|
|
|
|
|
+ int (*to_remove_watchpoint) (CORE_ADDR, LONGEST, int, struct expression *);
|
|
|
|
|
+ int (*to_insert_watchpoint) (CORE_ADDR, LONGEST, int, struct expression *);
|
|
|
|
|
|
|
|
|
|
int (*to_insert_mask_watchpoint) (struct target_ops *,
|
|
|
|
|
CORE_ADDR, CORE_ADDR, int);
|
|
|
|
|
@@ -478,13 +478,13 @@ struct target_ops
|
|
|
|
|
int to_have_continuable_watchpoint;
|
|
|
|
|
int (*to_stopped_data_address) (struct target_ops *, CORE_ADDR *);
|
|
|
|
|
int (*to_watchpoint_addr_within_range) (struct target_ops *,
|
|
|
|
|
- CORE_ADDR, CORE_ADDR, int);
|
|
|
|
|
+ CORE_ADDR, CORE_ADDR, LONGEST);
|
|
|
|
|
|
|
|
|
|
/* Documentation of this routine is provided with the corresponding
|
|
|
|
|
target_* macro. */
|
|
|
|
|
int (*to_region_ok_for_hw_watchpoint) (CORE_ADDR, LONGEST);
|
|
|
|
|
|
|
|
|
|
- int (*to_can_accel_watchpoint_condition) (CORE_ADDR, int, int,
|
|
|
|
|
+ int (*to_can_accel_watchpoint_condition) (CORE_ADDR, LONGEST, int,
|
|
|
|
|
struct expression *);
|
|
|
|
|
int (*to_masked_watch_num_registers) (struct target_ops *,
|
|
|
|
|
CORE_ADDR, CORE_ADDR);
|
