X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=sim%2Fcommon%2Fsim-watch.c;h=281b352267767d073c5a1b02fcaadee33db479ef;hb=c5a570810022466eaa5e077cd1b8aa00d74706f1;hp=ccef4fe851c9062c9fb91e09b8cfdeb0d308ea4c;hpb=7b6bb8daaceb9ecf3f42dea57ae82733d6a3b2f6;p=thirdparty%2Fbinutils-gdb.git

diff --git a/sim/common/sim-watch.c b/sim/common/sim-watch.c
index ccef4fe851c..281b3522677 100644
--- a/sim/common/sim-watch.c
+++ b/sim/common/sim-watch.c
@@ -1,6 +1,5 @@
 /* Generic simulator watchpoint support.
-   Copyright (C) 1997, 2007, 2008, 2009, 2010, 2011
-   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.
@@ -101,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
@@ -165,7 +164,7 @@ do_watchpoint_info (SIM_DESC sd)
       sim_io_printf (sd, "\n");
     }
 }
-		    
+
 
 
 static sim_event_handler handle_watchpoint;
@@ -221,7 +220,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
@@ -260,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);
@@ -283,7 +282,7 @@ watchpoint_option_handler (SIM_DESC sd, sim_cpu *cpu, int opt,
   else
     switch (opt)
       {
-	
+
       case OPTION_WATCH_DELETE:
 	if (isdigit ((int) arg[0]))
 	  {
@@ -337,19 +336,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;
-	
+
       }
-  
+
 }
 
 
@@ -412,9 +411,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);