/* BSD Kernel Data Access Library (libkvm) interface.
- Copyright 2004 Free Software Foundation, Inc.
+ Copyright 2004, 2005 Free Software Foundation, Inc.
This file is part of GDB.
#ifdef HAVE_NLIST_H
#include <nlist.h>
#endif
+#include <paths.h>
#include "readline/readline.h"
#include <sys/param.h>
#include <sys/proc.h>
#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)
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);
if (temp_kd == NULL)
- error ("%s", errbuf);
+ error (("%s"), errbuf);
+ bsd_kvm_corefile = filename;
unpush_target (&bsd_kvm_ops);
core_kd = temp_kd;
push_target (&bsd_kvm_ops);
if (core_kd)
{
if (kvm_close (core_kd) == -1)
- warning ("%s", kvm_geterr(core_kd));
+ warning (("%s"), kvm_geterr(core_kd));
core_kd = NULL;
}
}
-static int
-bsd_kvm_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
- int write, struct mem_attrib *attrib,
- struct target_ops *ops)
+static LONGEST
+bsd_kvm_xfer_memory (CORE_ADDR addr, ULONGEST len,
+ gdb_byte *readbuf, const gdb_byte *writebuf)
{
- if (write)
- return kvm_write (core_kd, memaddr, myaddr, len);
- else
- return kvm_read (core_kd, memaddr, myaddr, len);
+ ssize_t nbytes = len;
+
+ if (readbuf)
+ nbytes = kvm_read (core_kd, addr, readbuf, nbytes);
+ if (writebuf && nbytes > 0)
+ nbytes = kvm_write (core_kd, addr, writebuf, nbytes);
+ return nbytes;
+}
+
+static LONGEST
+bsd_kvm_xfer_partial (struct target_ops *ops, enum target_object object,
+ const char *annex, gdb_byte *readbuf,
+ const gdb_byte *writebuf,
+ ULONGEST offset, LONGEST len)
+{
+ switch (object)
+ {
+ case TARGET_OBJECT_MEMORY:
+ return bsd_kvm_xfer_memory (offset, len, readbuf, writebuf);
+
+ default:
+ return -1;
+ }
+}
- return -1;
+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. */
struct pcb pcb;
if (kvm_read (core_kd, (unsigned long) paddr, &pcb, sizeof pcb) == -1)
- error ("%s", kvm_geterr (core_kd));
+ error (("%s"), kvm_geterr (core_kd));
gdb_assert (bsd_kvm_supply_pcb);
return bsd_kvm_supply_pcb (current_regcache, &pcb);
nl[0].n_name = "_dumppcb";
if (kvm_nlist (core_kd, nl) == -1)
- error ("%s", kvm_geterr (core_kd));
+ error (("%s"), kvm_geterr (core_kd));
if (nl[0].n_value != 0)
{
nl[0].n_name = "_proc0paddr";
if (kvm_nlist (core_kd, nl) == -1)
- error ("%s", kvm_geterr (core_kd));
+ error (("%s"), kvm_geterr (core_kd));
if (nl[0].n_value != 0)
{
/* Found proc0paddr. */
if (kvm_read (core_kd, nl[0].n_value, &paddr, sizeof paddr) == -1)
- error ("%s", kvm_geterr (core_kd));
+ error (("%s"), kvm_geterr (core_kd));
bsd_kvm_fetch_pcb (paddr);
return;
nl[0].n_name = "_thread0";
if (kvm_nlist (core_kd, nl) == -1)
- error ("%s", kvm_geterr (core_kd));
+ error (("%s"), kvm_geterr (core_kd));
if (nl[0].n_value != 0)
{
/* Found thread0. */
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));
+ error (("%s"), kvm_geterr (core_kd));
bsd_kvm_fetch_pcb (paddr);
return;
}
#endif
- error ("Cannot find a valid PCB");
+ /* i18n: PCB == "Process Control Block" */
+ error (_("Cannot find a valid PCB"));
}
\f
CORE_ADDR addr;
if (arg == NULL)
- error_no_arg ("proc address");
+ error_no_arg (_("proc address"));
if (core_kd == NULL)
- error ("No kernel memory image.");
+ error (_("No kernel memory image."));
addr = parse_and_eval_address (arg);
#ifdef HAVE_STRUCT_LWP
#endif
if (kvm_read (core_kd, addr, &bsd_kvm_paddr, sizeof bsd_kvm_paddr) == -1)
- error ("%s", kvm_geterr (core_kd));
+ error (("%s"), kvm_geterr (core_kd));
target_fetch_registers (-1);
bsd_kvm_pcb_cmd (char *arg, int fromtty)
{
if (arg == NULL)
- error_no_arg ("pcb address");
+ /* i18n: PCB == "Process Control Block" */
+ error_no_arg (_("pcb address"));
if (core_kd == NULL)
- error ("No kernel memory image.");
+ error (_("No kernel memory image."));
bsd_kvm_paddr = (struct pcb *)(u_long) parse_and_eval_address (arg);
bsd_kvm_supply_pcb = supply_pcb;
bsd_kvm_ops.to_shortname = "kvm";
- bsd_kvm_ops.to_longname = "Kernel memory interface";
- bsd_kvm_ops.to_doc = "Use a kernel virtual memory image as a target.\n\
-Optionally specify the filename of a core dump.";
+ bsd_kvm_ops.to_longname = _("Kernel memory interface");
+ bsd_kvm_ops.to_doc = _("Use a kernel virtual memory image as a target.\n\
+Optionally specify the filename of a core dump.");
bsd_kvm_ops.to_open = bsd_kvm_open;
bsd_kvm_ops.to_close = bsd_kvm_close;
bsd_kvm_ops.to_fetch_registers = bsd_kvm_fetch_registers;
- bsd_kvm_ops.deprecated_xfer_memory = bsd_kvm_xfer_memory;
+ 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;
add_target (&bsd_kvm_ops);
- add_prefix_cmd ("kvm", class_obscure, bsd_kvm_cmd, "\
-Generic command for manipulating the kernel memory interface.",
+ 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);
+ _("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);
+ /* i18n: PCB == "Process Control Block" */
+ _("Set current context from pcb address"), &bsd_kvm_cmdlist);
}