From: Ulrich Weigand <uweigand@de.ibm.com>
Date: Wed, 1 Aug 2012 12:57:07 +0000 (+0000)
Subject: ChangeLog:
X-Git-Tag: gdb_7_5-2012-08-17-release~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa40b5e5d76de147d7c7b5949b49cf32b89961b3;p=thirdparty%2Fbinutils-gdb.git

ChangeLog:

	* arm-linux-nat.c (arm_linux_hw_breakpoint_initialize): Do not
	attempt to 4-byte-align HW breakpoint addresses for Thumb.

gdbserver/ChangeLog:

	* linux-arm-low.c (arm_linux_hw_point_initialize): Do not attempt
	to 4-byte-align HW breakpoint addresses for Thumb.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a80cc8da3c9..901b908b5b6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* arm-linux-nat.c (arm_linux_hw_breakpoint_initialize): Do not
+	attempt to 4-byte-align HW breakpoint addresses for Thumb.
+
 2012-07-31  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* ppc-linux-tdep.c (ppc_linux_init_abi): Register
diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index 2485a84e3a7..bf81c032a9b 100644
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -896,11 +896,17 @@ arm_linux_hw_breakpoint_initialize (struct gdbarch *gdbarch,
   /* We have to create a mask for the control register which says which bits
      of the word pointed to by address to break on.  */
   if (arm_pc_is_thumb (gdbarch, address))
-    mask = 0x3 << (address & 2);
+    {
+      mask = 0x3;
+      address &= ~1;
+    }
   else
-    mask = 0xf;
+    {
+      mask = 0xf;
+      address &= ~3;
+    }
 
-  p->address = (unsigned int) (address & ~3);
+  p->address = (unsigned int) address;
   p->control = arm_hwbp_control_initialize (mask, arm_hwbp_break, 1);
 }
 
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 1d9557c20f9..e8ca002498c 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-01  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* linux-arm-low.c (arm_linux_hw_point_initialize): Do not attempt
+	to 4-byte-align HW breakpoint addresses for Thumb.
+
 2012-07-27  Yao Qi  <yao@codesourcery.com>
 
 	* server.c (process_point_options): Stop at 'X' when parsing.
diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
index c4d2000c3b1..10370834fcf 100644
--- a/gdb/gdbserver/linux-arm-low.c
+++ b/gdb/gdbserver/linux-arm-low.c
@@ -474,17 +474,17 @@ arm_linux_hw_point_initialize (char type, CORE_ADDR addr, int len,
 	{
 	case 2:	 /* 16-bit Thumb mode breakpoint */
 	case 3:  /* 32-bit Thumb mode breakpoint */
-	  mask = 0x3 << (addr & 2);
+	  mask = 0x3;
+	  addr &= ~1;
 	  break;
 	case 4:  /* 32-bit ARM mode breakpoint */
 	  mask = 0xf;
+	  addr &= ~3;
 	  break;
 	default:
 	  /* Unsupported. */
 	  return -1;
 	}
-
-      addr &= ~3;
     }
   else
     {