*** empty log message ***
[binutils-gdb.git] / gdb / record.c
index 00c7deaa823c29aa9aeafbb33db6b1b0cbea1e2d..546557d74f58465453b98445983b722ca639ee74 100644 (file)
@@ -1,6 +1,6 @@
 /* Process record and replay target for GDB, the GNU debugger.
 
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -544,6 +544,7 @@ record_check_insn_num (int set_terminal)
          if (record_stop_at_limit)
            {
              int q;
+
              if (set_terminal)
                target_terminal_ours ();
              q = yquery (_("Do you want to auto delete previous execution "
@@ -572,17 +573,11 @@ record_arch_list_cleanups (void *ignore)
    record the running message of inferior and set them to
    record_arch_list, and add it to record_list.  */
 
-struct record_message_args {
-  struct regcache *regcache;
-  enum target_signal signal;
-};
-
 static int
-record_message (void *args)
+record_message (struct regcache *regcache, enum target_signal signal)
 {
   int ret;
-  struct record_message_args *myargs = args;
-  struct gdbarch *gdbarch = get_regcache_arch (myargs->regcache);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
   struct cleanup *old_cleanups = make_cleanup (record_arch_list_cleanups, 0);
 
   record_arch_list_head = NULL;
@@ -616,18 +611,18 @@ record_message (void *args)
   if (record_list != &record_first)    /* FIXME better way to check */
     {
       gdb_assert (record_list->type == record_end);
-      record_list->u.end.sigval = myargs->signal;
+      record_list->u.end.sigval = signal;
     }
 
-  if (myargs->signal == TARGET_SIGNAL_0
+  if (signal == TARGET_SIGNAL_0
       || !gdbarch_process_record_signal_p (gdbarch))
     ret = gdbarch_process_record (gdbarch,
-                                 myargs->regcache,
-                                 regcache_read_pc (myargs->regcache));
+                                 regcache,
+                                 regcache_read_pc (regcache));
   else
     ret = gdbarch_process_record_signal (gdbarch,
-                                        myargs->regcache,
-                                        myargs->signal);
+                                        regcache,
+                                        signal);
 
   if (ret > 0)
     error (_("Process record: inferior program stopped."));
@@ -648,15 +643,29 @@ record_message (void *args)
   return 1;
 }
 
+struct record_message_args {
+  struct regcache *regcache;
+  enum target_signal signal;
+};
+
 static int
-do_record_message (struct regcache *regcache,
-                  enum target_signal signal)
+record_message_wrapper (void *args)
+{
+  struct record_message_args *record_args = args;
+
+  return record_message (record_args->regcache, record_args->signal);
+}
+
+static int
+record_message_wrapper_safe (struct regcache *regcache,
+                             enum target_signal signal)
 {
   struct record_message_args args;
 
   args.regcache = regcache;
   args.signal = signal;
-  return catch_errors (record_message, &args, NULL, RETURN_MASK_ALL);
+
+  return catch_errors (record_message_wrapper, &args, NULL, RETURN_MASK_ALL);
 }
 
 /* Set to 1 if record_store_registers and record_xfer_partial
@@ -830,8 +839,6 @@ record_core_open_1 (char *name, int from_tty)
 static void
 record_open_1 (char *name, int from_tty)
 {
-  struct target_ops *t;
-
   if (record_debug)
     fprintf_unfiltered (gdb_stdlog, "Process record: record_open\n");
 
@@ -859,6 +866,10 @@ record_open_1 (char *name, int from_tty)
     error (_("Could not find 'to_insert_breakpoint' method on the target stack."));
   if (!tmp_to_remove_breakpoint)
     error (_("Could not find 'to_remove_breakpoint' method on the target stack."));
+  if (!tmp_to_stopped_by_watchpoint)
+    error (_("Could not find 'to_stopped_by_watchpoint' method on the target stack."));
+  if (!tmp_to_stopped_data_address)
+    error (_("Could not find 'to_stopped_data_address' method on the target stack."));
 
   push_target (&record_ops);
 }
@@ -889,6 +900,8 @@ record_open (char *name, int from_tty)
   tmp_to_xfer_partial = NULL;
   tmp_to_insert_breakpoint = NULL;
   tmp_to_remove_breakpoint = NULL;
+  tmp_to_stopped_by_watchpoint = NULL;
+  tmp_to_stopped_data_address = NULL;
 
   /* Set the beneath function pointers.  */
   for (t = current_target.beneath; t != NULL; t = t->beneath)
@@ -983,7 +996,6 @@ record_close (int quitting)
 }
 
 static int record_resume_step = 0;
-static int record_resume_error;
 
 /* "to_resume" target method.  Resume the process record target.  */
 
