Rebase patch #7

[deliverable/binutils-gdb.git] / gdb / record.c

diff --git a/gdb/record.c b/gdb/record.c
index acdbc1a0a5053b04900443c2c157a3179c3842ff..71ef97337bb2c75f8bebb32f74057ebfc0bee8bf 100644 (file)
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -1,6 +1,6 @@
 /* Process record and replay target for GDB, the GNU debugger.
 
-   Copyright (C) 2008-2014 Free Software Foundation, Inc.
+   Copyright (C) 2008-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -189,6 +189,25 @@ record_kill (struct target_ops *t)
   target_kill ();
 }
 
+/* See record.h.  */
+
+int
+record_check_stopped_by_breakpoint (struct address_space *aspace, CORE_ADDR pc,
+                                   enum target_stop_reason *reason)
+{
+  if (breakpoint_inserted_here_p (aspace, pc))
+    {
+      if (hardware_breakpoint_inserted_here_p (aspace, pc))
+       *reason = TARGET_STOPPED_BY_HW_BREAKPOINT;
+      else
+       *reason = TARGET_STOPPED_BY_SW_BREAKPOINT;
+      return 1;
+    }
+
+  *reason = TARGET_STOPPED_BY_NO_REASON;
+  return 0;
+}
+
 /* Implement "show record debug" command.  */
 
 static void
@@ -215,7 +234,7 @@ cmd_record_delete (char *args, int from_tty)
 {
   require_record_target ();
 
-  if (!target_record_is_replaying ())
+  if (!target_record_is_replaying (inferior_ptid))
     {
       printf_unfiltered (_("Already at end of record list.\n"));
       return;
@@ -285,8 +304,7 @@ info_record_command (char *args, int from_tty)
     }
 
   printf_filtered (_("Active record target: %s\n"), t->to_shortname);
-  if (t->to_info_record != NULL)
-    t->to_info_record (t);
+  t->to_info_record (t);
 }
 
 /* The "record save" command.  */
@@ -440,7 +458,7 @@ get_insn_history_modifiers (char **arg)
          switch (*args)
            {
            case 'm':
-             modifiers |= DISASSEMBLY_SOURCE;
+             modifiers |= DISASSEMBLY_SOURCE_DEPRECATED;
              modifiers |= DISASSEMBLY_FILENAME;
              break;
            case 'r':