[gem5-dev] Change in gem5/gem5[master]: systemc: Implement a little more of sc_time.

[Gabe Black (Gerrit)]

Gabe Black has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/12208

Change subject: systemc: Implement a little more of sc_time.
......................................................................

systemc: Implement a little more of sc_time.

This change implements a pair of constructors, and some conversion
functions.

Change-Id: Ibd0e9ec5bcc24f4a17896313996b3112b5ef1934
---
M src/systemc/core/sc_time.cc
1 file changed, 14 insertions(+), 9 deletions(-)



diff --git a/src/systemc/core/sc_time.cc b/src/systemc/core/sc_time.cc
index 0a52a6a..a28da77 100644
--- a/src/systemc/core/sc_time.cc
+++ b/src/systemc/core/sc_time.cc
@@ -150,14 +150,16 @@
     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 @@
 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_SEC] / TimeUnitScale[SC_PS];
+    return d * scale;
 }

 const std::string
@@ -283,10 +287,11 @@
 }

 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

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12208
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ibd0e9ec5bcc24f4a17896313996b3112b5ef1934
Gerrit-Change-Number: 12208
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev