derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base: Avoid dividing by zero in Time::[gs]etTick.

Browse Source 
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 <jason@lowepower.com>
Maintainer: Gabe Black <gabeblack@google.com>
This commit is contained in:
Gabe Black
2018-09-11 00:59:56 -07:00
parent 6c49198b75
commit 544b136cbf
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/base/time.cc
View File

@@ -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<uint64_t>(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<uint64_t>(nsec() * SimClock::Float::ns);
}
string