Remove unneeded AUX register symbols.

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

diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 1a3860b908ca00d2774112562f8dd6695e574428..9e15fabf3367b3994ce3c5fdf50d627a648aaa00 100644 (file)
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -1,12 +1,12 @@
 /* BSD Kernel Data Access Library (libkvm) interface.
 
 /* BSD Kernel Data Access Library (libkvm) interface.
 

-   Copyright 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004-2016 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
 
    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
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "cli/cli-cmds.h"
 
 #include "defs.h"
 #include "cli/cli-cmds.h"


@@ -27,8 +25,8 @@
 #include "target.h"
 #include "value.h"
 #include "gdbcore.h"           /* for get_exec_file */
 #include "target.h"
 #include "value.h"
 #include "gdbcore.h"           /* for get_exec_file */

+#include "gdbthread.h"

 
 

-#include "gdb_assert.h"

 #include <fcntl.h>
 #include <kvm.h>
 #ifdef HAVE_NLIST_H
 #include <fcntl.h>
 #include <kvm.h>
 #ifdef HAVE_NLIST_H


@@ -58,20 +56,26 @@ static int (*bsd_kvm_supply_pcb)(struct regcache *regcache, struct pcb *pcb);
 /* Target ops for libkvm interface.  */
 static struct target_ops bsd_kvm_ops;
 
 /* Target ops for libkvm interface.  */
 static struct target_ops bsd_kvm_ops;
 

+/* This is the ptid we use while we're connected to kvm.  The kvm
+   target currently doesn't export any view of the running processes,
+   so this represents the kernel task.  */
+static ptid_t bsd_kvm_ptid;
+

 static void
 static void

-bsd_kvm_open (char *filename, int from_tty)
+bsd_kvm_open (const char *arg, int from_tty)

 {
   char errbuf[_POSIX2_LINE_MAX];
   char *execfile = NULL;
   kvm_t *temp_kd;
 {
   char errbuf[_POSIX2_LINE_MAX];
   char *execfile = NULL;
   kvm_t *temp_kd;

+  char *filename = NULL;

 
   target_preopen (from_tty);
 
 
   target_preopen (from_tty);
 

-  if (filename)
+  if (arg)

     {
       char *temp;
 
     {
       char *temp;
 

-      filename = tilde_expand (filename);
+      filename = tilde_expand (arg);

       if (filename[0] != '/')
        {
          temp = concat (current_directory, "/", filename, (char *)NULL);
       if (filename[0] != '/')
        {
          temp = concat (current_directory, "/", filename, (char *)NULL);


@@ -81,7 +85,8 @@ bsd_kvm_open (char *filename, int from_tty)
     }
 
   execfile = get_exec_file (0);
     }
 
   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);
 
   if (temp_kd == NULL)
     error (("%s"), errbuf);
 


@@ -90,15 +95,17 @@ bsd_kvm_open (char *filename, int from_tty)
   core_kd = temp_kd;
   push_target (&bsd_kvm_ops);
 
   core_kd = temp_kd;
   push_target (&bsd_kvm_ops);
 

-  target_fetch_registers (-1);
+  add_thread_silent (bsd_kvm_ptid);
+  inferior_ptid = bsd_kvm_ptid;
+
+  target_fetch_registers (get_current_regcache (), -1);

 
 

-  flush_cached_frames ();
-  select_frame (get_current_frame ());
-  print_stack_frame (get_selected_frame (NULL), -1, 1);
+  reinit_frame_cache ();
+  print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC, 1);

 }
 
 static void
 }
 
 static void

-bsd_kvm_close (int quitting)
+bsd_kvm_close (struct target_ops *self)

 {
   if (core_kd)
     {
 {
   if (core_kd)
     {


@@ -106,6 +113,9 @@ bsd_kvm_close (int quitting)
        warning (("%s"), kvm_geterr(core_kd));
       core_kd = NULL;
     }
        warning (("%s"), kvm_geterr(core_kd));
       core_kd = NULL;
     }

+
+  inferior_ptid = null_ptid;
+  delete_thread_silent (bsd_kvm_ptid);

 }
 
 static LONGEST
 }
 
 static LONGEST


@@ -121,19 +131,31 @@ bsd_kvm_xfer_memory (CORE_ADDR addr, ULONGEST len,
   return nbytes;
 }
 
   return nbytes;
 }
 

-static LONGEST
+static enum target_xfer_status

 bsd_kvm_xfer_partial (struct target_ops *ops, enum target_object object,
                      const char *annex, gdb_byte *readbuf,
                      const gdb_byte *writebuf,
 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)
