X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-hw.c;h=7621ab92236411b2d8644fac090460ef3fa71fce;hb=030a2e78acf66c5c12e073ec3887a167da7a7195;hp=7db1aa303141619f786b8fec80ed8e95e87f4451;hpb=4744ac1bb0d2f2294c7762577262fdcafb67883b;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/common/sim-hw.c b/sim/common/sim-hw.c
index 7db1aa3031..7621ab9223 100644
--- a/sim/common/sim-hw.c
+++ b/sim/common/sim-hw.c
@@ -1,5 +1,5 @@
 /* Simulator hardware option handling.
-   Copyright (C) 1998, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1998-2020 Free Software Foundation, Inc.
    Contributed by Cygnus Support and Andrew Cagney.
 
 This file is part of GDB, the GNU debugger.
@@ -110,31 +110,31 @@ static const OPTION hw_options[] =
 {
   { {"hw-info", no_argument, NULL, OPTION_HW_INFO },
       '\0', NULL, "List configurable hw regions",
-      hw_option_handler },
+      hw_option_handler, NULL },
   { {"info-hw", no_argument, NULL, OPTION_HW_INFO },
       '\0', NULL, NULL,
-      hw_option_handler },
+      hw_option_handler, NULL },
 
   { {"hw-trace", optional_argument, NULL, OPTION_HW_TRACE },
       '\0', "on|off", "Trace all hardware devices",
-      hw_option_handler },
+      hw_option_handler, NULL },
   { {"trace-hw", optional_argument, NULL, OPTION_HW_TRACE },
       '\0', NULL, NULL,
-      hw_option_handler },
+      hw_option_handler, NULL },
 
   { {"hw-device", required_argument, NULL, OPTION_HW_DEVICE },
       '\0', "DEVICE", "Add the specified device",
-      hw_option_handler },
+      hw_option_handler, NULL },
 
   { {"hw-list", no_argument, NULL, OPTION_HW_LIST },
       '\0', NULL, "List the device tree",
-      hw_option_handler },
+      hw_option_handler, NULL },
 
   { {"hw-file", required_argument, NULL, OPTION_HW_FILE },
       '\0', "FILE", "Add the devices listed in the file",
-      hw_option_handler },
+      hw_option_handler, NULL },
 
-  { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL }
+  { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL, NULL }
 };
 
 
@@ -149,7 +149,7 @@ merge_device_file (struct sim_state *sd,
   struct hw *current = STATE_HW (sd)->tree;
   int line_nr;
   char device_path[1000];
-  
+
   /* try opening the file */
   description = fopen (file_name, "r");
   if (description == NULL)
@@ -157,9 +157,9 @@ merge_device_file (struct sim_state *sd,
       perror (file_name);
       return SIM_RC_FAIL;
     }
-  
+
   line_nr = 0;
-  while (fgets (device_path, sizeof(device_path), description))
+  while (fgets (device_path, sizeof (device_path), description))
     {
       char *device;
       /* check that a complete line was read */
@@ -194,13 +194,13 @@ merge_device_file (struct sim_state *sd,
 	      sim_io_eprintf (sd, "%s:%d: unexpected eof", file_name, line_nr);
 	      return SIM_RC_FAIL;
 	    }
-	  if (strchr(device_path, '\n') == NULL)
+	  if (strchr (device_path, '\n') == NULL)
 	    {
-	      fclose(description);
+	      fclose (description);
 	      sim_io_eprintf (sd, "%s:%d: line to long", file_name, line_nr);
 	      return SIM_RC_FAIL;
 	    }
-	  *strchr(device_path, '\n') = '\0';
+	  *strchr (device_path, '\n') = '\0';
 	  line_nr++;
 	}
       /* parse this line */
@@ -257,7 +257,7 @@ hw_option_handler (struct sim_state *sd, sim_cpu *cpu, int opt,
 
     case OPTION_HW_DEVICE:
       {
-	hw_tree_parse (STATE_HW (sd)->tree, arg);
+	hw_tree_parse (STATE_HW (sd)->tree, "%s", arg);
 	return SIM_RC_OK;
       }
 
@@ -266,7 +266,7 @@ hw_option_handler (struct sim_state *sd, sim_cpu *cpu, int opt,
 	sim_hw_print (sd, sim_io_vprintf);
 	return SIM_RC_OK;
       }
-  
+
     case OPTION_HW_FILE:
       {
 	return merge_device_file (sd, arg);
@@ -318,8 +318,8 @@ sim_hw_init (struct sim_state *sd)
 static void
 sim_hw_uninstall (struct sim_state *sd)
 {
-  /* hw_tree_delete (STATE_HW (sd)->tree); */
-  zfree (STATE_HW (sd));
+  hw_tree_delete (STATE_HW (sd)->tree);
+  free (STATE_HW (sd));
   STATE_HW (sd) = NULL;
 }
 
@@ -332,7 +332,7 @@ sim_hw_uninstall (struct sim_state *sd)
 /* CPU: The simulation is running and the current CPU/CIA
    initiates a data transfer. */
 
-void 
+void
 sim_cpu_hw_io_read_buffer (sim_cpu *cpu,
 			   sim_cia cia,
 			   struct hw *hw,
@@ -348,7 +348,7 @@ sim_cpu_hw_io_read_buffer (sim_cpu *cpu,
     sim_engine_abort (sd, cpu, cia, "broken CPU read");
 }
 
-void 
+void
 sim_cpu_hw_io_write_buffer (sim_cpu *cpu,
 			    sim_cia cia,
 			    struct hw *hw,
@@ -369,7 +369,7 @@ sim_cpu_hw_io_write_buffer (sim_cpu *cpu,
 
 /* SYSTEM: A data transfer is being initiated by the system. */
 
-unsigned 
+unsigned
 sim_hw_io_read_buffer (struct sim_state *sd,
 		       struct hw *hw,
 		       void *dest,