* arm-tdep.c (arm_addr_bits_remove): In non 26-bit mode, don't

	strip bit 1 even if pc doesn't point to thumb code.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9ab0df4..e2c24d4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-24  Pedro Alves  <pedro@codesourcery.com>
+
+       * arm-tdep.c (arm_addr_bits_remove): In non 26-bit mode, don't
+       strip bit 1 even if pc doesn't point to thumb code.
+
 2008-01-23  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * remote.c (remote_wait): Handle SIGINT between packets.

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 0a18e0f..b8b7c84 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -240,7 +240,7 @@ static CORE_ADDR
 arm_addr_bits_remove (CORE_ADDR val)
 {
   if (arm_apcs_32)
-    return (val & (arm_pc_is_thumb (val) ? 0xfffffffe : 0xfffffffc));
+    return UNMAKE_THUMB_ADDR (val);
   else
     return (val & 0x03fffffc);
 }