Really remove tic30-aout support

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

diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index 75c9ad19f02b58000251a45496624f0e0d7bd54d..f9df155559a1022b9e53681af6461b6af576223d 100644 (file)
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -1,29 +1,30 @@
 /* Generic simulator watchpoint support.
 /* Generic simulator watchpoint support.

-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997-2020 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
    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.
 
 
 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 "config.h"

 #include "sim-main.h"
 #include "sim-options.h"
 
 #include "sim-assert.h"
 
 #include <ctype.h>
 #include "sim-main.h"
 #include "sim-options.h"
 
 #include "sim-assert.h"
 
 #include <ctype.h>

+#include <stdio.h>

 
 #ifdef HAVE_STRING_H
 #include <string.h>
 
 #ifdef HAVE_STRING_H
 #include <string.h>


@@ -101,7 +102,7 @@ do_watchpoint_delete (SIM_DESC sd,
          sim_watch_point *dead = (*entry);
          (*entry) = (*entry)->next;
          sim_events_deschedule (sd, dead->event);
          sim_watch_point *dead = (*entry);
          (*entry) = (*entry)->next;
          sim_events_deschedule (sd, dead->event);

-         zfree (dead);
+         free (dead);

          status = SIM_RC_OK;
        }
       else
          status = SIM_RC_OK;
        }
       else


@@ -110,7 +111,7 @@ do_watchpoint_delete (SIM_DESC sd,
   return status;
 }
 
   return status;
 }
 

-static char *
+static const char *

 watchpoint_type_to_str (SIM_DESC sd,
                        watchpoint_type type)
 {
 watchpoint_type_to_str (SIM_DESC sd,
                        watchpoint_type type)
 {


@@ -129,7 +130,7 @@ watchpoint_type_to_str (SIM_DESC sd,
   return NULL;
 }
 
   return NULL;
 }
 

-static char *
+static const char *

 interrupt_nr_to_str (SIM_DESC sd,
                     int interrupt_nr)
 {
 interrupt_nr_to_str (SIM_DESC sd,
                     int interrupt_nr)
 {


@@ -165,7 +166,7 @@ do_watchpoint_info (SIM_DESC sd)
       sim_io_printf (sd, "\n");
     }
 }
       sim_io_printf (sd, "\n");
     }
 }

-                   
+

 
 
 static sim_event_handler handle_watchpoint;
 
 
 static sim_event_handler handle_watchpoint;


@@ -221,7 +222,7 @@ handle_watchpoint (SIM_DESC sd, void *data)
     schedule_watchpoint (sd, point);
   else
     do_watchpoint_delete (sd, point->ident, invalid_watchpoint);
     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
   if (point->interrupt_nr == watch->nr_interrupts)
     sim_engine_halt (sd, NULL, NULL, NULL_CIA, sim_stopped, SIM_SIGINT);
   else


@@ -260,7 +261,7 @@ do_watchpoint_create (SIM_DESC sd,
        break;
       arg++;
     }
        break;
       arg++;
     }

-       
+

   (*point)->arg0 = strtoul (arg, &arg, 0);
   if (arg[0] == ',')
     (*point)->arg0 = strtoul (arg, NULL, 0);
   (*point)->arg0 = strtoul (arg, &arg, 0);
   if (arg[0] == ',')
     (*point)->arg0 = strtoul (arg, NULL, 0);


@@ -283,7 +284,7 @@ watchpoint_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
   else
     switch (opt)
       {
   else
     switch (opt)
       {

-       
+

       case OPTION_WATCH_DELETE:
        if (isdigit ((int) arg[0]))
          {
       case OPTION_WATCH_DELETE:
        if (isdigit ((int) arg[0]))
          {


@@ -337,19 +338,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;
          }
        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;
        }
       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;
       default:
        sim_io_eprintf (sd, "Unknown watch option %d\n", opt);
        return SIM_RC_FAIL;

-       
+

       }
       }

-  
+

 }
 
 
 }
 
 


@@ -373,16 +374,16 @@ static const OPTION watchpoint_options[] =
 {
   { {"watch-delete", required_argument, NULL, OPTION_WATCH_DELETE },
       '\0', "IDENT|all|pc|cycles|clock", "Delete a watchpoint",
 {
   { {"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",
 
   { {"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, };

 
 
 
 
 
 


@@ -412,9 +413,10 @@ sim_watchpoint_install (SIM_DESC sd)
            char *name;
            int nr = interrupt_nr * nr_watchpoint_types + type;
            OPTION *option = &int_options[nr];
            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->opt.name = name;
            option->opt.has_arg = required_argument;
            option->opt.val = type_to_option (sd, type, interrupt_nr);


@@ -426,7 +428,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. */
     {
     /* 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;
        "Watch the simulator, take ACTION in COUNT cycles (`+' for every COUNT cycles), ACTION is";
       char *doc;
       int len = strlen (prefix) + 1;