summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/avr-tdep.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 077528a1ed1..d62be6a0cf0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-17 Tristan Gingold <gingold@adacore.com>
+ Petr HluzĂ­n <petr.hluzin@gmail.com>
+
+ * avr-tdep.c (avr_scan_prologue): Convert an if statement to a
+ gdb_assert. Fix info->size for SIG prologue.
+
2010-02-16 Daniel Jacobowitz <dan@codesourcery.com>
* infcmd.c (show_inferior_tty_command): Check for NULL.
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 3b165859914..ef7d2a71068 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -686,7 +686,7 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end,
info->saved_regs[AVR_SREG_REGNUM].addr = 3;
info->saved_regs[0].addr = 2;
info->saved_regs[1].addr = 1;
- info->size += 3;
+ info->size += 2;
}
}
@@ -708,9 +708,7 @@ avr_scan_prologue (struct gdbarch *gdbarch, CORE_ADDR pc_beg, CORE_ADDR pc_end,
break;
}
- if (vpc >= AVR_MAX_PROLOGUE_SIZE)
- fprintf_unfiltered (gdb_stderr,
- _("Hit end of prologue while scanning pushes\n"));
+ gdb_assert (vpc < AVR_MAX_PROLOGUE_SIZE);
/* Handle static small stack allocation using rcall or push. */