daily update

[external/binutils.git] / sim / common / hw-events.c

diff --git a/sim/common/hw-events.c b/sim/common/hw-events.c
index f60dfa3..544576b 100644 (file)
--- a/sim/common/hw-events.c
+++ b/sim/common/hw-events.c
@@ -1,22 +1,22 @@
 /* Hardware event manager.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2007, 2008, 2009, 2010, 2011
+   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 "hw-main.h"
@@ -27,7 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 /* The hw-events object is implemented using sim-events */
 
-struct hw_event {
+struct hw_event
+{
   void *data;
   struct hw *me;
   hw_event_callback *callback;
@@ -35,7 +36,8 @@ struct hw_event {
   struct hw_event_data *entry;
 };
 
-struct hw_event_data {
+struct hw_event_data
+{
   struct hw_event event;
   struct hw_event_data *next;
 };
@@ -51,8 +53,9 @@ create_hw_event_data (struct hw *me)
 void
 delete_hw_event_data (struct hw *me)
 {
-  if (me->events_of_hw != NULL)
-    hw_abort (me, "stray events");
+  /* Remove the scheduled event.  */
+  while (me->events_of_hw)
+    hw_event_queue_deschedule (me, &me->events_of_hw->event);
 }
 
 
@@ -87,6 +90,7 @@ hw_event_queue_schedule (struct hw *me,
 {
   struct hw_event *event;
   va_list dummy;
+  memset (&dummy, 0, sizeof dummy);
   event = hw_event_queue_schedule_vtracef (me, delta_time, callback, data,
                                           NULL, dummy);
   return event;