gdb: resume ongoing step after handling fork or vfork

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

diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index e57b12693f029b4606e3056e04b295d098a93543..b7199da561028c8d7833c86e2df6f7c814127629 100644 (file)
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -1,5 +1,5 @@
 /* Darwin support for GDB, the GNU debugger.
-   Copyright (C) 1997-2018 Free Software Foundation, Inc.
+   Copyright (C) 1997-2022 Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.
 
@@ -59,7 +59,7 @@ static struct i386_darwin_nat_target darwin_target;
 void
 i386_darwin_nat_target::fetch_registers (struct regcache *regcache, int regno)
 {
-  thread_t current_thread = ptid_get_tid (regcache_get_ptid (regcache));
+  thread_t current_thread = regcache->ptid ().tid ();
   int fetched = 0;
   struct gdbarch *gdbarch = regcache->arch ();
 
@@ -67,14 +67,14 @@ i386_darwin_nat_target::fetch_registers (struct regcache *regcache, int regno)
   if (gdbarch_ptr_bit (gdbarch) == 64)
     {
       if (regno == -1 || amd64_native_gregset_supplies_p (gdbarch, regno))
-        {
-          x86_thread_state_t gp_regs;
-          unsigned int gp_count = x86_THREAD_STATE_COUNT;
-          kern_return_t ret;
+       {
+         x86_thread_state_t gp_regs;
+         unsigned int gp_count = x86_THREAD_STATE_COUNT;
+         kern_return_t ret;
 
          ret = thread_get_state
-            (current_thread, x86_THREAD_STATE, (thread_state_t) & gp_regs,
-             &gp_count);
+           (current_thread, x86_THREAD_STATE, (thread_state_t) & gp_regs,
+            &gp_count);
          if (ret != KERN_SUCCESS)
            {
              printf_unfiltered (_("Error calling thread_get_state for "
@@ -88,18 +88,18 @@ i386_darwin_nat_target::fetch_registers (struct regcache *regcache, int regno)
          gp_regs.uts.ts64.__gs &= 0xffff;
 
          amd64_supply_native_gregset (regcache, &gp_regs.uts, -1);
-          fetched++;
-        }
+         fetched++;
+       }
 
       if (regno == -1 || !amd64_native_gregset_supplies_p (gdbarch, regno))
-        {
-          x86_float_state_t fp_regs;
-          unsigned int fp_count = x86_FLOAT_STATE_COUNT;
-          kern_return_t ret;
+       {
+         x86_float_state_t fp_regs;
+         unsigned int fp_count = x86_FLOAT_STATE_COUNT;
+         kern_return_t ret;
 
          ret = thread_get_state
-            (current_thread, x86_FLOAT_STATE, (thread_state_t) & fp_regs,
-             &fp_count);
+           (current_thread, x86_FLOAT_STATE, (thread_state_t) & fp_regs,
+            &fp_count);
          if (ret != KERN_SUCCESS)
            {
              printf_unfiltered (_("Error calling thread_get_state for "
@@ -107,23 +107,23 @@ i386_darwin_nat_target::fetch_registers (struct regcache *regcache, int regno)
                                 (unsigned long) current_thread);
              MACH_CHECK_ERROR (ret);
            }
-          amd64_supply_fxsave (regcache, -1, &fp_regs.ufs.fs64.__fpu_fcw);
-          fetched++;
-        }
+         amd64_supply_fxsave (regcache, -1, &fp_regs.ufs.fs64.__fpu_fcw);
+         fetched++;
+       }
     }
   else
 #endif
     {
       if (regno == -1 || regno < I386_NUM_GREGS)
-        {
-          x86_thread_state32_t gp_regs;
-          unsigned int gp_count = x86_THREAD_STATE32_COUNT;
-          kern_return_t ret;
+       {
+         x86_thread_state32_t gp_regs;
+         unsigned int gp_count = x86_THREAD_STATE32_COUNT;
+         kern_return_t ret;
          int i;
 
          ret = thread_get_state
-            (current_thread, x86_THREAD_STATE32, (thread_state_t) &gp_regs,
-             &gp_count);
+           (current_thread, x86_THREAD_STATE32, (thread_state_t) &gp_regs,
+            &gp_count);
          if (ret != KERN_SUCCESS)
            {
              printf_unfiltered (_("Error calling thread_get_state for "
@@ -132,23 +132,22 @@ i386_darwin_nat_target::fetch_registers (struct regcache *regcache, int regno)
              MACH_CHECK_ERROR (ret);
            }
          for (i = 0; i < I386_NUM_GREGS; i++)
-           regcache_raw_supply
-             (regcache, i,
-              (char *)&gp_regs + i386_darwin_thread_state_reg_offset[i]);
+           regcache->raw_supply
+             (i, (char *) &gp_regs + i386_darwin_thread_state_reg_offset[i]);
 
-          fetched++;
-        }
+         fetched++;
+       }
 
       if (regno == -1
          || (regno >= I386_ST0_REGNUM && regno < I386_SSE_NUM_REGS))
-        {
-          x86_float_state32_t fp_regs;
-          unsigned int fp_count = x86_FLOAT_STATE32_COUNT;
-          kern_return_t ret;
+       {
+         x86_float_state32_t fp_regs;
+         unsigned int fp_count = x86_FLOAT_STATE32_COUNT;
+         kern_return_t ret;
 
          ret = thread_get_state
-            (current_thread, x86_FLOAT_STATE32, (thread_state_t) &fp_regs,
-             &fp_count);
+           (current_thread, x86_FLOAT_STATE32, (thread_state_t) &fp_regs,
+            &fp_count);
          if (ret != KERN_SUCCESS)
            {
              printf_unfiltered (_("Error calling thread_get_state for "
@@ -156,15 +155,15 @@ i386_darwin_nat_target::fetch_registers (struct regcache *regcache, int regno)
                                 (unsigned long) current_thread);
              MACH_CHECK_ERROR (ret);
            }
-          i387_supply_fxsave (regcache, -1, &fp_regs.__fpu_fcw);
-          fetched++;
-        }
+         i387_supply_fxsave (regcache, -1, &fp_regs.__fpu_fcw);
+         fetched++;
+       }
     }
 
   if (! fetched)
     {
       warning (_("unknown register %d"), regno);
-      regcache_raw_supply (regcache, regno, NULL);
+      regcache->raw_supply (regno, NULL);
     }
 }
 
@@ -176,24 +175,24 @@ void
 i386_darwin_nat_target::store_registers (struct regcache *regcache,
                                         int regno)
 {
-  thread_t current_thread = ptid_get_tid (regcache_get_ptid (regcache));
+  thread_t current_thread = regcache->ptid ().tid ();
   struct gdbarch *gdbarch = regcache->arch ();
 
 #ifdef BFD64
   if (gdbarch_ptr_bit (gdbarch) == 64)
     {
       if (regno == -1 || amd64_native_gregset_supplies_p (gdbarch, regno))
-        {
-          x86_thread_state_t gp_regs;
-          kern_return_t ret;
+       {
+         x86_thread_state_t gp_regs;
+         kern_return_t ret;
          unsigned int gp_count = x86_THREAD_STATE_COUNT;
 
          ret = thread_get_state
            (current_thread, x86_THREAD_STATE, (thread_state_t) &gp_regs,
             &gp_count);
-          MACH_CHECK_ERROR (ret);
+         MACH_CHECK_ERROR (ret);
          gdb_assert (gp_regs.tsh.flavor == x86_THREAD_STATE64);
-          gdb_assert (gp_regs.tsh.count == x86_THREAD_STATE64_COUNT);
+         gdb_assert (gp_regs.tsh.count == x86_THREAD_STATE64_COUNT);
 
          amd64_collect_native_gregset (regcache, &gp_regs.uts, regno);
 
@@ -201,24 +200,24 @@ i386_darwin_nat_target::store_registers (struct regcache *regcache,
          gp_regs.uts.ts64.__fs &= 0xffff;
          gp_regs.uts.ts64.__gs &= 0xffff;
 
-          ret = thread_set_state (current_thread, x86_THREAD_STATE,
-                                  (thread_state_t) &gp_regs,
-                                  x86_THREAD_STATE_COUNT);
-          MACH_CHECK_ERROR (ret);
-        }
+         ret = thread_set_state (current_thread, x86_THREAD_STATE,
+                                 (thread_state_t) &gp_regs,
+                                 x86_THREAD_STATE_COUNT);
+         MACH_CHECK_ERROR (ret);
+       }
 
       if (regno == -1 || !amd64_native_gregset_supplies_p (gdbarch, regno))
-        {
-          x86_float_state_t fp_regs;
-          kern_return_t ret;
+       {
+         x86_float_state_t fp_regs;
+         kern_return_t ret;
          unsigned int fp_count = x86_FLOAT_STATE_COUNT;
 
          ret = thread_get_state
            (current_thread, x86_FLOAT_STATE, (thread_state_t) & fp_regs,
             &fp_count);
-          MACH_CHECK_ERROR (ret);
-          gdb_assert (fp_regs.fsh.flavor == x86_FLOAT_STATE64);
-          gdb_assert (fp_regs.fsh.count == x86_FLOAT_STATE64_COUNT);
+         MACH_CHECK_ERROR (ret);
+         gdb_assert (fp_regs.fsh.flavor == x86_FLOAT_STATE64);
+         gdb_assert (fp_regs.fsh.count == x86_FLOAT_STATE64_COUNT);
 
          amd64_collect_fxsave (regcache, regno, &fp_regs.ufs.fs64.__fpu_fcw);
 
@@ -226,45 +225,44 @@ i386_darwin_nat_target::store_registers (struct regcache *regcache,
                                  (thread_state_t) & fp_regs,
                                  x86_FLOAT_STATE_COUNT);
          MACH_CHECK_ERROR (ret);
-        }
+       }
     }
   else
 #endif
     {
       if (regno == -1 || regno < I386_NUM_GREGS)
-        {
-          x86_thread_state32_t gp_regs;
-          kern_return_t ret;
-          unsigned int gp_count = x86_THREAD_STATE32_COUNT;
+       {
+         x86_thread_state32_t gp_regs;
+         kern_return_t ret;
+         unsigned int gp_count = x86_THREAD_STATE32_COUNT;
          int i;
 
-          ret = thread_get_state
-            (current_thread, x86_THREAD_STATE32, (thread_state_t) &gp_regs,
-             &gp_count);
+         ret = thread_get_state
+           (current_thread, x86_THREAD_STATE32, (thread_state_t) &gp_regs,
+            &gp_count);
          MACH_CHECK_ERROR (ret);
 
          for (i = 0; i < I386_NUM_GREGS; i++)
            if (regno == -1 || regno == i)
-             regcache_raw_collect
-               (regcache, i,
-                (char *)&gp_regs + i386_darwin_thread_state_reg_offset[i]);
+             regcache->raw_collect
+               (i, (char *) &gp_regs + i386_darwin_thread_state_reg_offset[i]);
 
-          ret = thread_set_state (current_thread, x86_THREAD_STATE32,
-                                  (thread_state_t) &gp_regs,
-                                  x86_THREAD_STATE32_COUNT);
-          MACH_CHECK_ERROR (ret);
-        }
+         ret = thread_set_state (current_thread, x86_THREAD_STATE32,
+                                 (thread_state_t) &gp_regs,
+                                 x86_THREAD_STATE32_COUNT);
+         MACH_CHECK_ERROR (ret);
+       }
 
       if (regno == -1
          || (regno >= I386_ST0_REGNUM && regno < I386_SSE_NUM_REGS))
-        {
-          x86_float_state32_t fp_regs;
-          unsigned int fp_count = x86_FLOAT_STATE32_COUNT;
-          kern_return_t ret;
+       {
+         x86_float_state32_t fp_regs;
+         unsigned int fp_count = x86_FLOAT_STATE32_COUNT;
+         kern_return_t ret;
 
          ret = thread_get_state
-            (current_thread, x86_FLOAT_STATE32, (thread_state_t) & fp_regs,
-             &fp_count);
+           (current_thread, x86_FLOAT_STATE32, (thread_state_t) & fp_regs,
+            &fp_count);
          MACH_CHECK_ERROR (ret);
 
          i387_collect_fxsave (regcache, regno, &fp_regs.__fpu_fcw);
@@ -273,7 +271,7 @@ i386_darwin_nat_target::store_registers (struct regcache *regcache,
                                  (thread_state_t) &fp_regs,
                                  x86_FLOAT_STATE32_COUNT);
          MACH_CHECK_ERROR (ret);
-        }
+       }
     }
 }
 
@@ -282,7 +280,6 @@ i386_darwin_nat_target::store_registers (struct regcache *regcache,
 static void
 i386_darwin_dr_set (int regnum, CORE_ADDR value)
 {
-  int current_pid;
   thread_t current_thread;
   x86_debug_state_t dr_regs;
   kern_return_t ret;
@@ -290,13 +287,13 @@ i386_darwin_dr_set (int regnum, CORE_ADDR value)
 
   gdb_assert (regnum >= 0 && regnum <= DR_CONTROL);
 
-  current_thread = ptid_get_tid (inferior_ptid);
+  current_thread = inferior_ptid.tid ();
 
   dr_regs.dsh.flavor = x86_DEBUG_STATE;
   dr_regs.dsh.count = x86_DEBUG_STATE_COUNT;
   dr_count = x86_DEBUG_STATE_COUNT;
   ret = thread_get_state (current_thread, x86_DEBUG_STATE,
-                          (thread_state_t) &dr_regs, &dr_count);
+                         (thread_state_t) &dr_regs, &dr_count);
   MACH_CHECK_ERROR (ret);
 
   switch (dr_regs.dsh.flavor)
@@ -364,7 +361,7 @@ i386_darwin_dr_set (int regnum, CORE_ADDR value)
     }
 
   ret = thread_set_state (current_thread, dr_regs.dsh.flavor,
-                          (thread_state_t) &dr_regs.uds, dr_count);
+                         (thread_state_t) &dr_regs.uds, dr_count);
 
   MACH_CHECK_ERROR (ret);
 }
@@ -379,13 +376,13 @@ i386_darwin_dr_get (int regnum)
 
   gdb_assert (regnum >= 0 && regnum <= DR_CONTROL);
 
-  current_thread = ptid_get_tid (inferior_ptid);
+  current_thread = inferior_ptid.tid ();
 
   dr_regs.dsh.flavor = x86_DEBUG_STATE;
   dr_regs.dsh.count = x86_DEBUG_STATE_COUNT;
   dr_count = x86_DEBUG_STATE_COUNT;
   ret = thread_get_state (current_thread, x86_DEBUG_STATE,
-                          (thread_state_t) &dr_regs, &dr_count);
+                         (thread_state_t) &dr_regs, &dr_count);
   MACH_CHECK_ERROR (ret);
 
   switch (dr_regs.dsh.flavor)
@@ -482,7 +479,6 @@ darwin_check_osabi (darwin_inferior *inf, thread_t thread)
     {
       /* Attaching to a process.  Let's figure out what kind it is.  */
       x86_thread_state_t gp_regs;
-      struct gdbarch_info info;
       unsigned int gp_count = x86_THREAD_STATE_COUNT;
       kern_return_t ret;
 
@@ -494,7 +490,7 @@ darwin_check_osabi (darwin_inferior *inf, thread_t thread)
          return;
        }
 
-      gdbarch_info_init (&info);
+      gdbarch_info info;
       gdbarch_info_fill (&info);
       info.byte_order = gdbarch_byte_order (target_gdbarch ());
       info.osabi = GDB_OSABI_DARWIN;
@@ -636,8 +632,9 @@ darwin_set_sstep (thread_t thread, int enable)
     }
 }
 
+void _initialize_i386_darwin_nat ();
 void
-_initialize_i386_darwin_nat (void)
+_initialize_i386_darwin_nat ()
 {
 #ifdef BFD64
   amd64_native_gregset64_reg_offset = amd64_darwin_thread_state_reg_offset;