2009-08-06 Michael Snyder <msnyder@vmware.com>

	* record.c (record_restore_checkpoint): Count instructions, not
	record entries.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index be96609feb5a94920c1f9d52db44fda16b47f122..0d8597eb03f91ccc6550d09cd338fc314ddca282 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-06  Michael Snyder  <msnyder@vmware.com>
+
+       * record.c (record_restore_checkpoint): Count instructions, not
+       record entries.
+
 2009-07-26  Michael Snyder  <msnyder@vmware.com>
 
        Nearly working.

diff --git a/gdb/record.c b/gdb/record.c
index d383f4198faa0bb6075818a5c005088cb4c62648..5b6add51bbae59097d7ae91005abc3a798a60d30 100644 (file)
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -1359,13 +1359,18 @@ record_restore_checkpoint (struct checkpoint_info *cp, int from_tty)
        checkpoint_index = i;
       if (p == record_list)
        current_index = i;
-      i++;
+      if (p->type == record_end)
+       i++;
     }
   if (from_tty && info_verbose)
     {
       printf_filtered ("Checkpoint is at index %d\n", checkpoint_index);
       printf_filtered ("Cur point is at index %d\n", current_index);
       printf_filtered ("Counted %d (officially %d)\n", i-1, record_insn_num);
+      if (rp->position->type == record_end)
+       printf_filtered ("Checkpoint is record_end\n");
+      if (record_list->type == record_end)
+       printf_filtered ("record_list is record_end\n");
     }
 
   if (checkpoint_index == 0)