* arm-tdep.c (arm_addr_bits_remove): Don't check for Thumb mode

if arm_apcs_32 is false.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f37986001f943592c519fe4723b1d4da72f8d2de..7107f2cabbe33b0e43dd6e5861699f63a293011c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-04  Jason Thorpe  <thorpej@wasabisystems.com>
+
+       * arm-tdep.c (arm_addr_bits_remove): Don't check for Thumb mode
+       if arm_apcs_32 is false.
+
 2002-09-03  Theodore A. Roth  <troth@verinet.com>
 
        * gdb/avr-tdep.c (avr_gdbarch_init): Use

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index b896b688650e94029b842a135ddca781370d230c..fb1ac0169ede3f6a3e7a2d9e1898d32d8609ba4a 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -225,10 +225,10 @@ arm_pc_is_thumb_dummy (CORE_ADDR memaddr)
 static CORE_ADDR
 arm_addr_bits_remove (CORE_ADDR val)
 {
-  if (arm_pc_is_thumb (val))
-    return (val & (arm_apcs_32 ? 0xfffffffe : 0x03fffffe));
+  if (arm_apcs_32)
+    return (val & (arm_pc_is_thumb (val) ? 0xfffffffe : 0xfffffffc));
   else
-    return (val & (arm_apcs_32 ? 0xfffffffc : 0x03fffffc));
+    return (val & 0x03fffffc);
 }
 
 /* When reading symbols, we need to zap the low bit of the address,