From 016593f2e91564dc9d675ae42dfd37059f9b5589 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Tue, 21 Aug 2012 05:49:09 -0400 Subject: Clock: Make Tick unsigned and remove UTick This patch makes the Tick unsigned and removes the UTick typedef. The ticks should never be negative, and there was only one major issue with removing it, caused by the o3 CPU using a -1 as an initial value. The patch has no impact on any regressions. --- src/sim/eventq.hh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/sim') diff --git a/src/sim/eventq.hh b/src/sim/eventq.hh index 09483f4e2..c46902889 100644 --- a/src/sim/eventq.hh +++ b/src/sim/eventq.hh @@ -481,9 +481,7 @@ class EventManager inline void EventQueue::schedule(Event *event, Tick when) { - // Typecasting Tick->Utick here since gcc - // complains about signed overflow - assert((UTick)when >= (UTick)curTick()); + assert(when >= curTick()); assert(!event->scheduled()); assert(event->initialized()); @@ -520,9 +518,7 @@ EventQueue::deschedule(Event *event) inline void EventQueue::reschedule(Event *event, Tick when, bool always) { - // Typecasting Tick->Utick here since gcc - // complains about signed overflow - assert((UTick)when >= (UTick)curTick()); + assert(when >= curTick()); assert(always || event->scheduled()); assert(event->initialized()); -- cgit v1.2.3