sim: callback: drop unused printf helpers

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

diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index df8e1b87146072851a751b696be7289384e3006d..bc6c44bcfd17937796f7e0720ca468a4ca36a3b9 100644 (file)
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -1,5 +1,5 @@
 /* Generic simulator watchpoint support.
-   Copyright (C) 1997, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-2021 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
 This file is part of GDB, the GNU debugger.
@@ -17,24 +17,20 @@ 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/>.  */
 
+/* This must come before any other includes.  */
+#include "defs.h"
+
 #include "sim-main.h"
 #include "sim-options.h"
+#include "sim-signal.h"
+#include "libiberty.h"
 
 #include "sim-assert.h"
 
 #include <ctype.h>
-
-#ifdef HAVE_STRING_H
+#include <stdio.h>
 #include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 
 enum {
   OPTION_WATCH_DELETE                      = OPTION_START,
@@ -100,7 +96,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
@@ -109,7 +105,7 @@ do_watchpoint_delete (SIM_DESC sd,
   return status;
 }
 
-static char *
+static const char *
 watchpoint_type_to_str (SIM_DESC sd,
                        watchpoint_type type)
 {
@@ -128,7 +124,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)
 {
@@ -164,7 +160,7 @@ do_watchpoint_info (SIM_DESC sd)
       sim_io_printf (sd, "\n");
     }
 }
-                   
+
 
 
 static sim_event_handler handle_watchpoint;
@@ -174,18 +170,16 @@ schedule_watchpoint (SIM_DESC sd,
                     sim_watch_point *point)
 {
   sim_watchpoints *watch = STATE_WATCHPOINTS (sd);
+
   switch (point->type)
     {
     case pc_watchpoint:
-      point->event = sim_events_watch_sim (sd,
-                                          watch->pc,
-                                          watch->sizeof_pc,
-                                          0/* host-endian */,
-                                          point->is_within,
-                                          point->arg0, point->arg1,
-                                          /* PC in arg0..arg1 */
-                                          handle_watchpoint,
-                                          point);
+      point->event = sim_events_watch_pc (sd,
+                                         point->is_within,
+                                         point->arg0, point->arg1,
+                                         /* PC in arg0..arg1 */
+                                         handle_watchpoint,
+                                         point);
       return SIM_RC_OK;
     case clock_watchpoint:
       point->event = sim_events_watch_clock (sd,
@@ -220,7 +214,7 @@ 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, SIM_SIGINT);
   else
@@ -259,10 +253,10 @@ do_watchpoint_create (SIM_DESC sd,
        break;
       arg++;
     }
-       
+
   (*point)->arg0 = strtoul (arg, &arg, 0);
   if (arg[0] == ',')
-    (*point)->arg0 = strtoul (arg, NULL, 0);
+    (*point)->arg1 = strtoul (arg + 1, NULL, 0);
   else
     (*point)->arg1 = (*point)->arg0;
 
@@ -282,7 +276,7 @@ watchpoint_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
   else
     switch (opt)
       {
-       
+
       case OPTION_WATCH_DELETE:
        if (isdigit ((int) arg[0]))
          {
@@ -336,19 +330,19 @@ watchpoint_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
          }
        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;
-       
+
       }
-  
+
 }
 
 
@@ -372,18 +366,27 @@ 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, };
 
+/* This default handler is "good enough" for targets that just want to trap into
+   gdb when watchpoints are hit, and have only configured the STATE_WATCHPOINTS
+   pc field.  */
+static void
+default_interrupt_handler (SIM_DESC sd, void *data)
+{
+  sim_cpu *cpu = STATE_CPU (sd, 0);
+  address_word cia = CPU_PC_GET (cpu);
+  sim_engine_halt (sd, cpu, NULL, cia, sim_stopped, SIM_SIGTRAP);
+}
 
 SIM_RC
 sim_watchpoint_install (SIM_DESC sd)
@@ -396,6 +399,8 @@ sim_watchpoint_install (SIM_DESC sd)
   /* fill in some details */
   if (watch->interrupt_names == NULL)
     watch->interrupt_names = default_interrupt_names;
+  if (watch->interrupt_handler == NULL)
+    watch->interrupt_handler = default_interrupt_handler;
   watch->nr_interrupts = 0;
   while (watch->interrupt_names[watch->nr_interrupts] != NULL)
     watch->nr_interrupts++;
@@ -411,9 +416,10 @@ 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);
@@ -425,7 +431,7 @@ sim_watchpoint_install (SIM_DESC sd)
     /* 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;