]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
2008-09-30 Hui Zhu <teawater@gmail.com>
authorMichael Snyder <msnyder@vmware.com>
Wed, 1 Oct 2008 03:16:05 +0000 (03:16 +0000)
committerMichael Snyder <msnyder@vmware.com>
Wed, 1 Oct 2008 03:16:05 +0000 (03:16 +0000)
Add process record and replay to GDB.
* record.c, record.h: New files. Record and reverse target.
* gdbarch.sh: New methods process_record and process_record_dasm.
* gdbarch.c, gdbarch.h: Re-generate.
* target.h (enum strata): Add record_stratum.
* target.h (target_ops): Add a element "to_support_record_wait".
Default value is 0. meaning that this target doesn't support record
wait.
* target.c: Add include of "record.h".
(update_current_target): Set the real beneath function.
(add_target): Set the default value of "to_support_record_wait".
pointers.
  * Makefile.in: Add files record.c, record.o.

gdb/ChangeLog
gdb/Makefile.in
gdb/gdbarch.c
gdb/gdbarch.h
gdb/gdbarch.sh
gdb/record.c [new file with mode: 0644]
gdb/record.h [new file with mode: 0644]
gdb/target.c
gdb/target.h

index 6b9dc1f3c383f415da61f763e94f76a27c1cdd63..e464192fb22cb173cf1c9e94303818ad38e6c1de 100644 (file)
@@ -1,3 +1,18 @@
+2008-09-30  Hui Zhu  <teawater@gmail.com>
+       Add process record and replay to GDB.
+       * record.c, record.h: New files. Record and reverse target.
+       * gdbarch.sh: New methods process_record and process_record_dasm.
+       * gdbarch.c, gdbarch.h: Re-generate.
+       * target.h (enum strata): Add record_stratum.
+       * target.h (target_ops): Add a element "to_support_record_wait".
+       Default value is 0. meaning that this target doesn't support record
+       wait.  
+       * target.c: Add include of "record.h".
+       (update_current_target): Set the real beneath function.
+       (add_target): Set the default value of "to_support_record_wait".
+       pointers.
+       * Makefile.in: Add files record.c, record.o.
+
 2008-09-30  Michael Snyder  <msnyder@vmware.com>
        Target interface for reverse debugging.
        * target.h (enum target_waitkind): 
index 258d53a71e34d372952c67ddf9b1eadf6c9aadef..50450a04be0a9ab096fec221ce85552c1772eda3 100644 (file)
@@ -656,7 +656,7 @@ SFILES = ada-exp.y ada-lang.c ada-typeprint.c ada-valprint.c  \
        valarith.c valops.c valprint.c value.c varobj.c vec.c \
        wrapper.c \
        xml-tdesc.c xml-support.c \
-       inferior.c
+       inferior.c record.c
 
 LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
 
@@ -806,7 +806,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
        solib.o solib-null.o \
        prologue-value.o memory-map.o xml-support.o \
        target-descriptions.o target-memory.o xml-tdesc.o xml-builtin.o \
-       inferior.o
+       inferior.o record.o
 
 TSOBS = inflow.o
 
index aa9a455446d3e8375ef4c3e06b6e269631c02656..32481c48ad720e55f368efaa3ec12c3f7cb9857e 100644 (file)
@@ -237,6 +237,8 @@ struct gdbarch
   gdbarch_core_read_description_ftype *core_read_description;
   gdbarch_static_transform_name_ftype *static_transform_name;
   int sofun_address_maybe_missing;
+  gdbarch_process_record_ftype *process_record;
+  gdbarch_process_record_dasm_ftype *process_record_dasm;
   gdbarch_target_signal_from_host_ftype *target_signal_from_host;
   gdbarch_target_signal_to_host_ftype *target_signal_to_host;
   gdbarch_record_special_symbol_ftype *record_special_symbol;
@@ -368,6 +370,8 @@ struct gdbarch startup_gdbarch =
   0,  /* core_read_description */
   0,  /* static_transform_name */
   0,  /* sofun_address_maybe_missing */
+  0,  /* process_record */
+  0,  /* process_record_dasm */
   default_target_signal_from_host,  /* target_signal_from_host */
   default_target_signal_to_host,  /* target_signal_to_host */
   0,  /* record_special_symbol */
@@ -620,6 +624,7 @@ verify_gdbarch (struct gdbarch *gdbarch)
   /* Skip verify of core_read_description, has predicate */
   /* Skip verify of static_transform_name, has predicate */
   /* Skip verify of sofun_address_maybe_missing, invalid_p == 0 */
+  /* Skip verify of process_record, has predicate */
   /* Skip verify of target_signal_from_host, invalid_p == 0 */
   /* Skip verify of target_signal_to_host, invalid_p == 0 */
   /* Skip verify of record_special_symbol, has predicate */
@@ -915,6 +920,15 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
   fprintf_unfiltered (file,
                       "gdbarch_dump: print_vector_info = <0x%lx>\n",
                       (long) gdbarch->print_vector_info);
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: gdbarch_process_record_p() = %d\n",
+                      gdbarch_process_record_p (gdbarch));
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: process_record = <0x%lx>\n",
+                      (long) gdbarch->process_record);
+  fprintf_unfiltered (file,
+                      "gdbarch_dump: process_record_dasm = <0x%lx>\n",
+                      (long) gdbarch->process_record_dasm);
   fprintf_unfiltered (file,
                       "gdbarch_dump: ps_regnum = %s\n",
                       plongest (gdbarch->ps_regnum));
@@ -3179,6 +3193,47 @@ set_gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch,
   gdbarch->sofun_address_maybe_missing = sofun_address_maybe_missing;
 }
 
