* arm-tdep.c (arm_unwind_pc): Use arm_addr_bits_remove.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e6a4cc482cbb048623c632dd26a6e63f1801af03..3b807cbb75b1d7a87f7264f320334e3effad28b8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-12  Ben Harris  <bjh21@NetBSD.org>
+
+       * arm-tdep.c (arm_unwind_pc): Use arm_addr_bits_remove.
+
 2006-11-10  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * frame.c (frame_register_unwind_location): New function.

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 2d231add2a482e8d2929f07ed1c5f6ed881272b7..eaa089fb3763a9c6c45debebf2f97e79114badcc 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1046,7 +1046,7 @@ arm_unwind_pc (struct gdbarch *gdbarch, struct frame_info *this_frame)
 {
   CORE_ADDR pc;
   pc = frame_unwind_register_unsigned (this_frame, ARM_PC_REGNUM);
-  return IS_THUMB_ADDR (pc) ? UNMAKE_THUMB_ADDR (pc) : pc;
+  return arm_addr_bits_remove (pc);
 }
 
 static CORE_ADDR