* emultempl/mmixelf.em: Remove incorrect '#line' directive.

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

diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index db60052eccad4efb072111a1579a6c271a2198ed..864be4f45171cca6daccf39757a49a8a3327cc88 100644 (file)
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -1,6 +1,6 @@
 /* BSD Kernel Data Access Library (libkvm) interface.
 
-   Copyright 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "cli/cli-cmds.h"
@@ -34,6 +34,7 @@
 #ifdef HAVE_NLIST_H
 #include <nlist.h>
 #endif
+#include <paths.h>
 #include "readline/readline.h"
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -41,18 +42,21 @@
 
 #include "bsd-kvm.h"
 
+/* Kernel memory device file.  */
+static const char *bsd_kvm_corefile;
+
 /* Kernel memory interface descriptor.  */
-kvm_t *core_kd;
+static kvm_t *core_kd;
 
 /* Address of process control block.  */
-struct pcb *bsd_kvm_paddr;
+static struct pcb *bsd_kvm_paddr;
 
 /* Pointer to architecture-specific function that reconstructs the
    register state from PCB and supplies it to REGCACHE.  */
-int (*bsd_kvm_supply_pcb)(struct regcache *regcache, struct pcb *pcb);
+static int (*bsd_kvm_supply_pcb)(struct regcache *regcache, struct pcb *pcb);
 
 /* Target ops for libkvm interface.  */
-struct target_ops bsd_kvm_ops;
+static struct target_ops bsd_kvm_ops;
 
 static void
 bsd_kvm_open (char *filename, int from_tty)
@@ -70,25 +74,26 @@ bsd_kvm_open (char *filename, int from_tty)
       filename = tilde_expand (filename);
       if (filename[0] != '/')
        {
-         temp = concat (current_directory, "/", filename, NULL);
+         temp = concat (current_directory, "/", filename, (char *)NULL);
          xfree (filename);
          filename = temp;
        }
     }
 
   execfile = get_exec_file (0);
-  temp_kd = kvm_openfiles (execfile, filename, NULL, O_RDONLY, errbuf);
+  temp_kd = kvm_openfiles (execfile, filename, NULL,
+                          write_files ? O_RDWR : O_RDONLY, errbuf);
   if (temp_kd == NULL)
     error (("%s"), errbuf);
 
+  bsd_kvm_corefile = filename;
   unpush_target (&bsd_kvm_ops);
   core_kd = temp_kd;
   push_target (&bsd_kvm_ops);
 
   target_fetch_registers (-1);
 
-  flush_cached_frames ();
-  select_frame (get_current_frame ());
+  reinit_frame_cache ();
   print_stack_frame (get_selected_frame (NULL), -1, 1);
 }
 
@@ -132,6 +137,16 @@ bsd_kvm_xfer_partial (struct target_ops *ops, enum target_object object,
     }
 }
 
+static void
+bsd_kvm_files_info (struct target_ops *ops)
+{
+  if (bsd_kvm_corefile && strcmp (bsd_kvm_corefile, _PATH_MEM) != 0)
+    printf_filtered (_("\tUsing the kernel crash dump %s.\n"),
+                    bsd_kvm_corefile);
+  else
+    printf_filtered (_("\tUsing the currently running kernel.\n"));
+}
+
 /* Fetch process control block at address PADDR.  */
 
 static int
@@ -260,8 +275,7 @@ bsd_kvm_proc_cmd (char *arg, int fromtty)
 
   target_fetch_registers (-1);
 
-  flush_cached_frames ();
-  select_frame (get_current_frame ());
+  reinit_frame_cache ();
   print_stack_frame (get_selected_frame (NULL), -1, 1);
 }
 
@@ -281,8 +295,7 @@ bsd_kvm_pcb_cmd (char *arg, int fromtty)
 
   target_fetch_registers (-1);
 
-  flush_cached_frames ();
-  select_frame (get_current_frame ());
+  reinit_frame_cache ();
   print_stack_frame (get_selected_frame (NULL), -1, 1);
 }
 
@@ -304,6 +317,7 @@ Optionally specify the filename of a core dump.");
   bsd_kvm_ops.to_close = bsd_kvm_close;
   bsd_kvm_ops.to_fetch_registers = bsd_kvm_fetch_registers;
   bsd_kvm_ops.to_xfer_partial = bsd_kvm_xfer_partial;
+  bsd_kvm_ops.to_files_info = bsd_kvm_files_info;
   bsd_kvm_ops.to_stratum = process_stratum;
   bsd_kvm_ops.to_has_memory = 1;
   bsd_kvm_ops.to_has_stack = 1;