Fix crash when TUI window creation fails

[deliverable/binutils-gdb.git] / gdb / sparc-linux-nat.c

diff --git a/gdb/sparc-linux-nat.c b/gdb/sparc-linux-nat.c
index afbccdf1d4237058316cb7d8fa4513cb9017b868..1489d0980e1c786a71b5aefdd45f154815af18ef 100644 (file)
--- a/gdb/sparc-linux-nat.c
+++ b/gdb/sparc-linux-nat.c
@@ -1,11 +1,11 @@
 /* Native-dependent code for GNU/Linux SPARC.
 /* Native-dependent code for GNU/Linux SPARC.

-   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005-2020 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,


@@ -14,9 +14,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., 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 "regcache.h"
 
 #include "defs.h"
 #include "regcache.h"


@@ -30,44 +28,51 @@
 #include "target.h"
 #include "linux-nat.h"
 
 #include "target.h"
 #include "linux-nat.h"
 

+class sparc_linux_nat_target final : public linux_nat_target
+{
+public:
+  /* Add our register access methods.  */
+  void fetch_registers (struct regcache *regcache, int regnum) override
+  { sparc_fetch_inferior_registers (regcache, regnum); }
+
+  void store_registers (struct regcache *regcache, int regnum) override
+  { sparc_store_inferior_registers (regcache, regnum); }
+};
+
+static sparc_linux_nat_target the_sparc_linux_nat_target;
+

 void
 supply_gregset (struct regcache *regcache, const prgregset_t *gregs)
 {
 void
 supply_gregset (struct regcache *regcache, const prgregset_t *gregs)
 {

-  sparc32_supply_gregset (sparc_gregset, regcache, -1, gregs);
+  sparc32_supply_gregset (sparc_gregmap, regcache, -1, gregs);

 }
 
 void
 supply_fpregset (struct regcache *regcache, const prfpregset_t *fpregs)
 {
 }
 
 void
 supply_fpregset (struct regcache *regcache, const prfpregset_t *fpregs)
 {

-  sparc32_supply_fpregset (regcache, -1, fpregs);
+  sparc32_supply_fpregset (sparc_fpregmap, regcache, -1, fpregs);

 }
 
 void
 fill_gregset (const struct regcache *regcache, prgregset_t *gregs, int regnum)
 {
 }
 
 void
 fill_gregset (const struct regcache *regcache, prgregset_t *gregs, int regnum)
 {

-  sparc32_collect_gregset (sparc_gregset, regcache, regnum, gregs);
+  sparc32_collect_gregset (sparc_gregmap, regcache, regnum, gregs);

 }
 
 void
 }
 
 void

-fill_fpregset (const struct regcache *regcache, prfpregset_t *fpregs, int regnum)
+fill_fpregset (const struct regcache *regcache,
+              prfpregset_t *fpregs, int regnum)

 {
 {

-  sparc32_collect_fpregset (regcache, regnum, fpregs);
+  sparc32_collect_fpregset (sparc_fpregmap, regcache, regnum, fpregs);

 }
 
 }
 

-void _initialialize_sparc_linux_nat (void);
-
+void _initialize_sparc_linux_nat ();

 void
 void

-_initialize_sparc_linux_nat (void)
+_initialize_sparc_linux_nat ()

 {
 {

-  struct target_ops *t;
-
-  /* Fill in the generic GNU/Linux methods.  */
-  t = linux_target ();
-
-  /* Add our register access methods.  */
-  t->to_fetch_registers = sparc_fetch_inferior_registers;
-  t->to_store_registers = sparc_store_inferior_registers;
+  sparc_fpregmap = &sparc32_bsd_fpregmap;

 
   /* Register the target.  */
 
   /* Register the target.  */

-  linux_nat_add_target (t);
+  linux_target = &the_sparc_linux_nat_target;
+  add_inf_child_target (&the_sparc_linux_nat_target);

 }
 }