diff options
| author | Daniel Jacobowitz <drow@false.org> | 2010-02-26 20:46:00 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2010-02-26 20:46:00 +0000 |
| commit | 4069ebbe47cb50bd157f7a174dda1c98c1e04a24 (patch) | |
| tree | 2bafc6e6ce74bfd1d6dade8c51719cf36cc11bda /gdb | |
| parent | 743d7f19b362ea617cb63269793ae51a59dbbbe1 (diff) | |
| download | gdb-4069ebbe47cb50bd157f7a174dda1c98c1e04a24.zip gdb-4069ebbe47cb50bd157f7a174dda1c98c1e04a24.tar.gz gdb-4069ebbe47cb50bd157f7a174dda1c98c1e04a24.tar.bz2 | |
* arm-tdep.c (thumb_get_next_pc): Correct conditional branch opcode.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/arm-tdep.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 554b743..1e16950 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2010-02-26 Daniel Jacobowitz <dan@codesourcery.com> + + * arm-tdep.c (thumb_get_next_pc): Correct conditional branch opcode. + 2010-02-26 Pedro Alves <pedro@codesourcery.com> * NEWS: Add "New targets" section, and mention ARM Symbian diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 524e4ac..b932c81 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -2503,7 +2503,7 @@ thumb_get_next_pc (struct frame_info *frame, CORE_ADDR pc) nextpc = get_frame_register_unsigned (frame, ARM_LR_REGNUM); nextpc -= inst2 & 0x00ff; } - else if ((inst2 & 0xd000) == 0xc000 && (inst1 & 0x0380) != 0x0380) + else if ((inst2 & 0xd000) == 0x8000 && (inst1 & 0x0380) != 0x0380) { /* Conditional branch. */ if (condition_true (bits (inst1, 6, 9), status)) |