X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fhw-handles.c;h=1f92cd4d2ed9869e834794344d89b82bb28a46d6;hb=423054beadf317757d43aefb9eddfe711a42e3e1;hp=9400ca82e92b4f29e06cc8358c956c01d9c4b21a;hpb=8b0b198558d0fc981f129e2e3dcbe00a0f308449;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/hw-handles.c b/sim/common/hw-handles.c
index 9400ca82e9..1f92cd4d2e 100644
--- a/sim/common/hw-handles.c
+++ b/sim/common/hw-handles.c
@@ -1,29 +1,34 @@
-/*  This file is part of the program psim.
+/* The common simulator framework for GDB, the GNU Debugger.
 
-    Copyright (C) 1994-1995,1997-1998, Andrew Cagney <cagney@highland.com.au>
+   Copyright 2002-2020 Free Software Foundation, Inc.
 
-    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
-    (at your option) any later version.
+   Contributed by Andrew Cagney and Red Hat.
 
-    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.
- 
-    */
+   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 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, see <http://www.gnu.org/licenses/>.  */
 
 
 #include "hw-main.h"
 #include "hw-base.h"
 
+#if HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
 
-struct hw_handle_mapping {
+struct hw_handle_mapping
+{
   cell_word external;
   struct hw *phandle;
   struct hw_instance *ihandle;
@@ -31,7 +36,8 @@ struct hw_handle_mapping {
 };
 
 
-struct hw_handle_data {
+struct hw_handle_data
+{
   int nr_mappings;
   struct hw_handle_mapping *mappings;
 };
@@ -154,7 +160,7 @@ hw_handle_add_ihandle (struct hw *hw,
 		       struct hw_instance *internal)
 {
   struct hw_handle_data *db = hw->handles_of_hw;
-  if (hw_handle_2ihandle (hw, internal) != 0) 
+  if (hw_handle_2ihandle (hw, internal) != 0)
     {
       hw_abort (hw, "attempting to add an ihandle already in the data base");
     }
@@ -176,7 +182,7 @@ hw_handle_add_phandle (struct hw *hw,
 		       struct hw *internal)
 {
   struct hw_handle_data *db = hw->handles_of_hw;
-  if (hw_handle_2phandle (hw, internal) != 0) 
+  if (hw_handle_2phandle (hw, internal) != 0)
     {
       hw_abort (hw, "attempting to add a phandle already in the data base");
     }
@@ -205,7 +211,7 @@ hw_handle_remove_ihandle (struct hw *hw,
 	{
 	  struct hw_handle_mapping *delete = *current_map;
 	  *current_map = delete->next;
-	  zfree (delete);
+	  free (delete);
 	  return;
 	}
       current_map = &(*current_map)->next;
@@ -226,12 +232,10 @@ hw_handle_remove_phandle (struct hw *hw,
 	{
 	  struct hw_handle_mapping *delete = *current_map;
 	  *current_map = delete->next;
-	  zfree (delete);
+	  free (delete);
 	  return;
 	}
       current_map = &(*current_map)->next;
     }
   hw_abort (hw, "attempt to remove nonexistant phandle");
 }
-
-