* sim-options.c (standard_options): Fix the names of H8

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

diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index d1643b655b1f0a484de9beb3175ddeffc0dc1954..75c9ad19f02b58000251a45496624f0e0d7bd54d 100644 (file)
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -37,9 +37,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,7 +223,7 @@ 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, &watch->interrupt_names[interrupt_nr]);
 }
@@ -278,11 +275,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);
@@ -399,7 +393,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;
@@ -426,6 +420,7 @@ sim_watchpoint_install (SIM_DESC sd)
            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
@@ -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;
 }