diff options
| author | Jason Thorpe <thorpej@netbsd.org> | 2002-09-04 17:52:38 +0000 |
|---|---|---|
| committer | Jason Thorpe <thorpej@netbsd.org> | 2002-09-04 17:52:38 +0000 |
| commit | 8cb409109e46edf0b5957eb76deaef14ef2e1b06 (patch) | |
| tree | 64401503f9c2487468d9d0ecc0def45d607e84cb | |
| parent | c4dc0f270c37cc43d32bed24cd61ce197f24a79e (diff) | |
| download | gdb-8cb409109e46edf0b5957eb76deaef14ef2e1b06.tar.gz | |
* arm-tdep.c (arm_addr_bits_remove): Don't check for Thumb mode
if arm_apcs_32 is false.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | 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 <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 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, |