* corelow.c (core_open): Flush the register cache before doing

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

diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index 5df898bd3e5cda85b8f35e5372ab7d4fe2e81582..d9360ec3f33a655c6c1c60cae84a0f21211683d8 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, 2008, 2009 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,
 
@@ -226,9 +222,9 @@ handle_watchpoint (SIM_DESC sd, void *data)
     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, &interrupt_nr);
+    watch->interrupt_handler (sd, &watch->interrupt_names[interrupt_nr]);
 }
 
 
@@ -278,11 +274,8 @@ 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);
@@ -388,12 +381,6 @@ static const OPTION watchpoint_options[] =
   { {NULL, no_argument, NULL, 0}, '\0', NULL, NULL, NULL }
 };
 
-static const OPTION template_int_option = {
-  { NULL, required_argument, NULL, 0 },
-  '\0', "VALUE", "Create the specified watchpoint",
-  watchpoint_option_handler,
-};
-
 static char *default_interrupt_names[] = { "int", 0, };
 
 
@@ -405,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;
@@ -421,18 +408,50 @@ sim_watchpoint_install (SIM_DESC sd)
        watchpoint_type type;
        for (type = 0; type < nr_watchpoint_types; type++)
          {
+           char *name;
            int nr = interrupt_nr * nr_watchpoint_types + type;
            OPTION *option = &int_options[nr];
-           char *name;
-           *option = template_int_option;
            asprintf (&name, "watch-%s-%s",
                      watchpoint_type_to_str (sd, type),
                      interrupt_nr_to_str (sd, interrupt_nr));
            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;
          }
       }
-    sim_add_option_table (sd, int_options);
+    /* adjust first few entries so that they contain real
+       documentation, the first entry includes a list of actions. */
+    {
+      char *prefix = 
+       "Watch the simulator, take ACTION in COUNT cycles (`+' for every COUNT cycles), ACTION is";
+      char *doc;
+      int len = strlen (prefix) + 1;
+      for (interrupt_nr = 0; interrupt_nr <= watch->nr_interrupts; interrupt_nr++)
+       len += strlen (interrupt_nr_to_str (sd, interrupt_nr)) + 1;
+      doc = NZALLOC (char, len);
+      strcpy (doc, prefix);
+      for (interrupt_nr = 0; interrupt_nr <= watch->nr_interrupts; interrupt_nr++)
+       {
+         strcat (doc, " ");
+         strcat (doc, interrupt_nr_to_str (sd, interrupt_nr));
+       }
+      int_options[0].doc_name = "watch-cycles-ACTION";
+      int_options[0].arg = "[+]COUNT";
+      int_options[0].doc = doc;
+    }
+    int_options[1].doc_name = "watch-pc-ACTION";
+    int_options[1].arg = "[!]ADDRESS";
+    int_options[1].doc =
+      "Watch the PC, take ACTION when matches ADDRESS (in range ADDRESS,ADDRESS), `!' negates test";
+    int_options[2].doc_name = "watch-clock-ACTION";
+    int_options[2].arg = "[+]MILLISECONDS";
+    int_options[2].doc =
+      "Watch the clock, take ACTION after MILLISECONDS (`+' for every MILLISECONDS)";
+
+    sim_add_option_table (sd, NULL, int_options);
   }
   return SIM_RC_OK;
 }