Fix delete_hw_event_data() to free the scheduled events

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index ec478ab..362d951 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,5 +1,9 @@
 2000-11-26  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
 
+       * hw-events.c (delete_hw_event_data): Remove the scheduled events.
+
+2000-11-26  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
        * dv-core.c (dv_core_attach_address_callback): Don't abort if
        space is not zero.
 

diff --git a/sim/common/hw-events.c b/sim/common/hw-events.c
index f60dfa3..243a7aa 100644 (file)
--- a/sim/common/hw-events.c
+++ b/sim/common/hw-events.c
@@ -51,8 +51,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);
 }