--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-19  Hui Zhu  <teawater@gmail.com>
+
+	* infrun.c (handle_inferior_event): Set "stop_pc" when
+	TARGET_WAITKIND_NO_HISTORY.
+
 2008-10-18  Pedro Alves  <pedro@codesourcery.com>
 
 	* infrun.c (adjust_pc_after_break): Do nothing if executing in
--- a/infrun.c
+++ b/infrun.c
@@ -2237,6 +2237,7 @@ handle_inferior_event (struct execution_
 
     case TARGET_WAITKIND_NO_HISTORY:
       /* Reverse execution: target ran out of history info.  */
+      stop_pc = read_pc ();
       print_stop_reason (NO_HISTORY, 0);
       stop_stepping (ecs);
       return;