Create private_inferior class hierarchy

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

diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c
index 44782bfa78d7d1417ea266ad904066d3e0ec66de..97847b9f059ea84be9fbe405a6571d01a991bce0 100644 (file)
--- a/gdb/darwin-nat-info.c
+++ b/gdb/darwin-nat-info.c
@@ -118,7 +118,10 @@ get_task_from_args (const char *args)
     {
       if (ptid_equal (inferior_ptid, null_ptid))
        printf_unfiltered (_("No inferior running\n"));
-      return current_inferior ()->priv->task;
+
+      darwin_inferior *priv = get_darwin_inferior (current_inferior ());
+
+      return priv->task;
     }
   if (strcmp (args, "gdb") == 0)
     return mach_task_self ();
@@ -257,36 +260,31 @@ info_mach_ports_command (const char *args, int from_tty)
          else if (!ptid_equal (inferior_ptid, null_ptid))
            {
              struct inferior *inf = current_inferior ();
+             darwin_inferior *priv = get_darwin_inferior (inf);
 
-             if (port == inf->priv->task)
+             if (port == priv->task)
                printf_unfiltered (_(" inferior-task"));
-             else if (port == inf->priv->notify_port)
+             else if (port == priv->notify_port)
                printf_unfiltered (_(" inferior-notify"));
              else
                {
-                 int k;
-                 darwin_thread_t *t;
-
-                 for (k = 0; k < inf->priv->exception_info.count; k++)
-                   if (port == inf->priv->exception_info.ports[k])
+                 for (int k = 0; k < priv->exception_info.count; k++)
+                   if (port == priv->exception_info.ports[k])
                      {
                        printf_unfiltered (_(" inferior-excp-port"));
                        break;
                      }
 
-                 if (inf->priv->threads)
+                 for (darwin_thread_t *t : priv->threads)
                    {
-                     for (k = 0;
-                          VEC_iterate(darwin_thread_t,
-                                      inf->priv->threads, k, t);
-                          k++)
-                       if (port == t->gdb_port)
-                         {
-                           printf_unfiltered (_(" inferior-thread for 0x%x"),
-                                              inf->priv->task);
-                           break;
-                         }
+                     if (port == t->gdb_port)
+                       {
+                         printf_unfiltered (_(" inferior-thread for 0x%x"),
+                                            priv->task);
+                         break;
+                       }
                    }
+
                }
            }
        }
@@ -738,7 +736,8 @@ info_mach_region_command (const char *exp, int from_tty)
     error (_("Inferior not available"));
 
   inf = current_inferior ();
-  darwin_debug_region (inf->priv->task, address);
+  darwin_inferior *priv = get_darwin_inferior (inf);
+  darwin_debug_region (priv->task, address);
 }
 
 static void
@@ -807,7 +806,10 @@ info_mach_exceptions_command (const char *args, int from_tty)
        {
          if (ptid_equal (inferior_ptid, null_ptid))
            printf_unfiltered (_("No inferior running\n"));
-         disp_exception (&current_inferior ()->priv->exception_info);
+
+         darwin_inferior *priv = get_darwin_inferior (current_inferior ());
+
+         disp_exception (&priv->exception_info);
          return;
        }
       else if (strcmp (args, "host") == 0)
@@ -830,8 +832,10 @@ info_mach_exceptions_command (const char *args, int from_tty)
        printf_unfiltered (_("No inferior running\n"));
       inf = current_inferior ();
       
+      darwin_inferior *priv = get_darwin_inferior (inf);
+
       kret = task_get_exception_ports
-       (inf->priv->task, EXC_MASK_ALL, info.masks,
+       (priv->task, EXC_MASK_ALL, info.masks,
         &info.count, info.ports, info.behaviors, info.flavors);
       MACH_CHECK_ERROR (kret);
       disp_exception (&info);