Decouple inferior_ptid/inferior_thread(); dup ptids in thread list (PR 25412)

[deliverable/binutils-gdb.git] / sim / m32c / load.c

diff --git a/sim/m32c/load.c b/sim/m32c/load.c
index 8b3545caea1187c6e114ab911225eb4ad5f77f54..8db4a92951c620bbad0f26abaa72aff2192a8645 100644 (file)
--- a/sim/m32c/load.c
+++ b/sim/m32c/load.c
@@ -1,6 +1,6 @@
 /* load.c --- loading object files into the M32C simulator.
 
 /* load.c --- loading object files into the M32C simulator.
 

-Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc.
+Copyright (C) 2005-2020 Free Software Foundation, Inc.

 Contributed by Red Hat, Inc.
 
 This file is part of the GNU simulators.
 Contributed by Red Hat, Inc.
 
 This file is part of the GNU simulators.


@@ -18,7 +18,7 @@ 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, see <http://www.gnu.org/licenses/>.  */
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 

-
+#include "config.h"

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>


@@ -27,8 +27,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "cpu.h"
 #include "mem.h"
 
 #include "cpu.h"
 #include "mem.h"

+#include "load.h"

 
 

-int (*decode_opcode) () = 0;
+int (*decode_opcode) (void) = 0;

 int default_machine = 0;
 
 void
 int default_machine = 0;
 
 void


@@ -73,11 +74,11 @@ m32c_load (bfd * prog)
          remains as a reminder.  */
       if ((s->flags & SEC_ALLOC) && !(s->flags & SEC_READONLY))
        {
          remains as a reminder.  */
       if ((s->flags & SEC_ALLOC) && !(s->flags & SEC_READONLY))
        {

-         if (strcmp (bfd_get_section_name (prog, s), ".stack"))
+         if (strcmp (bfd_section_name (s), ".stack"))

            {
              int secend =
            {
              int secend =

-               bfd_get_section_size (s) + bfd_section_lma (prog, s);
-             if (heaptop < secend && bfd_section_lma (prog, s) < 0x10000)
+               bfd_section_size (s) + bfd_section_lma (s);
+             if (heaptop < secend && bfd_section_lma (s) < 0x10000)

                {
                  heaptop = heapbottom = secend;
                }
                {
                  heaptop = heapbottom = secend;
                }


@@ -88,15 +89,16 @@ m32c_load (bfd * prog)
        {
          char *buf;
          bfd_size_type size;
        {
          char *buf;
          bfd_size_type size;

+         bfd_vma base;

 
 

-         size = bfd_get_section_size (s);
+         size = bfd_section_size (s);

          if (size <= 0)
            continue;
 
          if (size <= 0)
            continue;
 

-         bfd_vma base = bfd_section_lma (prog, s);
+         base = bfd_section_lma (s);

          if (verbose)
            fprintf (stderr, "[load a=%08x s=%08x %s]\n",
          if (verbose)
            fprintf (stderr, "[load a=%08x s=%08x %s]\n",

-                    (int) base, (int) size, bfd_get_section_name (prog, s));
+                    (int) base, (int) size, bfd_section_name (s));

          buf = (char *) malloc (size);
          bfd_get_section_contents (prog, s, buf, 0, size);
          mem_put_blk (base, buf, size);
          buf = (char *) malloc (size);
          bfd_get_section_contents (prog, s, buf, 0, size);
          mem_put_blk (base, buf, size);