Add method/format information to =record-started

[deliverable/binutils-gdb.git] / gdb / darwin-nat-info.c

diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c
index 9741538f91873122fe17f0467e420725286a0f49..314d265f7e3d0d134936fc50fde9fa5eb7eef470 100644 (file)
--- a/gdb/darwin-nat-info.c
+++ b/gdb/darwin-nat-info.c
@@ -1,5 +1,5 @@
 /* Darwin support for GDB, the GNU debugger.
-   Copyright 1997-2002, 2008-2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-2016 Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.
 
@@ -35,7 +35,6 @@
 #include "gdbcmd.h"
 #include "inferior.h"
 
-#include <sys/param.h>
 #include <sys/sysctl.h>
 
 #include "darwin-nat.h"
@@ -119,7 +118,7 @@ get_task_from_args (char *args)
     {
       if (ptid_equal (inferior_ptid, null_ptid))
        printf_unfiltered (_("No inferior running\n"));
-      return current_inferior ()->private->task;
+      return current_inferior ()->priv->task;
     }
   if (strcmp (args, "gdb") == 0)
     return mach_task_self ();
@@ -259,32 +258,32 @@ info_mach_ports_command (char *args, int from_tty)
            {
              struct inferior *inf = current_inferior ();
 
-             if (port == inf->private->task)
+             if (port == inf->priv->task)
                printf_unfiltered (_(" inferior-task"));
-             else if (port == inf->private->notify_port)
+             else if (port == inf->priv->notify_port)
                printf_unfiltered (_(" inferior-notify"));
              else
                {
                  int k;
                  darwin_thread_t *t;
 
-                 for (k = 0; k < inf->private->exception_info.count; k++)
-                   if (port == inf->private->exception_info.ports[k])
+                 for (k = 0; k < inf->priv->exception_info.count; k++)
+                   if (port == inf->priv->exception_info.ports[k])
                      {
                        printf_unfiltered (_(" inferior-excp-port"));
                        break;
                      }
 
-                 if (inf->private->threads)
+                 if (inf->priv->threads)
                    {
                      for (k = 0;
                           VEC_iterate(darwin_thread_t,
-                                      inf->private->threads, k, t);
+                                      inf->priv->threads, k, t);
                           k++)
                        if (port == t->gdb_port)
                          {
                            printf_unfiltered (_(" inferior-thread for 0x%x"),
-                                              inf->private->task);
+                                              inf->priv->task);
                            break;
                          }
                    }
@@ -573,8 +572,8 @@ darwin_debug_regions (task_t task, mach_vm_address_t address, int max)
       if (print)
         {
           printf_filtered (_("%s-%s %s/%s  %s %s %s"),
-                           paddress (target_gdbarch, prev_address),
-                           paddress (target_gdbarch, prev_address + prev_size),
+                           paddress (target_gdbarch (), prev_address),
+                           paddress (target_gdbarch (), prev_address + prev_size),
                            unparse_protection (prev_info.protection),
                            unparse_protection (prev_info.max_protection),
                            unparse_inheritance (prev_info.inheritance),
@@ -623,7 +622,7 @@ darwin_debug_regions_recurse (task_t task)
 
   table_chain = make_cleanup_ui_out_table_begin_end (uiout, 9, -1, "regions");
 
-  if (gdbarch_addr_bit (target_gdbarch) <= 32)
+  if (gdbarch_addr_bit (target_gdbarch ()) <= 32)
     {
       ui_out_table_header (uiout, 10, ui_left, "start", "Start");
       ui_out_table_header (uiout, 10, ui_left, "end", "End");
@@ -659,8 +658,8 @@ darwin_debug_regions_recurse (task_t task)
        break;
       row_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "regions-row");
 
-      ui_out_field_core_addr (uiout, "start", target_gdbarch, r_start);
-      ui_out_field_core_addr (uiout, "end", target_gdbarch, r_start + r_size);
+      ui_out_field_core_addr (uiout, "start", target_gdbarch (), r_start);
+      ui_out_field_core_addr (uiout, "end", target_gdbarch (), r_start + r_size);
       ui_out_field_string (uiout, "min-prot", 
                           unparse_protection (r_info.protection));
       ui_out_field_string (uiout, "max-prot", 
@@ -743,7 +742,7 @@ info_mach_region_command (char *exp, int from_tty)
     error (_("Inferior not available"));
 
   inf = current_inferior ();
-  darwin_debug_region (inf->private->task, address);
+  darwin_debug_region (inf->priv->task, address);
 }
 
 static void
@@ -812,7 +811,7 @@ info_mach_exceptions_command (char *args, int from_tty)
        {
          if (ptid_equal (inferior_ptid, null_ptid))
            printf_unfiltered (_("No inferior running\n"));
-         disp_exception (&current_inferior ()->private->exception_info);
+         disp_exception (&current_inferior ()->priv->exception_info);
          return;
        }
       else if (strcmp (args, "host") == 0)
@@ -836,7 +835,7 @@ info_mach_exceptions_command (char *args, int from_tty)
       inf = current_inferior ();
       
       kret = task_get_exception_ports
-       (inf->private->task, EXC_MASK_ALL, info.masks,
+       (inf->priv->task, EXC_MASK_ALL, info.masks,
         &info.count, info.ports, info.behaviors, info.flavors);
       MACH_CHECK_ERROR (kret);
       disp_exception (&info);