+                     ULONGEST offset, ULONGEST len, ULONGEST *xfered_len)

 {
   switch (object)
     {
     case TARGET_OBJECT_MEMORY:
 {
   switch (object)
     {
     case TARGET_OBJECT_MEMORY:

-      return bsd_kvm_xfer_memory (offset, len, readbuf, writebuf);
+      {
+       LONGEST ret = bsd_kvm_xfer_memory (offset, len, readbuf, writebuf);
+
+       if (ret < 0)
+         return TARGET_XFER_E_IO;
+       else if (ret == 0)
+         return TARGET_XFER_EOF;
+       else
+         {
+           *xfered_len = (ULONGEST) ret;
+           return TARGET_XFER_OK;
+         }
+      }

 
     default:
 
     default:

-      return -1;
+      return TARGET_XFER_E_IO;

     }
 }
 
     }
 }
 


@@ -150,7 +172,7 @@ bsd_kvm_files_info (struct target_ops *ops)
 /* Fetch process control block at address PADDR.  */
 
 static int
 /* Fetch process control block at address PADDR.  */
 
 static int

-bsd_kvm_fetch_pcb (struct pcb *paddr)
+bsd_kvm_fetch_pcb (struct regcache *regcache, struct pcb *paddr)

 {
   struct pcb pcb;
 
 {
   struct pcb pcb;
 


@@ -158,17 +180,18 @@ bsd_kvm_fetch_pcb (struct pcb *paddr)
     error (("%s"), kvm_geterr (core_kd));
 
   gdb_assert (bsd_kvm_supply_pcb);
     error (("%s"), kvm_geterr (core_kd));
 
   gdb_assert (bsd_kvm_supply_pcb);

-  return bsd_kvm_supply_pcb (current_regcache, &pcb);
+  return bsd_kvm_supply_pcb (regcache, &pcb);

 }
 
 static void
 }
 
 static void

-bsd_kvm_fetch_registers (int regnum)
+bsd_kvm_fetch_registers (struct target_ops *ops,
+                        struct regcache *regcache, int regnum)

 {
   struct nlist nl[2];
 
   if (bsd_kvm_paddr)
     {
 {
   struct nlist nl[2];
 
   if (bsd_kvm_paddr)
     {

-      bsd_kvm_fetch_pcb (bsd_kvm_paddr);
+      bsd_kvm_fetch_pcb (regcache, bsd_kvm_paddr);

       return;
     }
 
       return;
     }
 


@@ -182,9 +205,9 @@ bsd_kvm_fetch_registers (int regnum)
 
   if (nl[0].n_value != 0)
     {
 
   if (nl[0].n_value != 0)
     {

-      /* Found dumppcb. If it contains a valid context, return
+      /* Found dumppcb.  If it contains a valid context, return

         immediately.  */
         immediately.  */

-      if (bsd_kvm_fetch_pcb ((struct pcb *) nl[0].n_value))
+      if (bsd_kvm_fetch_pcb (regcache, (struct pcb *) nl[0].n_value))

        return;
     }
 
        return;
     }
 


@@ -206,7 +229,7 @@ bsd_kvm_fetch_registers (int regnum)
       if (kvm_read (core_kd, nl[0].n_value, &paddr, sizeof paddr) == -1)
        error (("%s"), kvm_geterr (core_kd));
 
       if (kvm_read (core_kd, nl[0].n_value, &paddr, sizeof paddr) == -1)
        error (("%s"), kvm_geterr (core_kd));
 

-      bsd_kvm_fetch_pcb (paddr);
+      bsd_kvm_fetch_pcb (regcache, paddr);

       return;
     }
 
       return;
     }
 


@@ -231,12 +254,12 @@ bsd_kvm_fetch_registers (int regnum)
       if (kvm_read (core_kd, nl[0].n_value, &paddr, sizeof paddr) == -1)
        error (("%s"), kvm_geterr (core_kd));
 
       if (kvm_read (core_kd, nl[0].n_value, &paddr, sizeof paddr) == -1)
        error (("%s"), kvm_geterr (core_kd));
 

-      bsd_kvm_fetch_pcb (paddr);
+      bsd_kvm_fetch_pcb (regcache, paddr);

       return;
     }
 #endif
 
       return;
     }
 #endif
 

-  /* i18n: PCB == "Process Control Block" */
+  /* i18n: PCB == "Process Control Block".  */

   error (_("Cannot find a valid PCB"));
 }
 \f
   error (_("Cannot find a valid PCB"));
 }
 \f


@@ -273,11 +296,10 @@ bsd_kvm_proc_cmd (char *arg, int fromtty)
   if (kvm_read (core_kd, addr, &bsd_kvm_paddr, sizeof bsd_kvm_paddr) == -1)
     error (("%s"), kvm_geterr (core_kd));
 
   if (kvm_read (core_kd, addr, &bsd_kvm_paddr, sizeof bsd_kvm_paddr) == -1)
     error (("%s"), kvm_geterr (core_kd));
 

