Rebase to FSF GDB 7.5.50.20130215 (pre-7.6 snapshot).

This commit is contained in:
Jan Kratochvil 2013-02-18 18:14:00 +01:00
commit ab333d9938
17 changed files with 836 additions and 1368 deletions

View file

@ -96,10 +96,10 @@ Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=bitpos-wp.patch
Index: gdb-7.5.50.20130118/gdb/arm-linux-nat.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/arm-linux-nat.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/arm-linux-nat.c 2013-02-15 22:42:45.988804306 +0100
@@ -1105,7 +1105,7 @@ arm_linux_region_ok_for_hw_watchpoint (C
/* Insert a Hardware breakpoint. */
@ -127,11 +127,11 @@ Index: gdb-7.5.50.20130118/gdb/arm-linux-nat.c
{
return start <= addr && start + length - 1 >= addr;
}
Index: gdb-7.5.50.20130118/gdb/i386-nat.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/i386-nat.c 2013-02-15 22:41:53.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/i386-nat.c 2013-02-15 22:43:14.005838741 +0100
@@ -589,7 +589,7 @@ i386_update_inferior_debug_regs (struct
of the type TYPE. Return 0 on success, -1 on failure. */
static int
@ -139,8 +139,8 @@ Index: gdb-7.5.50.20130118/gdb/i386-nat.c
+i386_insert_watchpoint (CORE_ADDR addr, LONGEST len, int type,
struct expression *cond)
{
struct i386_debug_reg_state *state = i386_debug_reg_state ();
@@ -628,7 +628,7 @@ i386_insert_watchpoint (CORE_ADDR addr,
struct i386_debug_reg_state *state
@@ -627,7 +627,7 @@ i386_insert_watchpoint (CORE_ADDR addr,
address ADDR, whose length is LEN bytes, and for accesses of the
type TYPE. Return 0 on success, -1 on failure. */
static int
@ -148,11 +148,11 @@ Index: gdb-7.5.50.20130118/gdb/i386-nat.c
+i386_remove_watchpoint (CORE_ADDR addr, LONGEST len, int type,
struct expression *cond)
{
struct i386_debug_reg_state *state = i386_debug_reg_state ();
Index: gdb-7.5.50.20130118/gdb/ia64-linux-nat.c
struct i386_debug_reg_state *state
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/ia64-linux-nat.c 2013-02-15 22:34:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/ia64-linux-nat.c 2013-02-15 22:42:45.989804309 +0100
@@ -542,7 +542,7 @@ is_power_of_2 (int val)
}
@ -171,10 +171,10 @@ Index: gdb-7.5.50.20130118/gdb/ia64-linux-nat.c
struct expression *cond)
{
int idx;
Index: gdb-7.5.50.20130118/gdb/inf-ttrace.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/inf-ttrace.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/inf-ttrace.c 2013-02-15 22:42:45.989804309 +0100
@@ -313,14 +313,14 @@ inf_ttrace_disable_page_protections (pid
type TYPE. */
@ -211,10 +211,10 @@ Index: gdb-7.5.50.20130118/gdb/inf-ttrace.c
gdb_assert (type == hw_write);
Index: gdb-7.5.50.20130118/gdb/mips-linux-nat.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/mips-linux-nat.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/mips-linux-nat.c 2013-02-15 22:42:45.990804311 +0100
@@ -1017,7 +1017,7 @@ populate_regs_from_watches (struct pt_wa
watch. Return zero on success. */
@ -233,10 +233,10 @@ Index: gdb-7.5.50.20130118/gdb/mips-linux-nat.c
struct expression *cond)
{
int retval;
Index: gdb-7.5.50.20130118/gdb/nto-procfs.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/nto-procfs.c 2013-01-01 07:32:47.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/nto-procfs.c 2013-02-15 22:42:45.990804311 +0100
@@ -69,10 +69,10 @@ static ptid_t do_attach (ptid_t ptid);
static int procfs_can_use_hw_breakpoint (int, int, int);
@ -267,10 +267,10 @@ Index: gdb-7.5.50.20130118/gdb/nto-procfs.c
struct expression *cond)
{
return procfs_hw_watchpoint (addr, len, type);
Index: gdb-7.5.50.20130118/gdb/ppc-linux-nat.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/ppc-linux-nat.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/ppc-linux-nat.c 2013-02-15 22:42:45.991804313 +0100
@@ -1838,11 +1838,11 @@ can_use_watchpoint_cond_accel (void)
CONDITION_VALUE will hold the value which should be put in the
DVC register. */
@ -340,10 +340,10 @@ Index: gdb-7.5.50.20130118/gdb/ppc-linux-nat.c
{
int mask;
Index: gdb-7.5.50.20130118/gdb/procfs.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/procfs.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/procfs.c 2013-02-15 22:42:45.992804315 +0100
@@ -2433,7 +2433,7 @@ procfs_address_to_host_pointer (CORE_ADD
#endif
@ -380,10 +380,10 @@ Index: gdb-7.5.50.20130118/gdb/procfs.c
struct expression *cond)
{
return procfs_set_watchpoint (inferior_ptid, addr, 0, 0, 0);
Index: gdb-7.5.50.20130118/gdb/remote-m32r-sdi.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/remote-m32r-sdi.c 2013-01-01 07:32:50.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/remote-m32r-sdi.c 2013-02-15 22:42:45.993804317 +0100
@@ -1417,14 +1417,15 @@ m32r_can_use_hw_watchpoint (int type, in
watchpoint. */
@ -422,10 +422,10 @@ Index: gdb-7.5.50.20130118/gdb/remote-m32r-sdi.c
for (i = 0; i < MAX_ACCESS_BREAKS; i++)
{
Index: gdb-7.5.50.20130118/gdb/remote-mips.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/remote-mips.c 2013-01-01 07:32:50.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/remote-mips.c 2013-02-15 22:42:45.994804319 +0100
@@ -2419,7 +2419,7 @@ calculate_mask (CORE_ADDR addr, int len)
watchpoint. */
@ -444,11 +444,11 @@ Index: gdb-7.5.50.20130118/gdb/remote-mips.c
struct expression *cond)
{
if (mips_clear_breakpoint (addr, len, type))
Index: gdb-7.5.50.20130118/gdb/remote.c
Index: gdb-7.5.50.20130215/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)
--- gdb-7.5.50.20130215.orig/gdb/remote.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/remote.c 2013-02-15 22:42:45.996804323 +0100
@@ -8155,7 +8155,7 @@ watchpoint_to_Z_packet (int type)
}
static int
@ -457,7 +457,7 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
struct expression *cond)
{
struct remote_state *rs = get_remote_state ();
@@ -8108,7 +8108,7 @@ remote_insert_watchpoint (CORE_ADDR addr
@@ -8170,7 +8170,7 @@ remote_insert_watchpoint (CORE_ADDR addr
p = strchr (rs->buf, '\0');
addr = remote_address_masked (addr);
p += hexnumstr (p, (ULONGEST) addr);
@ -466,7 +466,7 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
putpkt (rs->buf);
getpkt (&rs->buf, &rs->buf_size, 0);
@@ -8128,7 +8128,7 @@ remote_insert_watchpoint (CORE_ADDR addr
@@ -8190,7 +8190,7 @@ remote_insert_watchpoint (CORE_ADDR addr
static int
remote_watchpoint_addr_within_range (struct target_ops *target, CORE_ADDR addr,
@ -475,7 +475,7 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
{
CORE_ADDR diff = remote_address_masked (addr - start);
@@ -8137,7 +8137,7 @@ remote_watchpoint_addr_within_range (str
@@ -8199,7 +8199,7 @@ remote_watchpoint_addr_within_range (str
static int
@ -484,7 +484,7 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
struct expression *cond)
{
struct remote_state *rs = get_remote_state ();
@@ -8152,7 +8152,7 @@ remote_remove_watchpoint (CORE_ADDR addr
@@ -8214,7 +8214,7 @@ remote_remove_watchpoint (CORE_ADDR addr
p = strchr (rs->buf, '\0');
addr = remote_address_masked (addr);
p += hexnumstr (p, (ULONGEST) addr);
@ -493,10 +493,10 @@ Index: gdb-7.5.50.20130118/gdb/remote.c
putpkt (rs->buf);
getpkt (&rs->buf, &rs->buf_size, 0);
Index: gdb-7.5.50.20130118/gdb/s390-nat.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/s390-nat.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/s390-nat.c 2013-02-15 22:42:45.997804325 +0100
@@ -516,7 +516,7 @@ s390_fix_watch_points (struct lwp_info *
}
@ -515,10 +515,10 @@ Index: gdb-7.5.50.20130118/gdb/s390-nat.c
struct expression *cond)
{
struct lwp_info *lp;
Index: gdb-7.5.50.20130118/gdb/target.c
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/target.c 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/target.c 2013-02-15 22:42:45.997804325 +0100
@@ -49,7 +49,8 @@ static void target_info (char *, int);
static void default_terminal_info (char *, int);
@ -579,7 +579,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
return_zero);
de_fault (to_terminal_init,
(void (*) (void))
@@ -3560,7 +3562,7 @@ default_region_ok_for_hw_watchpoint (COR
@@ -3558,7 +3560,7 @@ default_region_ok_for_hw_watchpoint (COR
static int
default_watchpoint_addr_within_range (struct target_ops *target,
CORE_ADDR addr,
@ -588,7 +588,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
{
return addr >= start && addr < start + length;
}
@@ -4267,7 +4269,7 @@ debug_to_region_ok_for_hw_watchpoint (CO
@@ -4265,7 +4267,7 @@ debug_to_region_ok_for_hw_watchpoint (CO
}
static int
@ -597,7 +597,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
struct expression *cond)
{
int retval;
@@ -4277,8 +4279,8 @@ debug_to_can_accel_watchpoint_condition
@@ -4275,8 +4277,8 @@ debug_to_can_accel_watchpoint_condition
fprintf_unfiltered (gdb_stdlog,
"target_can_accel_watchpoint_condition "
@ -608,7 +608,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
host_address_to_string (cond), (unsigned long) retval);
return retval;
}
@@ -4313,7 +4315,7 @@ debug_to_stopped_data_address (struct ta
@@ -4311,7 +4313,7 @@ debug_to_stopped_data_address (struct ta
static int
debug_to_watchpoint_addr_within_range (struct target_ops *target,
CORE_ADDR addr,
@ -617,7 +617,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
{
int retval;
@@ -4321,9 +4323,9 @@ debug_to_watchpoint_addr_within_range (s
@@ -4319,9 +4321,9 @@ debug_to_watchpoint_addr_within_range (s
start, length);
fprintf_filtered (gdb_stdlog,
@ -629,7 +629,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
return retval;
}
@@ -4358,7 +4360,7 @@ debug_to_remove_hw_breakpoint (struct gd
@@ -4356,7 +4358,7 @@ debug_to_remove_hw_breakpoint (struct gd
}
static int
@ -638,7 +638,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
struct expression *cond)
{
int retval;
@@ -4366,14 +4368,14 @@ debug_to_insert_watchpoint (CORE_ADDR ad
@@ -4364,14 +4366,14 @@ debug_to_insert_watchpoint (CORE_ADDR ad
retval = debug_target.to_insert_watchpoint (addr, len, type, cond);
fprintf_unfiltered (gdb_stdlog,
@ -656,7 +656,7 @@ Index: gdb-7.5.50.20130118/gdb/target.c
struct expression *cond)
{
int retval;
@@ -4381,8 +4383,8 @@ debug_to_remove_watchpoint (CORE_ADDR ad
@@ -4379,8 +4381,8 @@ debug_to_remove_watchpoint (CORE_ADDR ad
retval = debug_target.to_remove_watchpoint (addr, len, type, cond);
fprintf_unfiltered (gdb_stdlog,
@ -667,10 +667,10 @@ Index: gdb-7.5.50.20130118/gdb/target.c
host_address_to_string (cond), (unsigned long) retval);
return retval;
}
Index: gdb-7.5.50.20130118/gdb/target.h
Index: gdb-7.5.50.20130215/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
--- gdb-7.5.50.20130215.orig/gdb/target.h 2013-02-15 22:40:18.000000000 +0100
+++ gdb-7.5.50.20130215/gdb/target.h 2013-02-15 22:42:45.998804328 +0100
@@ -466,8 +466,8 @@ struct target_ops
/* Documentation of what the two routines below are expected to do is