From a3a2ee652b68ac797a532ce7c928300b18e4d28b Mon Sep 17 00:00:00 2001 From: Jason Thorpe Date: Wed, 4 Sep 2002 17:52:38 +0000 Subject: [PATCH] * arm-tdep.c (arm_addr_bits_remove): Don't check for Thumb mode if arm_apcs_32 is false. --- gdb/ChangeLog | 5 +++++ gdb/arm-tdep.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f37986001f9..7107f2cabbe 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-09-04 Jason Thorpe + + * 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 * gdb/avr-tdep.c (avr_gdbarch_init): Use diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index b896b688650..fb1ac0169ed 100644 --- 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, -- 2.30.2