summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2018-08-15 17:42:52 -0700
committerGabe Black <gabeblack@google.com>2018-09-20 01:48:49 +0000
commite1e02e91e02da93c7fd95f24a9135f47802e23e8 (patch)
treed51d33dc76a24f026a3e3b230534b6f6468e0a26
parentf30f30577409073416981004761a85364be1a986 (diff)
downloadgem5-e1e02e91e02da93c7fd95f24a9135f47802e23e8.tar.xz
systemc: Implement a little more of sc_time.
This change implements a pair of constructors, and some conversion functions. Change-Id: Ibd0e9ec5bcc24f4a17896313996b3112b5ef1934 Reviewed-on: https://gem5-review.googlesource.com/12208 Reviewed-by: Gabe Black <gabeblack@google.com> Maintainer: Gabe Black <gabeblack@google.com>
-rw-r--r--src/systemc/core/sc_time.cc23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/systemc/core/sc_time.cc b/src/systemc/core/sc_time.cc
index 0a52a6a13..bc35f2ab8 100644
--- a/src/systemc/core/sc_time.cc
+++ b/src/systemc/core/sc_time.cc
@@ -150,14 +150,16 @@ sc_time::sc_time(const sc_time &t)
val = t.val;
}
-sc_time::sc_time(double, bool)
+sc_time::sc_time(double d, bool scale)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ //XXX Assuming the time resolution is 1ps, and the default unit is 1ns.
+ set(this, d, scale ? SC_NS : SC_PS);
}
-sc_time::sc_time(sc_dt::uint64, bool)
+sc_time::sc_time(sc_dt::uint64 v, bool scale)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
+ //XXX Assuming the time resolution is 1ps, and the default unit is 1ns.
+ set(this, static_cast<double>(v), scale ? SC_NS : SC_PS);
}
sc_time &
@@ -181,8 +183,10 @@ sc_time::to_double() const
double
sc_time::to_seconds() const
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
- return 0.0;
+ double d = to_double();
+ //XXX Assuming the time resolution is 1ps.
+ double scale = TimeUnitScale[SC_PS] / TimeUnitScale[SC_SEC];
+ return d * scale;
}
const std::string
@@ -283,10 +287,11 @@ sc_time::from_value(sc_dt::uint64 u)
}
sc_time
-sc_time::from_seconds(double)
+sc_time::from_seconds(double d)
{
- warn("%s not implemented.\n", __PRETTY_FUNCTION__);
- return sc_time();
+ sc_time t;
+ set(&t, d, SC_SEC);
+ return t;
}
sc_time