From 544b136cbfbba53b6d97b763445e9f9b25eb2a7f Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 11 Sep 2018 00:59:56 -0700 Subject: base: Avoid dividing by zero in Time::[gs]etTick. Those functions used the value SimClock::Int::ns which, if the time resolution is larger than 1ns, can/will be zero. That will make getTick always return zero, and setTick divide by zero. This change modifies those functions so that the math they do avoids using any integer Ticks per time unit value except for Frequency. It seems unlikely that the Ticks will increment at less than 1Hz. Change-Id: I5cc9db14699c00dcbff48e4593b98522b13b4ccd Reviewed-on: https://gem5-review.googlesource.com/12573 Reviewed-by: Jason Lowe-Power Maintainer: Gabe Black --- src/base/time.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/base/time.cc b/src/base/time.cc index 6e9d7ccfb..80bc546e1 100644 --- a/src/base/time.cc +++ b/src/base/time.cc @@ -57,14 +57,17 @@ Time::_set(bool monotonic) void Time::setTick(Tick ticks) { - uint64_t nsecs = ticks / SimClock::Int::ns; - set(nsecs / NSEC_PER_SEC, nsecs % NSEC_PER_SEC); + uint64_t secs = ticks / SimClock::Frequency; + ticks -= secs * SimClock::Frequency; + uint64_t nsecs = static_cast(ticks * SimClock::Float::GHz); + set(secs, nsecs); } Tick Time::getTick() const { - return (nsec() + sec() * NSEC_PER_SEC) * SimClock::Int::ns; + return sec() * SimClock::Frequency + + static_cast(nsec() * SimClock::Float::ns); } string -- cgit v1.2.3