diff options
| author | Gabe Black <gabeblack@google.com> | 2018-08-27 22:55:54 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-10-03 00:11:58 +0000 |
| commit | 3f94dad180a24a0900b1457c06e69e705e357abf (patch) | |
| tree | e8eb7bdba89cc44fc0f7f3aafbafda4dd17b343e | |
| parent | e061a36291dfb99b10b6637a80ae3f4da3ac7e0b (diff) | |
| download | gem5-3f94dad180a24a0900b1457c06e69e705e357abf.tar.xz | |
systemc: Implement support for the default time unit.
This is deprecated, but still used in the tests.
Change-Id: I454540e419c53624a37f3d1271cb240415b816b6
Reviewed-on: https://gem5-review.googlesource.com/c/12276
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
| -rw-r--r-- | src/systemc/core/sc_time.cc | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/systemc/core/sc_time.cc b/src/systemc/core/sc_time.cc index bc35f2ab8..96877e89e 100644 --- a/src/systemc/core/sc_time.cc +++ b/src/systemc/core/sc_time.cc @@ -134,6 +134,8 @@ class TimeSetter : public ::sc_gem5::PythonReadyFunc } } timeSetter; +double defaultUnit = 1.0e-9; + } // anonymous namespace sc_time::sc_time() : val(0) {} @@ -152,14 +154,20 @@ sc_time::sc_time(const sc_time &t) sc_time::sc_time(double d, bool scale) { - //XXX Assuming the time resolution is 1ps, and the default unit is 1ns. - set(this, d, scale ? SC_NS : SC_PS); + //XXX Assuming the time resolution is 1ps. + if (scale) + set(this, d * defaultUnit, SC_SEC); + else + set(this, d, SC_PS); } sc_time::sc_time(sc_dt::uint64 v, bool scale) { - //XXX Assuming the time resolution is 1ps, and the default unit is 1ns. - set(this, static_cast<double>(v), scale ? SC_NS : SC_PS); + //XXX Assuming the time resolution is 1ps. + if (scale) + set(this, static_cast<double>(v) * defaultUnit, SC_SEC); + else + set(this, static_cast<double>(v), SC_PS); } sc_time & @@ -370,16 +378,15 @@ sc_max_time() } void -sc_set_default_time_unit(double, sc_time_unit) +sc_set_default_time_unit(double d, sc_time_unit tu) { - warn("%s not implemented.\n", __PRETTY_FUNCTION__); + defaultUnit = d * TimeUnitScale[tu]; } sc_time sc_get_default_time_unit() { - warn("%s not implemented.\n", __PRETTY_FUNCTION__); - return *(sc_time *)nullptr; + return sc_time(defaultUnit, SC_SEC); } sc_time_tuple::sc_time_tuple(const sc_time &) |