Cleanup tracing.

1 files changed, 20 insertions, 1 deletions

diff --git a/sim/ppc/events.c b/sim/ppc/events.c
index 8384622..5743ffd 100644
--- a/sim/ppc/events.c
+++ b/sim/ppc/events.c
@@ -161,6 +161,24 @@ update_time_from_event(event_queue *events)
     events->time_of_event = current_time - 1;
     events->time_from_event = -1;
   }
+  if (WITH_TRACE && ppc_trace[trace_events])
+    {
+      event_entry *event;
+      int i;
+      for (event = events->queue, i = 0;
+	   event != NULL;
+	   event = event->next, i++)
+	{
+	  TRACE(trace_events, ("event time-from-event - time %ld, delta %ld - event %d, tag 0x%lx, time %ld, handler 0x%lx, data 0x%lx\n",
+			       (long)current_time,
+			       (long)events->time_from_event,
+			       i,
+			       (long)event,
+			       (long)event->time_of_event,
+			       (long)event->handler,
+			       (long)event->data));
+	}
+    }
   ASSERT(current_time == event_queue_time(events));
   ASSERT((events->time_from_event >= 0) == (events->queue != NULL));
 }
@@ -369,9 +387,10 @@ event_queue_process(event_queue *events)
     event_handler *handler = to_do->handler;
     void *data = to_do->data;
     events->queue = to_do->next;
-    TRACE(trace_events, ("event issued at %ld - tag 0x%lx - handler 0x%lx, data 0x%lx\n",
+    TRACE(trace_events, ("event issued at %ld - tag 0x%lx - time %ld, handler 0x%lx, data 0x%lx\n",
 			 (long)event_time,
 			 (long)to_do,
+			 (long)to_do->time_of_event,
 			 (long)handler,
 			 (long)data));
     zfree(to_do);