Fix PR/16720

2014-03-24  Pierre Langlois  <pierre.langlois@embecosm.com>

  * avr-tdep.c (avr_scan_prologue): Accept push r1 instruction for
  small stack allocation.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bf39bc0b25a8a261538fb59cedf873e095c5c355..c1231cab6ece0160a3efecfd85b57d1eb136e109 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-24  Pierre Langlois  <pierre.langlois@embecosm.com>
+
+       * avr-tdep.c (avr_scan_prologue): Accept push r1 instruction for
+       small stack allocation.
+
 2014-03-24  Tristan Gingold  <gingold@adacore.com>
 
        * darwin-nat.c (exc_server): Remove unused prototype.

diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 6e58f045d67ddefc279fc2b2bee43d8692e0f473..7fb16d1ff813e9842ff705fcdc797eca036efb91 100644 (file)
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -720,7 +720,7 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end,
           info->size += gdbarch_tdep (gdbarch)->call_length;
           vpc += 2;
         }
-      else if (insn == 0x920f)  /* push r0 */
+      else if (insn == 0x920f || insn == 0x921f)  /* push r0 or push r1 */
         {
           info->size += 1;
           vpc += 2;