+int
+gdbarch_process_record_p (struct gdbarch *gdbarch)
+{
+  gdb_assert (gdbarch != NULL);
+  return gdbarch->process_record != NULL;
+}
+
+int
+gdbarch_process_record (struct gdbarch *gdbarch, CORE_ADDR addr)
+{
+  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch->process_record != NULL);
+  if (gdbarch_debug >= 2)
+    fprintf_unfiltered (gdb_stdlog, "gdbarch_process_record called\n");
+  return gdbarch->process_record (addr);
+}
+
+void
+set_gdbarch_process_record (struct gdbarch *gdbarch,
+                            gdbarch_process_record_ftype process_record)
+{
+  gdbarch->process_record = process_record;
+}
+
+void
+gdbarch_process_record_dasm (struct gdbarch *gdbarch)
+{
+  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch->process_record_dasm != NULL);
+  if (gdbarch_debug >= 2)
+    fprintf_unfiltered (gdb_stdlog, "gdbarch_process_record_dasm called\n");
+  gdbarch->process_record_dasm ();
+}
+
+void
+set_gdbarch_process_record_dasm (struct gdbarch *gdbarch,
+                                 gdbarch_process_record_dasm_ftype process_record_dasm)
+{
+  gdbarch->process_record_dasm = process_record_dasm;
+}
+
 enum target_signal
 gdbarch_target_signal_from_host (struct gdbarch *gdbarch, int signo)
 {
index bc8298d8c429fef63765499e71505b0935e43977..1bdf6ea4fec72ae86718a496c7cf4cd20e62be39 100644 (file)
@@ -789,6 +789,18 @@ extern void set_gdbarch_static_transform_name (struct gdbarch *gdbarch, gdbarch_
 extern int gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch);
 extern void set_gdbarch_sofun_address_maybe_missing (struct gdbarch *gdbarch, int sofun_address_maybe_missing);
 
+/* For the process record and replay target */
+
+extern int gdbarch_process_record_p (struct gdbarch *gdbarch);
+
+typedef int (gdbarch_process_record_ftype) (CORE_ADDR addr);
+extern int gdbarch_process_record (struct gdbarch *gdbarch, CORE_ADDR addr);
+extern void set_gdbarch_process_record (struct gdbarch *gdbarch, gdbarch_process_record_ftype *process_record);
+
+typedef void (gdbarch_process_record_dasm_ftype) (void);
+extern void gdbarch_process_record_dasm (struct gdbarch *gdbarch);
+extern void set_gdbarch_process_record_dasm (struct gdbarch *gdbarch, gdbarch_process_record_dasm_ftype *process_record_dasm);
+
 /* Signal translation: translate inferior's signal (host's) number into
    GDB's representation. */
 
index 0c513a53e39633262198afc140b80ce2e722b1b8..418086997382637d629bb2450b82e07c38bced37 100755 (executable)
@@ -698,6 +698,10 @@ F:char *:static_transform_name:char *name:name
 # Set if the address in N_SO or N_FUN stabs may be zero.
 v:int:sofun_address_maybe_missing:::0:0::0
 
+# For the process record and replay target
+F:int:process_record:CORE_ADDR addr:addr
+f:void:process_record_dasm:void
+
 # Signal translation: translate inferior's signal (host's) number into
 # GDB's representation.
 m:enum target_signal:target_signal_from_host:int signo:signo::default_target_signal_from_host::0
diff --git a/gdb/record.c b/gdb/record.c
new file mode 100644 (file)
index 0000000..dc7c55e
--- /dev/null
@@ -0,0 +1,1123 @@
+/* Record and reverse target for GDB, the GNU debugger.
+
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "defs.h"
+#include "target.h"
+#include "gdbcmd.h"
+#include "regcache.h"
+#include "inferior.h"
+#include "gdbthread.h"
+#include "record.h"
+
+#include <signal.h>
+
+#define DEFAULT_RECORD_INSN_MAX_NUM    200000
+
+int record_debug = 0;
+
+record_t record_first;
+record_t *record_list = &record_first;
+record_t *record_arch_list_head = NULL;
+record_t *record_arch_list_tail = NULL;
+struct regcache *record_regcache = NULL;
+
+/* 0 ask user. 1 auto delete the last record_t.  */
+static int record_insn_max_mode = 0;
+static int record_insn_max_num = DEFAULT_RECORD_INSN_MAX_NUM;
+static int record_insn_num = 0;
+
+struct target_ops record_ops;
+int record_resume_step = 0;
+enum exec_direction_kind record_execdir = EXEC_FORWARD;
+int record_linux_async_permitted = 0;
+static int record_get_sig = 0;
+static sigset_t record_maskall;
+static int record_not_record = 0;
+int record_regcache_raw_write_regnum = 0;
+int record_will_store_registers = 0;
+
+extern struct bp_location *bp_location_chain;
+
+/* The real beneath function pointers.  */
+void (*record_beneath_to_resume) (ptid_t, int, enum target_signal);
+ptid_t (*record_beneath_to_wait) (ptid_t, struct target_waitstatus *);
+void (*record_beneath_to_prepare_to_store) (struct regcache *);
+LONGEST (*record_beneath_to_xfer_partial) (struct target_ops * ops,
+                                          enum target_object object,
+                                          const char *annex,
+                                          gdb_byte * readbuf,
+                                          const gdb_byte * writebuf,
+                                          ULONGEST offset, LONGEST len);
+int (*record_beneath_to_insert_breakpoint) (struct bp_target_info *);
+int (*record_beneath_to_remove_breakpoint) (struct bp_target_info *);
+
+static void
+record_list_release (record_t * rec)
+{
+  record_t *tmp;
+
+  if (!rec)
+    return;
+
+  while (rec->next)
+    {
+      rec = rec->next;
+    }
+
+  while (rec->prev)
+    {
+      tmp = rec;
+      rec = rec->prev;
+      if (tmp->type == record_reg)
+       {
+         xfree (tmp->u.reg.val);
+       }
+      else if (tmp->type == record_mem)
+       {
+         xfree (tmp->u.mem.val);
+       }
+      xfree (tmp);
+    }
+
+  if (rec != &record_first)
+    {
+      xfree (rec);
+    }
+}
+
+static void
+record_list_release_next (void)
+{
+  record_t *rec = record_list;
+  record_t *tmp = rec->next;
+  rec->next = NULL;
+  while (tmp)
+    {
+      rec = tmp->next;
+      if (tmp->type == record_reg)
+       {
+         record_insn_num--;
+       }
+      else if (tmp->type == record_reg)
+       {
+         xfree (tmp->u.reg.val);
+       }
+      else if (tmp->type == record_mem)
+       {
+         xfree (tmp->u.mem.val);
+       }
+      xfree (tmp);
+      tmp = rec;
+    }
+}
+
+static void
+record_list_release_first (void)
+{
+  record_t *tmp = NULL;
+  enum record_type type;
+
+  if (!record_first.next)
+    {
+      return;
+    }
+
+  while (1)
+    {
+      type = record_first.next->type;
+
+      if (type == record_reg)
+       {
+         xfree (record_first.next->u.reg.val);
+       }
+      else if (type == record_mem)
+       {
+         xfree (record_first.next->u.mem.val);
+       }
+      tmp = record_first.next;
+      record_first.next = tmp->next;
+      xfree (tmp);
+
+      if (!record_first.next)
+       {
+         gdb_assert (record_insn_num == 1);
+         break;
+       }
+
+      record_first.next->prev = &record_first;
+
+      if (type == record_end)
+       {
+         break;
+       }
+    }
+
+  record_insn_num--;
+}
+
+/* Add a record_t to record_arch_list.  */
+static void
+record_arch_list_add (record_t * rec)
+{
+  if (record_arch_list_tail)
+    {
+      record_arch_list_tail->next = rec;
+      rec->prev = record_arch_list_tail;
+      record_arch_list_tail = rec;
+    }
+  else
+    {
+      record_arch_list_head = rec;
+      record_arch_list_tail = rec;
+    }
+}
+
+/* Record the value of a register ("num") to record_arch_list.  */
+int
+record_arch_list_add_reg (int num)
+{
+  record_t *rec;
+
+  if (record_debug > 1)
+    {
+      fprintf_unfiltered (gdb_stdlog,
+                         "Record: add register num = %d to record list.\n", 
+                         num);
+    }
+
+  rec = (record_t *) xmalloc (sizeof (record_t));
+  rec->u.reg.val = (gdb_byte *) xmalloc (MAX_REGISTER_SIZE);
+  rec->prev = NULL;
+  rec->next = NULL;
+  rec->type = record_reg;
+  rec->u.reg.num = num;
+
+  regcache_raw_read (record_regcache, num, rec->u.reg.val);
+
+  record_arch_list_add (rec);
+
+  return (0);
+}
+
+/* Record the value of a region of memory whose address is "addr" and
+   length is "len" to record_arch_list.  */
+
+int
+record_arch_list_add_mem (CORE_ADDR addr, int len)
+{
+  record_t *rec;
+
+  if (record_debug > 1)
+    {
+      fprintf_unfiltered (gdb_stdlog,
+                         "Record: add mem addr = 0x%s len = %d to record list.\n",
+                         paddr_nz (addr), len);
+    }
+
+  if (!addr)
+    {
+      return (0);
+    }
+
+  rec = (record_t *) xmalloc (sizeof (record_t));
+  rec->u.mem.val = (gdb_byte *) xmalloc (len);
+  rec->prev = NULL;
+  rec->next = NULL;
+  rec->type = record_mem;
+  rec->u.mem.addr = addr;
+  rec->u.mem.len = len;
+
+  if (target_read_memory (addr, rec->u.mem.val, len))
+    {
+      fprintf_unfiltered (gdb_stdlog,
+                         "Record: read memory addr = 0x%s len = %d error.\n",
+                         paddr_nz (addr), len);
+      xfree (rec->u.mem.val);
+      xfree (rec);
+      return (-1);
+    }
+
+  record_arch_list_add (rec);
+
+  return (0);
+}
+
+/* Add a record_end type record_t to record_arch_list.  */
+int
+record_arch_list_add_end (int need_dasm)
+{
+  record_t *rec;
+
+  if (record_debug > 1)
+    {
+      fprintf_unfiltered (gdb_stdlog,
+                         "Record: add end need_dasm = %d to arch list.\n",
+                         need_dasm);
+    }
+
+  rec = (record_t *) xmalloc (sizeof (record_t));
+  rec->prev = NULL;
+  rec->next = NULL;
+  rec->type = record_end;
+
+  rec->u.need_dasm = need_dasm;
+
+  record_arch_list_add (rec);
+
+  return (0);
+}
+
+static void
+record_check_insn_num (int set_terminal)
+{
+  if (record_insn_max_num)
+    {
+      gdb_assert (record_insn_num <= record_insn_max_num);
+      if (record_insn_num == record_insn_max_num)
+       {
+         /* Ask user how to do */
+         if (!record_insn_max_mode)
+           {
+             int q;
+             if (set_terminal)
+               target_terminal_ours ();
+             q = yquery (_("The record instruction number (record-insn-number) is equal to record-insn-number-max.  Do you want to open auto delete first record_t function (record-auto-delete)?"));
+             if (set_terminal)
+               target_terminal_inferior ();
+             if (q)
+               {
+                 record_insn_max_mode = 1;
+               }
+             else
+               {
+                 error (_("Record: record stop the program."));
+               }
+           }
+       }
+    }
+}
+
+/* Before inferior step (when GDB record the running message, inferior
+   only can step), GDB will call this function to record the values to
+   record_list.  This function will call gdbarch_process_record to
+   record the running message of inferior and set them to
+   record_arch_list, and add it to record_list.  */
+
+static void
+record_message_cleanups (void *ignore)
+{
+  record_list_release (record_arch_list_tail);
+  set_executing (inferior_ptid, 0);
+  normal_stop ();
+}
+
+void
+record_message (struct gdbarch *gdbarch)
+{
+  int ret;
+  struct cleanup *old_cleanups = make_cleanup (record_message_cleanups, 0);
+
+  /* Check record_insn_num.  */
+  record_check_insn_num (1);
+
+  record_arch_list_head = NULL;
+  record_arch_list_tail = NULL;
+  record_regcache = get_current_regcache ();
+
+  ret = gdbarch_process_record (gdbarch, 
+                               regcache_read_pc (record_regcache));
+  if (ret > 0)
+    error (_("Record: record pause the program."));
+  if (ret < 0)
+    error (_("Record: record message error."));
+
+  discard_cleanups (old_cleanups);
+
+  record_list->next = record_arch_list_head;
+  record_arch_list_head->prev = record_list;
+  record_list = record_arch_list_tail;
+
+  if (record_insn_num == record_insn_max_num && record_insn_max_num)
+    {
+      record_list_release_first ();
+    }
+  else
+    {
+      record_insn_num++;
+    }
+}
+
+/* Things to clean up if we QUIT out of function that set
+   record_not_record.  */
+static void
+record_not_record_cleanups (void *ignore)
+{
+  record_not_record = 0;
+}
+
+void
+record_not_record_set (void)
+{
+  struct cleanup *old_cleanups = make_cleanup (record_not_record_cleanups, 0);
+  record_not_record = 1;
+}
+
+static void
+record_open (char *name, int from_tty)
+{
+  if (record_debug)
+    {
+      fprintf_unfiltered (gdb_stdlog, "Record: record_open\n");
+    }
+
+  /* check exec */
+  if (!target_has_execution)
+    {
+      error (_("Record: the program is not being run."));
+    }
+  if (non_stop)
+    {
+      error (_("Record: record target can't debug inferior in non-stop mode (non-stop)."));
+    }
+  if (record_linux_async_permitted)
+    {
+      error (_("Record: record target can't debug the GNU/Linux inferior in asynchronous mode (linux-async)."));
+    }
+
+  if (!gdbarch_process_record_p (current_gdbarch))
+    {
+      error (_("Record: the current architecture doesn't support record function."));
+    }
+
+  /* Check if record target is already running */
+  if (RECORD_IS_USED)
+    {
+      if (!nquery
+         (_("Record target already running, do you want delete the old record log?")))
+       {
+         return;
+       }
+    }
+
+  /* Reset */
+  record_insn_num = 0;
+  record_execdir = EXEC_FORWARD;
+  record_list = &record_first;
+  record_list->next = NULL;
+
+  push_target (&record_ops);
+}
+
+static void
+record_close (int quitting)
+{
+  if (record_debug)
+    {
+      fprintf_unfiltered (gdb_stdlog, "Record: record_close\n");
+    }
+  record_list_release (record_list);
+}
+
+static void
+record_resume (ptid_t ptid, int step, enum target_signal siggnal)
+{
+  record_resume_step = step;
+
+  if (!RECORD_IS_REPLAY)
+    {
+      record_message (current_gdbarch);
+      record_beneath_to_resume (ptid, 1, siggnal);
+    }
+}
+
+static void
+record_sig_handler (int signo)
+{
+  if (record_debug)
+    {
+      fprintf_unfiltered (gdb_stdlog, "Record: get a signal\n");
+    }
+  record_resume_step = 1;
+  record_get_sig = 1;
+}
+
+static void
+record_wait_cleanups (void *ignore)
+{
+  if (record_execdir == EXEC_REVERSE)
+    {
+      if (record_list->next)
+       {
+         record_list = record_list->next;
+       }
+    }
+  else
+    {
+      record_list = record_list->prev;
+    }
+  set_executing (inferior_ptid, 0);
+  normal_stop ();
+}
+
+/* record_wait
+   In replay mode, this function examines the recorded log and
+   determines where to stop.  */
+
+static ptid_t
+record_wait (ptid_t ptid, struct target_waitstatus *status)
+{
+  if (record_debug)
+    {
+      fprintf_unfiltered (gdb_stdlog,
+                         "Record: record_wait record_resume_step = %d\n",
+                         record_resume_step);
+    }
+
+  if (!RECORD_IS_REPLAY)
+    {
+      return record_beneath_to_wait (ptid, status);
+    }
+  else
+    {
+      struct sigaction act, old_act;
+      int need_dasm = 0;
+      struct regcache *regcache = get_current_regcache ();
+      int continue_flag = 1;
+      int first_record_end = 1;
+      struct cleanup *old_cleanups = make_cleanup (record_wait_cleanups, 0);
+
+      record_get_sig = 0;
+      act.sa_handler = record_sig_handler;
+      act.sa_mask = record_maskall;
+      act.sa_flags = SA_RESTART;
+      if (sigaction (SIGINT, &act, &old_act))
+       {
+         perror_with_name (_("Record: sigaction"));
+       }
+      /* If GDB is in terminal_inferior, it will not get the signal.
+         And in GDB replay mode, GDB don't need to in terminal_inferior
+         because inferior will not executed.
+         Then set it to terminal_ours to make GDB get the signal.  */
+      target_terminal_ours ();
+
+      /* In EXEC_FORWARD mode, record_list point to the tail of prev
+         instruction.  */
+      if (record_execdir == EXEC_FORWARD && record_list->next)
+        {
+         record_list = record_list->next;
+       }
+
+      /* Loop over the record_list, looking for the next place to
+        stop.  */
+      status->kind = TARGET_WAITKIND_STOPPED;
+      do
+       {
+         /* Check for beginning and end of log.  */
+         if (record_execdir == EXEC_REVERSE 
+             && record_list == &record_first)
+           {
+             /* Hit beginning of record log in reverse.  */
+             status->kind = TARGET_WAITKIND_NO_HISTORY;
+             break;
+           }
+         if (record_execdir != EXEC_REVERSE && !record_list->next)
+           {
+             /* Hit end of record log going forward.  */
+             status->kind = TARGET_WAITKIND_NO_HISTORY;
+             break;
+           }
+
+         /* set ptid, register and memory according to record_list */
+         if (record_list->type == record_reg)
+           {
+             /* reg */
+             gdb_byte reg[MAX_REGISTER_SIZE];
+             if (record_debug > 1)
+               {
+                 fprintf_unfiltered (gdb_stdlog,
+                                     "Record: record_reg 0x%s to inferior num = %d.\n",
+                                     paddr_nz ((CORE_ADDR)record_list),
+                                     record_list->u.reg.num);
+               }
+             regcache_cooked_read (regcache, record_list->u.reg.num, reg);
+             regcache_cooked_write (regcache, record_list->u.reg.num,
+                                    record_list->u.reg.val);
+             memcpy (record_list->u.reg.val, reg, MAX_REGISTER_SIZE);
+           }
+         else if (record_list->type == record_mem)
+           {
+             /* mem */
+             gdb_byte *mem = alloca (record_list->u.mem.len);
+             if (record_debug > 1)
+               {
+                 fprintf_unfiltered (gdb_stdlog,
+                                     "Record: record_mem 0x%s to inferior addr = 0x%s len = %d.\n",
+                                     paddr_nz ((CORE_ADDR)record_list),
+                                     paddr_nz (record_list->u.mem.addr),
+                                     record_list->u.mem.len);
+               }
+             if (target_read_memory
+                 (record_list->u.mem.addr, mem, record_list->u.mem.len))
+               {
+                 error (_("Record: read memory addr = 0x%s len = %d error."),
+                        paddr_nz (record_list->u.mem.addr),
+                        record_list->u.mem.len);
+               }
+             if (target_write_memory
+                 (record_list->u.mem.addr, record_list->u.mem.val,
+                  record_list->u.mem.len))
+               {
+                 error (_
+                        ("Record: write memory addr = 0x%s len = %d error."),
+                        paddr_nz (record_list->u.mem.addr),
+                        record_list->u.mem.len);
+               }
+             memcpy (record_list->u.mem.val, mem, record_list->u.mem.len);
+           }
+         else
+           {
+             CORE_ADDR tmp_pc;
+             struct bp_location *bl;
+             struct breakpoint *b;
+
+             if (record_debug > 1)
+               {
+                 fprintf_unfiltered (gdb_stdlog,
+                                     "Record: record_end 0x%s to inferior need_dasm = %d.\n",
+                                     paddr_nz ((CORE_ADDR)record_list),
+                                     record_list->u.need_dasm);
+               }
+
+             if (record_execdir == EXEC_FORWARD)
+               {
+                 need_dasm = record_list->u.need_dasm;
+               }
+             if (need_dasm)
+               {
+                 gdbarch_process_record_dasm (current_gdbarch);
+               }
+
+             if (first_record_end && record_execdir == EXEC_REVERSE)
+               {
+                 /* When reverse excute, the first record_end is the part of
+                    current instruction. */
+                 first_record_end = 0;
+               }
+             else
+               {
+                 /* In EXEC_REVERSE mode, this is the record_end of prev
+                    instruction.
+                    In EXEC_FORWARD mode, this is the record_end of current
+                    instruction.  */
+                 /* step */
+                 if (record_resume_step)
+                   {
+                     if (record_debug > 1)
+                       {
+                         fprintf_unfiltered (gdb_stdlog, "Record: step.\n");
+                       }
+                     continue_flag = 0;
+                   }
+
+                 /* check breakpoint */
+                 tmp_pc = read_pc ();
+                 for (bl = bp_location_chain; bl; bl = bl->global_next)
+                   {
+                     b = bl->owner;
+                     gdb_assert (b);
+                     if (b->enable_state != bp_enabled
+                         && b->enable_state != bp_permanent)
+                       continue;
+
+                     if (b->type == bp_watchpoint || b->type == bp_catch_fork
+                         || b->type == bp_catch_vfork
+                         || b->type == bp_catch_exec
+                         || b->type == bp_hardware_watchpoint
+                         || b->type == bp_read_watchpoint
+                         || b->type == bp_access_watchpoint)
+                       {
+                         continue;
+                       }
+                     if (bl->address == tmp_pc)
+                       {
+                         if (record_debug)
+                           {
+                             fprintf_unfiltered (gdb_stdlog,
+                                                 "Record: break at 0x%s.\n",
+                                                 paddr_nz (tmp_pc));
+                           }
+                         continue_flag = 0;
+                         break;
+                       }
+                   }
+               }
+             if (record_execdir == EXEC_REVERSE)
+               {
+                 need_dasm = record_list->u.need_dasm;
+               }
+           }
+
+next:
+         if (continue_flag)
+           {
+             if (record_execdir == EXEC_REVERSE)
+               {
+                 if (record_list->prev)
+                   record_list = record_list->prev;
+               }
+             else
+               {
+                 if (record_list->next)
+                   record_list = record_list->next;
+               }
+           }
+       }
+      while (continue_flag);
+
+      if (sigaction (SIGALRM, &old_act, NULL))
+       {
+         perror_with_name (_("Record: sigaction"));
+       }
+
+      if (record_get_sig)
+       {
+         status->value.sig = TARGET_SIGNAL_INT;
+       }
+      else
+       {
+         status->value.sig = TARGET_SIGNAL_TRAP;
+       }
+
+      discard_cleanups (old_cleanups);
+    }
+
+  return inferior_ptid;
+}
+
+static void
+record_disconnect (struct target_ops *target, char *args, int from_tty)
+{
+  if (record_debug)
+    {
+      fprintf_unfiltered (gdb_stdlog, "Record: record_disconnect\n");
+    }
+  unpush_target (&record_ops);
+  target_disconnect (args, from_tty);
+}
+
+static void
+record_detach (char *args, int from_tty)
+{
+  if (record_debug)
+    {
+      fprintf_unfiltered (gdb_stdlog, "Record: record_detach\n");
+    }
+  unpush_target (&record_ops);
+  target_detach (args, from_tty);
+}
+
+static void
+record_mourn_inferior (void)
+{
+  if (record_debug)
+    {
+      fprintf_unfiltered (gdb_stdlog, "Record: record_mourn_inferior\n");
+    }
+  unpush_target (&record_ops);
+  target_mourn_inferior ();
+}
+
+/* Close record target before kill the inferior process.  */
+static void
+record_kill (void)
+{
+  if (record_debug)
+    {
+      fprintf_unfiltered (gdb_stdlog, "Record: record_kill\n");
+    }
+  unpush_target (&record_ops);
+  target_kill ();
+}
+
+/* Record registers change (by user or by GDB) to list as an instruction.  */
+static void
+record_registers_change (struct regcache *regcache, int regnum)
+{
+  /* Check record_insn_num.  */
+  record_check_insn_num (0);
+
+  record_arch_list_head = NULL;
+  record_arch_list_tail = NULL;
+
+  record_regcache = get_current_regcache ();
+
+  if (regnum < 0)
+    {
+      int i;
+      for (i = 0; i < gdbarch_num_regs (get_regcache_arch (regcache)); i++)
+       {
+         if (record_arch_list_add_reg (i))
+           {
+             record_list_release (record_arch_list_tail);
+             error (_("Record: record message error."));
+           }
+       }
+    }
+  else
+    {
+      if (record_arch_list_add_reg (regnum))
+       {
+         record_list_release (record_arch_list_tail);
+         error (_("Record: record message error."));
+       }
+    }
+  if (record_arch_list_add_end (0))
+    {
+      record_list_release (record_arch_list_tail);
+      error (_("Record: record message error."));
+    }
+  record_list->next = record_arch_list_head;
+  record_arch_list_head->prev = record_list;
+  record_list = record_arch_list_tail;
+
+  if (record_insn_num == record_insn_max_num && record_insn_max_num)
+    {
+      record_list_release_first ();
+    }
+  else
+    {
+      record_insn_num++;
+    }
+}
+
+/* XXX: I don't know how to do if GDB call function target_store_registers
+   without call function target_prepare_to_store.  */
+
+static void
+record_prepare_to_store (struct regcache *regcache)
+{
+  if (!record_not_record)
+    {
+      if (RECORD_IS_REPLAY)
+       {
+         struct cleanup *old_cleanups;
+         /* Let user choice if he want to write register or not.  */
+         if (!nquery (_("Becuse GDB is in replay mode, changing the value of a register will destroy the record from this point forward.  Change register %s?"),
+                      gdbarch_register_name (get_regcache_arch
+                                             (regcache),
+                                             record_regcache_raw_write_regnum)))
+           {
+             error (_("Record: record cancel the operation."));
+           }
+
+         /* Destroy the record from here forward.  */
+         record_list_release_next ();
+       }
+
+      record_registers_change (regcache, record_regcache_raw_write_regnum);
+    }
+  record_beneath_to_prepare_to_store (regcache);
+}
+
+/* record_xfer_partial -- behavior is conditional on RECORD_IS_REPLAY.
+   In replay mode, we cannot write memory unles we are willing to 
+   invalidate the record/replay log from this point forward.  */
+
+static LONGEST
+record_xfer_partial (struct target_ops *ops, enum target_object object,
+                    const char *annex, gdb_byte * readbuf,
+                    const gdb_byte * writebuf, ULONGEST offset, LONGEST len)
+{
+  if (!record_not_record
+      && (object == TARGET_OBJECT_MEMORY
+         || object == TARGET_OBJECT_RAW_MEMORY) && writebuf)
+    {
+      if (RECORD_IS_REPLAY)
+       {
+         /* Let user choice if he want to write memory or not.  */
+         if (!nquery (_("Because GDB is in replay mode, writing to memory will destroy the record from this point forward.  Write memory at address 0x%s?"),
+                      paddr_nz (offset)))
+           {
+             return -1;
+           }
+
+         /* Destroy the record from here forward.  */
+         record_list_release_next ();
+       }
+
+      /* Check record_insn_num */
+      record_check_insn_num (0);
+
+      /* Record registers change to list as an instruction.  */
+      record_arch_list_head = NULL;
+      record_arch_list_tail = NULL;
+      if (record_arch_list_add_mem (offset, len))
+       {
+         record_list_release (record_arch_list_tail);
+         fprintf_unfiltered (gdb_stdlog, _("Record: record message error."));
+         return -1;
+       }
+      if (record_arch_list_add_end (0))
+       {
+         record_list_release (record_arch_list_tail);
+         fprintf_unfiltered (gdb_stdlog, _("Record: record message error."));
+         return -1;
+       }
+      record_list->next = record_arch_list_head;
+      record_arch_list_head->prev = record_list;
+      record_list = record_arch_list_tail;
+
+      if (record_insn_num == record_insn_max_num && record_insn_max_num)
+       {
+         record_list_release_first ();
+       }
+      else
+       {
+         record_insn_num++;
+       }
+    }
+
+  return record_beneath_to_xfer_partial (ops, object, annex, readbuf,
+                                        writebuf, offset, len);
+}
+
+/* record_insert_breakpoint
+   record_remove_breakpoint
+   Behavior is conditional on RECORD_IS_REPLAY.
+   We will not actually insert or remove breakpoints when replaying.  */
+
+static int
+record_insert_breakpoint (struct bp_target_info *bp_tgt)
+{
+  if (!RECORD_IS_REPLAY)
+    {
+      return record_beneath_to_insert_breakpoint (bp_tgt);
+    }
+
+  return 0;
+}
+
+static int
+record_remove_breakpoint (struct bp_target_info *bp_tgt)
+{
+  if (!RECORD_IS_REPLAY)
+    {
+      return record_beneath_to_remove_breakpoint (bp_tgt);
+    }
+
+  return 0;
+}
+
+static enum exec_direction_kind
+record_get_execdir (void)
+{
+  if (record_debug > 1)
+    printf_filtered ("Record: execdir is %s\n",
+                    record_execdir == EXEC_FORWARD ? "forward" :
+                    record_execdir == EXEC_REVERSE ? "reverse" : "unknown");
+  return record_execdir;
+}
+
+static int
+record_set_execdir (enum exec_direction_kind dir)
+{
+  if (record_debug)
+    printf_filtered ("Record: set execdir: %s\n",
+                    dir == EXEC_FORWARD ? "forward" :
+                    dir == EXEC_REVERSE ? "reverse" : "bad direction");
+
+  /* FIXME: check target for capability.  */
+  if (dir == EXEC_FORWARD || dir == EXEC_REVERSE)
+    return (record_execdir = dir);
+  else
+    return EXEC_ERROR;
+}
+
+static void
+init_record_ops (void)
+{
+  record_ops.to_shortname = "record";
+  record_ops.to_longname = "Record and reverse target";
+  record_ops.to_doc =
+    "Log program while executing and replay execution from log.";
+  record_ops.to_open = record_open;
+  record_ops.to_close = record_close;
+  record_ops.to_resume = record_resume;
+  record_ops.to_wait = record_wait;
+  record_ops.to_disconnect = record_disconnect;
+  record_ops.to_detach = record_detach;
+  record_ops.to_mourn_inferior = record_mourn_inferior;
+  record_ops.to_kill = record_kill;
+  record_ops.to_create_inferior = find_default_create_inferior;        /* Make record suppport command "run".  */
+  record_ops.to_prepare_to_store = record_prepare_to_store;
+  record_ops.to_xfer_partial = record_xfer_partial;
+  record_ops.to_insert_breakpoint = record_insert_breakpoint;
+  record_ops.to_remove_breakpoint = record_remove_breakpoint;
+  record_ops.to_get_execdir = record_get_execdir;
+  record_ops.to_set_execdir = record_set_execdir;
+  record_ops.to_stratum = record_stratum;
+  record_ops.to_magic = OPS_MAGIC;
+}
+
+static void
+show_record_debug (struct ui_file *file, int from_tty,
+                  struct cmd_list_element *c, const char *value)
+{
+  fprintf_filtered (file, _("Debugging of record target is %s.\n"), value);
+}
+
+/* cmd_record_start -- alias for "target record".  */
+
+static void
+cmd_record_start (char *args, int from_tty)
+{
+  execute_command ("target record", from_tty);
+}
+
+/* cmd_record_delete -- truncate the record log from the present point
+   of replay until the end.  */
+
+static void
+cmd_record_delete (char *args, int from_tty)
+{
+  if (RECORD_IS_USED)
+    {
+      if (RECORD_IS_REPLAY)
+       {
+         if (!from_tty || query (_("Record: delete the log from this point forward and begin to record the running message at current PC?")))
+           {
+             record_list_release_next ();
+           }
+       }
+      else
+       {
+         printf_unfiltered (_("Record: already at end of record list.\n"));
+       }
+
+    }
+  else
+    {
+      printf_unfiltered (_("Record: record target is not started.\n"));
+    }
+}
+
+/* cmd_record_stop -- implement the "stoprecord" command.  */
+
+static void
+cmd_record_stop (char *args, int from_tty)
+{
+  if (RECORD_IS_USED)
+    {
+      if (!record_list || !from_tty || query (_("Record: delete recorded log and stop recording?")))
+       {
+         unpush_target (&record_ops);
+       }
+    }
+  else
+    {
+      printf_unfiltered (_("Record: record target is not started.\n"));
+    }
+}
+
+/* set_record_insn_max_num -- set upper limit of record log size.  */
+
+static void
+set_record_insn_max_num (char *args, int from_tty, struct cmd_list_element *c)
+{
+  if (record_insn_num > record_insn_max_num && record_insn_max_num)
+    {
+      printf_unfiltered (_("Record: record instructions number is bigger than record instructions max number.  Auto delete the first ones.\n"));
+
+      while (record_insn_num > record_insn_max_num)
+       {
+         record_list_release_first ();
+       }
+    }
+}
+
+/* show_record_insn_number -- print the current index
+   into the record log (number of insns recorded so far).  */
+
+static void
+show_record_insn_number (char *ignore, int from_tty)
+{
+  printf_unfiltered (_("Record instruction number is %d.\n"),
+                    record_insn_num);
+}
+
+void
+_initialize_record (void)
+{
+  /* Init record_maskall.  */
+  if (sigfillset (&record_maskall) == -1)
+    {
+      perror_with_name (_("Record: sigfillset"));
+    }
+
+  /* Init record_first.  */
+  record_first.prev = NULL;
+  record_first.next = NULL;
+  record_first.type = record_end;
+  record_first.u.need_dasm = 0;
+
+  init_record_ops ();
+  add_target (&record_ops);
+
+  add_setshow_zinteger_cmd ("record", no_class, &record_debug,
+                           _("Set debugging of record/replay feature."),
+                           _("Show debugging of record/replay feature."),
+                           _
+                           ("When enabled, debugging output for record/replay feature is displayed."),
+                           NULL, show_record_debug, &setdebuglist,
+                           &showdebuglist);
+
+  add_com ("record", class_obscure, cmd_record_start,
+          _("Abbreviated form of \"target record\" command."));
+
+  add_com_alias ("rec", "record", class_obscure, 1);
+
+  /* XXX: I try to use some simple commands such as "disconnect" and
+     "detach" to support this functions.  But these commands all have
+     other affect to GDB such as call function "no_shared_libraries".
+     So I add special commands to GDB.  */
+  add_com ("delrecord", class_obscure, cmd_record_delete,
+          _("When record target running in replay mode, delete the next running messages and begin to record the running message at current address."));
+  add_com_alias ("dr", "delrecord", class_obscure, 1);
+  add_com ("stoprecord", class_obscure, cmd_record_stop,
+          _("Stop the record/replay target."));
+  add_com_alias ("sr", "stoprecord", class_obscure, 1);
+
+  /* Record instructions number limit command.  */
+  add_setshow_zinteger_cmd ("record-auto-delete", no_class,
+                           &record_insn_max_mode,
+                           _("Set record/replay auto delete mode."),
+                           _("Show record/replay auto delete mode."), _("\
+When enabled, if the record/replay buffer becomes full,\n\
+delete it and start new recording."), NULL, NULL, &setlist, &showlist);
+  add_setshow_zinteger_cmd ("record-insn-number-max", no_class,
+                           &record_insn_max_num,
+                           _("Set record/replay buffer limit."),
+                           _("Show record/replay buffer limit."), _("\
+Set the maximum number of instructions to be stored in the\n\
+record/replay buffer.  Zero means unlimited (default 200000)."), 
+                           set_record_insn_max_num, 
+                           NULL, &setlist, &showlist);
+  add_info ("record-insn-number", show_record_insn_number, _("\
+Show the current number of instructions in the record/replay buffer."));
+}
diff --git a/gdb/record.h b/gdb/record.h
new file mode 100644 (file)
index 0000000..9e20013
--- /dev/null
@@ -0,0 +1,101 @@
+/* Record and reverse target for GDB, the GNU debugger.
+
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _RECORD_H_
+#define _RECORD_H_
+
+#define RECORD_IS_USED                         (current_target.beneath == &record_ops)
+#define RECORD_IS_REPLAY                       (record_list->next || record_execdir == EXEC_REVERSE)
+#define RECORD_TARGET_SUPPORT_RECORD_WAIT      (record_ops.beneath->to_support_record_wait)
+
+typedef struct record_reg_s
+{
+  int num;
+  gdb_byte *val;
+} record_reg_t;
+
+typedef struct record_mem_s
+{
+  CORE_ADDR addr;
+  int len;
+  gdb_byte *val;
+} record_mem_t;
+
+enum record_type
+{
+  record_end = 0,
+  record_reg,
+  record_mem
+};
+
+/* This is the core struct of record function.
+   An entity of record_t is a record of the value change of a register
+   ("record_reg") or a part of memory ("record_mem"). And Each instruction must
+   has a record_t ("record_end") that point out this is the last record_t of
+   this instruction.
+   Each record_t is linked to "record_list" by "prev" and "next". 
+ */
+typedef struct record_s
+{
+  struct record_s *prev;
+  struct record_s *next;
+  enum record_type type;
+  union
+  {
+    /* reg */
+    record_reg_t reg;
+    /* mem */
+    record_mem_t mem;
+    /* end */
+    int need_dasm;
+  } u;
+} record_t;
+
+extern int record_debug;
+extern record_t *record_list;
+extern record_t *record_arch_list_head;
+extern record_t *record_arch_list_tail;
+extern struct regcache *record_regcache;
+
+extern struct target_ops record_ops;
+extern int record_resume_step;
+extern int record_regcache_raw_write_regnum;
+extern enum exec_direction_kind record_execdir;
+extern int record_linux_async_permitted;
+
+extern int record_arch_list_add_reg (int num);
+extern int record_arch_list_add_mem (CORE_ADDR addr, int len);
+extern int record_arch_list_add_end (int need_dasm);
+extern void record_message (struct gdbarch *gdbarch);
+extern void record_not_record_set (void);
+
+extern void (*record_beneath_to_resume) (ptid_t, int, enum target_signal);
+extern ptid_t (*record_beneath_to_wait) (ptid_t, struct target_waitstatus *);
+extern void (*record_beneath_to_prepare_to_store) (struct regcache *);
+extern LONGEST (*record_beneath_to_xfer_partial) (struct target_ops * ops,
+                                                 enum target_object object,
+                                                 const char *annex,
+                                                 gdb_byte * readbuf,
+                                                 const gdb_byte * writebuf,
+                                                 ULONGEST offset,
+                                                 LONGEST len);
+extern int (*record_beneath_to_insert_breakpoint) (struct bp_target_info *);
+extern int (*record_beneath_to_remove_breakpoint) (struct bp_target_info *);
+
+#endif /* _RECORD_H_ */
index 076bb04133bf5e3c39bc91c195b6db5718488092..e42c1b4e43a99b44f51c6e50df121c64ff1e38af 100644 (file)
@@ -41,6 +41,7 @@
 #include "target-descriptions.h"
 #include "gdbthread.h"
 #include "solib.h"
+#include "record.h"
 
 static void target_info (char *, int);
 
@@ -241,6 +242,9 @@ add_target (struct target_ops *t)
   if (t->to_xfer_partial == NULL)
     t->to_xfer_partial = default_xfer_partial;
 
+  /* Set the default value of to_support_record_wait. */
+  t->to_support_record_wait = 0;
+
   if (!target_structs)
     {
       target_struct_allocsize = DEFAULT_ALLOCSIZE;
@@ -375,6 +379,12 @@ update_current_target (void)
       if (!current_target.FIELD) \
        current_target.FIELD = (TARGET)->FIELD
 
+  record_beneath_to_resume = NULL;
+  record_beneath_to_prepare_to_store = NULL;
+  record_beneath_to_xfer_partial = NULL;
+  record_beneath_to_insert_breakpoint = NULL;
+  record_beneath_to_remove_breakpoint = NULL;
+
   for (t = target_stack; t; t = t->beneath)
     {
       INHERIT (to_shortname, t);
@@ -463,6 +473,35 @@ update_current_target (void)
       /* Do not inherit to_memory_map.  */
       /* Do not inherit to_flash_erase.  */
       /* Do not inherit to_flash_done.  */
+
+      /* Set the real beneath function pointers. */
+      if (t != &record_ops)
+        {
+           if (!record_beneath_to_resume)
+             {
+               record_beneath_to_resume = t->to_resume;
+             }
+           if (!record_beneath_to_wait)
+             {
+               record_beneath_to_wait = t->to_wait;
+             }
+           if (!record_beneath_to_prepare_to_store)
+             {
+               record_beneath_to_prepare_to_store = t->to_prepare_to_store;
+             }
+           if (!record_beneath_to_xfer_partial)
+             {
+               record_beneath_to_xfer_partial = t->to_xfer_partial;
+             }
+           if (!record_beneath_to_insert_breakpoint)
+             {
+               record_beneath_to_insert_breakpoint = t->to_insert_breakpoint;
+             }
+           if (!record_beneath_to_remove_breakpoint)
+             {
+               record_beneath_to_remove_breakpoint = t->to_remove_breakpoint;
+             }
+        }
     }
 #undef INHERIT
 
index d14c33c0a3effef4d591799798da4a9c3dfd525e..88d07db4681e230ddf91d9019c98c5e65355a30e 100644 (file)
@@ -62,7 +62,8 @@ enum strata
     file_stratum,              /* Executable files, etc */
     core_stratum,              /* Core dump files */
     process_stratum,           /* Executing processes */
-    thread_stratum             /* Executing threads */
+    thread_stratum,            /* Executing threads */
+    record_stratum             /* Support record debugging */
   };
 
 enum thread_control_capabilities
@@ -540,6 +541,11 @@ struct target_ops
     /* Get execution direction (forward/reverse).  */
     enum exec_direction_kind (*to_get_execdir) (void);
 
+    /* Default value is 0. Mean that this target doesn't support record wait.
+       Need the help of infrun.c(handle_inferior_event). Set to 1 if this
+       target support record wait. */
+    int to_support_record_wait;
+
     int to_magic;
     /* Need sub-structure for target machine related rather than comm related?
      */