Copyright year update in most files of the GDB Project.

[thirdparty/binutils-gdb.git] / sim / common / sim-watch.c

diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index d1643b655b1f0a484de9beb3175ddeffc0dc1954..281b352267767d073c5a1b02fcaadee33db479ef 100644 (file)
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -1,22 +1,21 @@
 /* Generic simulator watchpoint support.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2007-2012 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/>.  */
 
 #include "sim-main.h"
 #include "sim-options.h"
@@ -37,9 +36,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <stdlib.h>
 #endif
 
-#include <signal.h>
-
-
 enum {
   OPTION_WATCH_DELETE                      = OPTION_START,
 
@@ -104,7 +100,7 @@ do_watchpoint_delete (SIM_DESC sd,
          sim_watch_point *dead = (*entry);
          (*entry) = (*entry)->next;
          sim_events_deschedule (sd, dead->event);
-         zfree (dead);
+         free (dead);
          status = SIM_RC_OK;
        }
       else
@@ -113,7 +109,7 @@ do_watchpoint_delete (SIM_DESC sd,
   return status;
 }
 
-static char *
+static const char *
 watchpoint_type_to_str (SIM_DESC sd,
                        watchpoint_type type)
 {
@@ -132,7 +128,7 @@ watchpoint_type_to_str (SIM_DESC sd,
   return NULL;
 }
 
-static char *
+static const char *
 interrupt_nr_to_str (SIM_DESC sd,
                     int interrupt_nr)
 {
@@ -168,7 +164,7 @@ do_watchpoint_info (SIM_DESC sd)
       sim_io_printf (sd, "\n");
     }
 }
-                   
+
 
 
 static sim_event_handler handle_watchpoint;
@@ -224,9 +220,9 @@ handle_watchpoint (SIM_DESC sd, void *data)
     schedule_watchpoint (sd, point);
   else
     do_watchpoint_delete (sd, point->ident, invalid_watchpoint);
-    
+
   if (point->interrupt_nr == watch->nr_interrupts)
-    sim_engine_halt (sd, NULL, NULL, NULL_CIA, sim_stopped, SIGINT);
+    sim_engine_halt (sd, NULL, NULL, NULL_CIA, sim_stopped, SIM_SIGINT);
   else
     watch->interrupt_handler (sd, &watch->interrupt_names[interrupt_nr]);
 }
@@ -263,7 +259,7 @@ do_watchpoint_create (SIM_DESC sd,
        break;
       arg++;
     }
-       
+
   (*point)->arg0 = strtoul (arg, &arg, 0);
   if (arg[0] == ',')
     (*point)->arg0 = strtoul (arg, NULL, 0);
@@ -278,18 +274,15 @@ do_watchpoint_create (SIM_DESC sd,
 
 
 static SIM_RC
-watchpoint_option_handler (sd, opt, arg, is_command)
-     SIM_DESC sd;
-     int opt;
-     char *arg;
-     int is_command;
+watchpoint_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
+                          char *arg, int is_command)
 {
   if (opt >= OPTION_WATCH_OP)
     return do_watchpoint_create (sd, clock_watchpoint, opt, arg);
   else
     switch (opt)
       {
-       
+
       case OPTION_WATCH_DELETE:
        if (isdigit ((int) arg[0]))
          {
@@ -343,19 +336,19 @@ watchpoint_option_handler (sd, opt, arg, is_command)
          }
        sim_io_eprintf (sd, "Unknown watchpoint type `%s'\n", arg);
        return SIM_RC_FAIL;
-       
+
       case OPTION_WATCH_INFO:
        {
          do_watchpoint_info (sd);
          return SIM_RC_OK;
        }
-      
+
       default:
        sim_io_eprintf (sd, "Unknown watch option %d\n", opt);
        return SIM_RC_FAIL;
-       
+
       }
-  
+
 }
 
 
@@ -379,16 +372,16 @@ static const OPTION watchpoint_options[] =
 {
   { {"watch-delete", required_argument, NULL, OPTION_WATCH_DELETE },
       '\0', "IDENT|all|pc|cycles|clock", "Delete a watchpoint",
-      watchpoint_option_handler },
+      watchpoint_option_handler, NULL },
 
   { {"watch-info", no_argument, NULL, OPTION_WATCH_INFO },
       '\0', NULL, "List scheduled watchpoints",
-      watchpoint_option_handler },
+      watchpoint_option_handler, NULL },
 
-  { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL }
+  { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL, NULL }
 };
 
-static char *default_interrupt_names[] = { "int", 0, };
+static const char *default_interrupt_names[] = { "int", 0, };
 
 
 
@@ -399,7 +392,7 @@ sim_watchpoint_install (SIM_DESC sd)
   SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER);
   /* the basic command set */
   sim_module_add_init_fn (sd, sim_watchpoint_init);
-  sim_add_option_table (sd, watchpoint_options);
+  sim_add_option_table (sd, NULL, watchpoint_options);
   /* fill in some details */
   if (watch->interrupt_names == NULL)
     watch->interrupt_names = default_interrupt_names;
@@ -418,20 +411,22 @@ sim_watchpoint_install (SIM_DESC sd)
            char *name;
            int nr = interrupt_nr * nr_watchpoint_types + type;
            OPTION *option = &int_options[nr];
-           asprintf (&name, "watch-%s-%s",
-                     watchpoint_type_to_str (sd, type),
-                     interrupt_nr_to_str (sd, interrupt_nr));
+           if (asprintf (&name, "watch-%s-%s",
+                         watchpoint_type_to_str (sd, type),
+                         interrupt_nr_to_str (sd, interrupt_nr)) < 0)
+             return SIM_RC_FAIL;
            option->opt.name = name;
            option->opt.has_arg = required_argument;
            option->opt.val = type_to_option (sd, type, interrupt_nr);
            option->doc = "";
            option->doc_name = "";
+           option->handler = watchpoint_option_handler;
          }
       }
     /* adjust first few entries so that they contain real
        documentation, the first entry includes a list of actions. */
     {
-      char *prefix = 
+      const char *prefix =
        "Watch the simulator, take ACTION in COUNT cycles (`+' for every COUNT cycles), ACTION is";
       char *doc;
       int len = strlen (prefix) + 1;
@@ -457,7 +452,7 @@ sim_watchpoint_install (SIM_DESC sd)
     int_options[2].doc =
       "Watch the clock, take ACTION after MILLISECONDS (`+' for every MILLISECONDS)";
 
-    sim_add_option_table (sd, int_options);
+    sim_add_option_table (sd, NULL, int_options);
   }
   return SIM_RC_OK;
 }