@@ -995,15 +1007,7 @@ record_resume (struct target_ops *ops, ptid_t ptid, int step,
 
   if (!RECORD_IS_REPLAY)
     {
-      if (do_record_message (get_current_regcache (), signal))
-        {
-          record_resume_error = 0;
-        }
-      else
-        {
-          record_resume_error = 1;
-          return;
-        }
+      record_message (get_current_regcache (), signal);
       record_beneath_to_resume (record_beneath_to_resume_ops, ptid, 1,
                                 signal);
     }
@@ -1067,14 +1071,6 @@ record_wait (struct target_ops *ops,
 
   if (!RECORD_IS_REPLAY && ops != &record_core_ops)
     {
-      if (record_resume_error)
-       {
-         /* If record_resume get error, return directly.  */
-         status->kind = TARGET_WAITKIND_STOPPED;
-         status->value.sig = TARGET_SIGNAL_ABRT;
-         return inferior_ptid;
-       }
-
       if (record_resume_step)
        {
          /* This is a single step.  */
@@ -1130,8 +1126,13 @@ record_wait (struct target_ops *ops,
                    {
                      /* This must be a single-step trap.  Record the
                         insn and issue another step.  */
-                     if (!do_record_message (regcache, TARGET_SIGNAL_0))
-                       break;
+                     if (!record_message_wrapper_safe (regcache,
+                                                        TARGET_SIGNAL_0))
+                       {
+                           status->kind = TARGET_WAITKIND_STOPPED;
+                           status->value.sig = TARGET_SIGNAL_0;
+                           break;
+                       }
 
                      record_beneath_to_resume (record_beneath_to_resume_ops,
                                                ptid, 1,
@@ -1396,6 +1397,7 @@ record_registers_change (struct regcache *regcache, int regnum)
   if (regnum < 0)
     {
       int i;
+
       for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
        {
          if (record_arch_list_add_reg (regcache, i))
@@ -1462,6 +1464,7 @@ record_store_registers (struct target_ops *ops, struct regcache *regcache,
              if (regno < 0)
                {
                  int i;
+
                  for (i = 0;
                       i < gdbarch_num_regs (get_regcache_arch (regcache));
                       i++)
@@ -1668,6 +1671,7 @@ init_record_ops (void)
   record_ops.to_insert_breakpoint = record_insert_breakpoint;
   record_ops.to_remove_breakpoint = record_remove_breakpoint;
   record_ops.to_stopped_by_watchpoint = record_stopped_by_watchpoint;
+  record_ops.to_stopped_data_address = record_stopped_data_address;
   record_ops.to_can_execute_reverse = record_can_execute_reverse;
   record_ops.to_stratum = record_stratum;
   /* Add bookmark target methods.  */
@@ -1746,85 +1750,84 @@ record_core_xfer_partial (struct target_ops *ops, enum target_object object,
                          const gdb_byte *writebuf, ULONGEST offset,
                           LONGEST len)
 {
-   if (object == TARGET_OBJECT_MEMORY)
-     {
-       if (record_gdb_operation_disable || !writebuf)
-         {
-           struct target_section *p;
-           for (p = record_core_start; p < record_core_end; p++)
-             {
-               if (offset >= p->addr)
-                 {
-                   struct record_core_buf_entry *entry;
-                  ULONGEST sec_offset;
-
-                   if (offset >= p->endaddr)
-                     continue;
-
-                   if (offset + len > p->endaddr)
-                     len = p->endaddr - offset;
-
-                   sec_offset = offset - p->addr;
-
-                   /* Read readbuf or write writebuf p, offset, len.  */
-                   /* Check flags.  */
-                   if (p->the_bfd_section->flags & SEC_CONSTRUCTOR
-                       || (p->the_bfd_section->flags & SEC_HAS_CONTENTS) == 0)
-                     {
-                       if (readbuf)
-                         memset (readbuf, 0, len);
-                       return len;
-                     }
-                   /* Get record_core_buf_entry.  */
-                   for (entry = record_core_buf_list; entry;
-                        entry = entry->prev)
-                     if (entry->p == p)
-                       break;
-                   if (writebuf)
-                     {
-                       if (!entry)
-                         {
-                           /* Add a new entry.  */
-                           entry
-                             = (struct record_core_buf_entry *)
-                                 xmalloc
-                                   (sizeof (struct record_core_buf_entry));
-                           entry->p = p;
-                           if (!bfd_malloc_and_get_section (p->bfd,
-                                                            p->the_bfd_section,
-                                                            &entry->buf))
-                             {
-                               xfree (entry);
-                               return 0;
-                             }
-                           entry->prev = record_core_buf_list;
-                           record_core_buf_list = entry;
-                         }
-
-                        memcpy (entry->buf + sec_offset, writebuf,
-                               (size_t) len);
-                     }
-                   else
-                     {
-                       if (!entry)
-                         return record_beneath_to_xfer_partial
-                                  (record_beneath_to_xfer_partial_ops,
-                                   object, annex, readbuf, writebuf,
-                                   offset, len);
-
-                       memcpy (readbuf, entry->buf + sec_offset,
-                              (size_t) len);
-                     }
-
-                   return len;
-                 }
-             }
-
-           return -1;
-         }
-       else
-         error (_("You can't do that without a process to debug."));
-     }
+  if (object == TARGET_OBJECT_MEMORY)
+    {
+      if (record_gdb_operation_disable || !writebuf)
+       {
+         struct target_section *p;
+
+         for (p = record_core_start; p < record_core_end; p++)
+           {
+             if (offset >= p->addr)
+               {
+                 struct record_core_buf_entry *entry;
+                 ULONGEST sec_offset;
+
+                 if (offset >= p->endaddr)
+                   continue;
+
+                 if (offset + len > p->endaddr)
+                   len = p->endaddr - offset;
+
+                 sec_offset = offset - p->addr;
+
+                 /* Read readbuf or write writebuf p, offset, len.  */
+                 /* Check flags.  */
+                 if (p->the_bfd_section->flags & SEC_CONSTRUCTOR
+                     || (p->the_bfd_section->flags & SEC_HAS_CONTENTS) == 0)
+                   {
+                     if (readbuf)
+                       memset (readbuf, 0, len);
+                     return len;
+                   }
+                 /* Get record_core_buf_entry.  */
+                 for (entry = record_core_buf_list; entry;
+                      entry = entry->prev)
+                   if (entry->p == p)
+                     break;
+                 if (writebuf)
+                   {
+                     if (!entry)
+                       {
+                         /* Add a new entry.  */
+                         entry = (struct record_core_buf_entry *)
+                           xmalloc (sizeof (struct record_core_buf_entry));
+                         entry->p = p;
+                         if (!bfd_malloc_and_get_section (p->bfd,
+                                                          p->the_bfd_section,
+                                                          &entry->buf))
+                           {
+                             xfree (entry);
+                             return 0;
+                           }
+                         entry->prev = record_core_buf_list;
+                         record_core_buf_list = entry;
+                       }
+
+                     memcpy (entry->buf + sec_offset, writebuf,
+                             (size_t) len);
+                   }
+                 else
+                   {
+                     if (!entry)
+                       return record_beneath_to_xfer_partial
+                         (record_beneath_to_xfer_partial_ops,
+                          object, annex, readbuf, writebuf,
+                          offset, len);
+
+                     memcpy (readbuf, entry->buf + sec_offset,
+                             (size_t) len);
+                   }
+
+                 return len;
+               }
+           }
+
+         return -1;
+       }
+      else
+       error (_("You can't do that without a process to debug."));
+    }
 
   return record_beneath_to_xfer_partial (record_beneath_to_xfer_partial_ops,
                                          object, annex, readbuf, writebuf,
@@ -1860,7 +1863,7 @@ record_core_has_execution (struct target_ops *ops)
 static void
 init_record_core_ops (void)
 {
-  record_core_ops.to_shortname = "record_core";
+  record_core_ops.to_shortname = "record-core";
   record_core_ops.to_longname = "Process record and replay target";
   record_core_ops.to_doc =
     "Log program while executing and replay execution from log.";
@@ -1876,6 +1879,7 @@ init_record_core_ops (void)
   record_core_ops.to_insert_breakpoint = record_core_insert_breakpoint;
   record_core_ops.to_remove_breakpoint = record_core_remove_breakpoint;
   record_core_ops.to_stopped_by_watchpoint = record_stopped_by_watchpoint;
+  record_core_ops.to_stopped_data_address = record_stopped_data_address;
   record_core_ops.to_can_execute_reverse = record_can_execute_reverse;
   record_core_ops.to_has_execution = record_core_has_execution;
   record_core_ops.to_stratum = record_stratum;
@@ -2170,17 +2174,16 @@ record_restore (void)
 
   while (1)
     {
-      int ret;
-      uint8_t tmpu8;
+      uint8_t rectype;
       uint32_t regnum, len, signal, count;
       uint64_t addr;
 
       /* We are finished when offset reaches osec_size.  */
       if (bfd_offset >= osec_size)
        break;
-      bfdcore_read (core_bfd, osec, &tmpu8, sizeof (tmpu8), &bfd_offset);
+      bfdcore_read (core_bfd, osec, &rectype, sizeof (rectype), &bfd_offset);
 
-      switch (tmpu8)
+      switch (rectype)
         {
         case record_reg: /* reg */
           /* Get register number to regnum.  */
@@ -2317,6 +2320,7 @@ record_save_cleanups (void *data)
 {
   bfd *obfd = data;
   char *pathname = xstrdup (bfd_get_filename (obfd));
+
   bfd_close (obfd);
   unlink (pathname);
   xfree (pathname);
@@ -2329,7 +2333,6 @@ static void
 cmd_record_save (char *args, int from_tty)
 {
   char *recfilename, recfilename_buffer[40];
-  int recfd;
   struct record_entry *cur_record_list;
   uint32_t magic;
   struct regcache *regcache;