* ia64-linux-nat.c: Update copyright year.

[deliverable/binutils-gdb.git] / gdb / bsd-kvm.c

diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 37fc2b48a6ab05504bef78c29e9eec986d962329..64869e5464c2284c20165aeb1df7d8108165936c 100644 (file)
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -20,16 +20,23 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
+#include "cli/cli-cmds.h"
+#include "command.h"
 #include "frame.h"
 #include "regcache.h"
 #include "target.h"
+#include "value.h"
+#include "gdbcore.h"           /* for get_exec_file */
 
 #include "gdb_assert.h"
 #include <fcntl.h>
 #include <kvm.h>
+#ifdef HAVE_NLIST_H
 #include <nlist.h>
+#endif
 #include "readline/readline.h"
 #include <sys/param.h>
+#include <sys/proc.h>
 #include <sys/user.h>
 
 #include "bsd-kvm.h"
@@ -69,6 +76,7 @@ bsd_kvm_open (char *filename, int from_tty)
        }
     }
 
+  execfile = get_exec_file (0);
   temp_kd = kvm_openfiles (execfile, filename, NULL, O_RDONLY, errbuf);
   if (temp_kd == NULL)
     error ("%s", errbuf);
@@ -128,7 +136,10 @@ bsd_kvm_fetch_registers (int regnum)
   struct nlist nl[2];
 
   if (bsd_kvm_paddr)
-    bsd_kvm_fetch_pcb (bsd_kvm_paddr);
+    {
+      bsd_kvm_fetch_pcb (bsd_kvm_paddr);
+      return;
+    }
 
   /* On dumping core, BSD kernels store the faulting context (PCB)
      in the variable "dumppcb".  */
@@ -185,8 +196,8 @@ bsd_kvm_fetch_registers (int regnum)
       struct pcb *paddr;
 
       /* Found thread0.  */
-      nl[1].n_value += offsetof (struct thread, td_pcb);
-      if (kvm_read (core_kd, nl[1].n_value, &paddr, sizeof paddr) == -1)
+      nl[0].n_value += offsetof (struct thread, td_pcb);
+      if (kvm_read (core_kd, nl[0].n_value, &paddr, sizeof paddr) == -1)
        error ("%s", kvm_geterr (core_kd));
 
       bsd_kvm_fetch_pcb (paddr);
@@ -198,6 +209,65 @@ bsd_kvm_fetch_registers (int regnum)
 }
 \f
 
+/* Kernel memory interface commands.  */
+struct cmd_list_element *bsd_kvm_cmdlist;
+
+static void
+bsd_kvm_cmd (char *arg, int fromtty)
+{
+  /* ??? Should this become an alias for "target kvm"?  */
+}
+
+#ifndef HAVE_STRUCT_THREAD_TD_PCB
+
+static void
+bsd_kvm_proc_cmd (char *arg, int fromtty)
+{
+  CORE_ADDR addr;
+
+  if (arg == NULL)
+    error_no_arg ("proc address");
+
+  if (core_kd == NULL)
+    error ("No kernel memory image.");
+
+  addr = parse_and_eval_address (arg);
+#ifdef HAVE_STRUCT_LWP
+  addr += offsetof (struct lwp, l_addr);
+#else
+  addr += offsetof (struct proc, p_addr);
+#endif
+
+  if (kvm_read (core_kd, addr, &bsd_kvm_paddr, sizeof bsd_kvm_paddr) == -1)
+    error ("%s", kvm_geterr (core_kd));
+
+  target_fetch_registers (-1);
+
+  flush_cached_frames ();
+  select_frame (get_current_frame ());
+  print_stack_frame (get_selected_frame (), -1, 1);
+}
+
+#endif
+
+static void
+bsd_kvm_pcb_cmd (char *arg, int fromtty)
+{
+  if (arg == NULL)
+    error_no_arg ("pcb address");
+
+  if (core_kd == NULL)
+    error ("No kernel memory image.");
+
+  bsd_kvm_paddr = (struct pcb *) parse_and_eval_address (arg);
+
+  target_fetch_registers (-1);
+
+  flush_cached_frames ();
+  select_frame (get_current_frame ());
+  print_stack_frame (get_selected_frame (), -1, 1);
+}
+
 /* Add the libkvm interface to the list of all possible targets and
    register CUPPLY_PCB as the architecture-specific process control
    block interpreter.  */
@@ -223,4 +293,15 @@ Optionally specify the filename of a core dump.";
   bsd_kvm_ops.to_magic = OPS_MAGIC;
 
   add_target (&bsd_kvm_ops);
+  
+  add_prefix_cmd ("kvm", class_obscure, bsd_kvm_cmd, "\
+Generic command for manipulating the kernel memory interface.",
+                 &bsd_kvm_cmdlist, "kvm ", 0, &cmdlist);
+
+#ifndef HAVE_STRUCT_THREAD_TD_PCB
+  add_cmd ("proc", class_obscure, bsd_kvm_proc_cmd,
+          "Set current context from proc address", &bsd_kvm_cmdlist);
+#endif
+  add_cmd ("pcb", class_obscure, bsd_kvm_pcb_cmd,
+          "Set current context from pcb address", &bsd_kvm_cmdlist);
 }