-  target_fetch_registers (-1);
+  target_fetch_registers (get_current_regcache (), -1);

 
 

-  flush_cached_frames ();
-  select_frame (get_current_frame ());
-  print_stack_frame (get_selected_frame (NULL), -1, 1);
+  reinit_frame_cache ();
+  print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC, 1);

 }
 
 #endif
 }
 
 #endif


@@ -286,7 +308,7 @@ static void
 bsd_kvm_pcb_cmd (char *arg, int fromtty)
 {
   if (arg == NULL)
 bsd_kvm_pcb_cmd (char *arg, int fromtty)
 {
   if (arg == NULL)

-    /* i18n: PCB == "Process Control Block" */
+    /* i18n: PCB == "Process Control Block".  */

     error_no_arg (_("pcb address"));
 
   if (core_kd == NULL)
     error_no_arg (_("pcb address"));
 
   if (core_kd == NULL)


@@ -294,11 +316,31 @@ bsd_kvm_pcb_cmd (char *arg, int fromtty)
 
   bsd_kvm_paddr = (struct pcb *)(u_long) parse_and_eval_address (arg);
 
 
   bsd_kvm_paddr = (struct pcb *)(u_long) parse_and_eval_address (arg);
 

-  target_fetch_registers (-1);
+  target_fetch_registers (get_current_regcache (), -1);
+
+  reinit_frame_cache ();
+  print_stack_frame (get_selected_frame (NULL), 0, SRC_AND_LOC, 1);
+}

 
 

-  flush_cached_frames ();
-  select_frame (get_current_frame ());
-  print_stack_frame (get_selected_frame (NULL), -1, 1);
+static int
+bsd_kvm_thread_alive (struct target_ops *ops,
+                     ptid_t ptid)
+{
+  return 1;
+}
+
+static char *
+bsd_kvm_pid_to_str (struct target_ops *ops, ptid_t ptid)
+{
+  static char buf[64];
+  xsnprintf (buf, sizeof buf, "<kvm>");
+  return buf;
+}
+
+static int
+bsd_kvm_return_one (struct target_ops *ops)
+{
+  return 1;

 }
 
 /* Add the libkvm interface to the list of all possible targets and
 }
 
 /* Add the libkvm interface to the list of all possible targets and


@@ -320,10 +362,12 @@ Optionally specify the filename of a core dump.");
   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_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_thread_alive = bsd_kvm_thread_alive;
+  bsd_kvm_ops.to_pid_to_str = bsd_kvm_pid_to_str;

   bsd_kvm_ops.to_stratum = process_stratum;
   bsd_kvm_ops.to_stratum = process_stratum;

-  bsd_kvm_ops.to_has_memory = 1;
-  bsd_kvm_ops.to_has_stack = 1;
-  bsd_kvm_ops.to_has_registers = 1;
+  bsd_kvm_ops.to_has_memory = bsd_kvm_return_one;
+  bsd_kvm_ops.to_has_stack = bsd_kvm_return_one;
+  bsd_kvm_ops.to_has_registers = bsd_kvm_return_one;

   bsd_kvm_ops.to_magic = OPS_MAGIC;
 
   add_target (&bsd_kvm_ops);
   bsd_kvm_ops.to_magic = OPS_MAGIC;
 
   add_target (&bsd_kvm_ops);


@@ -337,6 +381,22 @@ Generic command for manipulating the kernel memory interface."),
           _("Set current context from proc address"), &bsd_kvm_cmdlist);
 #endif
   add_cmd ("pcb", class_obscure, bsd_kvm_pcb_cmd,
           _("Set current context from proc address"), &bsd_kvm_cmdlist);
 #endif
   add_cmd ("pcb", class_obscure, bsd_kvm_pcb_cmd,

-          /* i18n: PCB == "Process Control Block" */
+          /* i18n: PCB == "Process Control Block".  */

           _("Set current context from pcb address"), &bsd_kvm_cmdlist);
           _("Set current context from pcb address"), &bsd_kvm_cmdlist);

+
+  /* Some notes on the ptid usage on this target.
+
+     The pid field represents the kvm inferior instance.  Currently,
+     we don't support multiple kvm inferiors, but we start at 1
+     anyway.  The lwp field is set to != 0, in case the core wants to
+     refer to the whole kvm inferior with ptid(1,0,0).
+
+     If kvm is made to export running processes as gdb threads,
+     the following form can be used:
+     ptid (1, 1, 0) -> kvm inferior 1, in kernel
+     ptid (1, 1, 1) -> kvm inferior 1, process 1
+     ptid (1, 1, 2) -> kvm inferior 1, process 2
+     ptid (1, 1, n) -> kvm inferior 1, process n  */
+
+  bsd_kvm_ptid = ptid_build (1, 1, 0);

 }
 }