gdb: fix vfork with multiple threads

[deliverable/binutils-gdb.git] / gdb / std-regs.c

diff --git a/gdb/std-regs.c b/gdb/std-regs.c
index 22f743d9caf8ed793b4a64bd0d9a3271ab662132..9d1cd13c2dd85aebc7aaa2e8af71b39b14e15638 100644 (file)
--- a/gdb/std-regs.c
+++ b/gdb/std-regs.c
@@ -1,6 +1,6 @@
 /* Builtin frame register, for GDB, the GNU debugger.
 
-   Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2021 Free Software Foundation, Inc.
 
    Contributed by Red Hat.
 
@@ -8,7 +8,7 @@
 
    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,
@@ -17,39 +17,37 @@
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "user-regs.h"
 #include "frame.h"
 #include "gdbtypes.h"
 #include "value.h"
-#include "gdb_string.h"
-
+#include "gdbarch.h"
 
 static struct value *
 value_of_builtin_frame_fp_reg (struct frame_info *frame, const void *baton)
 {
-  if (gdbarch_deprecated_fp_regnum (current_gdbarch) >= 0)
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+
+  if (gdbarch_deprecated_fp_regnum (gdbarch) >= 0)
     /* NOTE: cagney/2003-04-24: Since the mere presence of "fp" in the
        register name table overrides this built-in $fp register, there
        is no real reason for this gdbarch_deprecated_fp_regnum trickery here.
        An architecture wanting to implement "$fp" as alias for a raw
        register can do so by adding "fp" to register name table (mind
        you, doing this is probably a dangerous thing).  */
-    return value_of_register (gdbarch_deprecated_fp_regnum (current_gdbarch),
+    return value_of_register (gdbarch_deprecated_fp_regnum (gdbarch),
                              frame);
   else
     {
-      struct value *val = allocate_value (builtin_type_void_data_ptr);
+      struct type *data_ptr_type = builtin_type (gdbarch)->builtin_data_ptr;
+      struct value *val = allocate_value (data_ptr_type);
       gdb_byte *buf = value_contents_raw (val);
-      if (frame == NULL)
-       memset (buf, 0, TYPE_LENGTH (value_type (val)));
-      else
-       gdbarch_address_to_pointer (current_gdbarch, builtin_type_void_data_ptr,
-                                   buf, get_frame_base_address (frame));
+
+      gdbarch_address_to_pointer (gdbarch, data_ptr_type,
+                                 buf, get_frame_base_address (frame));
       return val;
     }
 }
@@ -57,17 +55,18 @@ value_of_builtin_frame_fp_reg (struct frame_info *frame, const void *baton)
 static struct value *
 value_of_builtin_frame_pc_reg (struct frame_info *frame, const void *baton)
 {
-  if (gdbarch_pc_regnum (current_gdbarch) >= 0)
-    return value_of_register (gdbarch_pc_regnum (current_gdbarch), frame);
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+
+  if (gdbarch_pc_regnum (gdbarch) >= 0)
+    return value_of_register (gdbarch_pc_regnum (gdbarch), frame);
   else
     {
-      struct value *val = allocate_value (builtin_type_void_data_ptr);
+      struct type *func_ptr_type = builtin_type (gdbarch)->builtin_func_ptr;
+      struct value *val = allocate_value (func_ptr_type);
       gdb_byte *buf = value_contents_raw (val);
-      if (frame == NULL)
-       memset (buf, 0, TYPE_LENGTH (value_type (val)));
-      else
-       gdbarch_address_to_pointer (current_gdbarch, builtin_type_void_data_ptr,
-                                    buf, get_frame_pc (frame));
+
+      gdbarch_address_to_pointer (gdbarch, func_ptr_type,
+                                 buf, get_frame_pc (frame));
       return val;
     }
 }
@@ -75,23 +74,26 @@ value_of_builtin_frame_pc_reg (struct frame_info *frame, const void *baton)
 static struct value *
 value_of_builtin_frame_sp_reg (struct frame_info *frame, const void *baton)
 {
-  if (gdbarch_sp_regnum (current_gdbarch) >= 0)
-    return value_of_register (gdbarch_sp_regnum (current_gdbarch), frame);
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+
+  if (gdbarch_sp_regnum (gdbarch) >= 0)
+    return value_of_register (gdbarch_sp_regnum (gdbarch), frame);
   error (_("Standard register ``$sp'' is not available for this target"));
 }
 
 static struct value *
 value_of_builtin_frame_ps_reg (struct frame_info *frame, const void *baton)
 {
-  if (gdbarch_ps_regnum (current_gdbarch) >= 0)
-    return value_of_register (gdbarch_ps_regnum (current_gdbarch), frame);
+  struct gdbarch *gdbarch = get_frame_arch (frame);
+
+  if (gdbarch_ps_regnum (gdbarch) >= 0)
+    return value_of_register (gdbarch_ps_regnum (gdbarch), frame);
   error (_("Standard register ``$ps'' is not available for this target"));
 }
 
-extern initialize_file_ftype _initialize_frame_reg; /* -Wmissing-prototypes */
-
+void _initialize_frame_reg ();
 void
-_initialize_frame_reg (void)
+_initialize_frame_reg ()
 {
   /* Frame based $fp, $pc, $sp and $ps.  These only come into play
      when the target does not define its own version of these