sim: reorder header includes

[binutils-gdb.git] / sim / common / hw-alloc.c

diff --git a/sim/common/hw-alloc.c b/sim/common/hw-alloc.c
index e64ae82997e5f0effa052817bc64933fda8d1486..b3633da4858a8a19420e831285689644dadcb8ca 100644 (file)
--- a/sim/common/hw-alloc.c
+++ b/sim/common/hw-alloc.c
@@ -1,35 +1,33 @@
 /* Hardware memory allocator.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998-2021 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
 
 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, or (at your option)
-any later version.
+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,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.,
-59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
+
+#include <stdlib.h>
 
 #include "hw-main.h"
 #include "hw-base.h"
 
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-struct hw_alloc_data {
+struct hw_alloc_data
+{
   void *alloc;
-  int zalloc_p;
   struct hw_alloc_data *next;
 };
 
@@ -42,8 +40,6 @@ create_hw_alloc_data (struct hw *me)
 void
 delete_hw_alloc_data (struct hw *me)
 {
-  if (me->alloc_of_hw != NULL)
-    hw_abort (me, "hw-alloc botch");
   while (me->alloc_of_hw != NULL)
     {
       hw_free (me, me->alloc_of_hw->alloc);
@@ -57,7 +53,6 @@ hw_zalloc (struct hw *me, unsigned long size)
 {
   struct hw_alloc_data *memory = ZALLOC (struct hw_alloc_data);
   memory->alloc = zalloc (size);
-  memory->zalloc_p = 1;
   memory->next = me->alloc_of_hw;
   me->alloc_of_hw = memory;
   return memory->alloc;
@@ -68,7 +63,6 @@ hw_malloc (struct hw *me, unsigned long size)
 {
   struct hw_alloc_data *memory = ZALLOC (struct hw_alloc_data);
   memory->alloc = zalloc (size);
-  memory->zalloc_p = 0;
   memory->next = me->alloc_of_hw;
   me->alloc_of_hw = memory;
   return memory->alloc;
@@ -87,11 +81,8 @@ hw_free (struct hw *me,
        {
          struct hw_alloc_data *die = (*memory);
          (*memory) = die->next;
-         if (die->zalloc_p)
-           zfree (die->alloc);
-         else
-           free (die->alloc);
-         zfree (die);
+         free (die->alloc);
+         free (die);
          return;
        }
     }