Changeset 4 for sources/src/sc_time.cc

Timestamp:

Mar 10, 2008, 12:37:25 PM (16 years ago)

Author:

nipo

Message:

Towards SystemC-2.2 LRM:

• Implement sc_time with units
• Have a systemc header with no namespace pollution

File:

• sources/src/sc_time.cc (modified) (3 diffs)

sources/src/sc_time.cc

@@ -39 +39 @@
 #include <sys/time.h>
 #include <string>
-
-using namespace std;
+#include <sstream>
 
 namespace sc_core {
 
-uint64 nb_cycles = 0;
+static const char *const unit_repr_string[6] = 
+{
+        "FS", "PS", "NS", "US", "MS", "SEC"
+};
+
+uint64_t nb_cycles = 0;
 
 const sc_time SC_ZERO_TIME(0,SC_NS);
@@ -51 +55 @@
 sc_time::sc_time (const sc_time &t)
 {
-  time = t.time;
+        *this = t;
 }
 
 sc_time::sc_time (double val, sc_time_unit tu)
 {
-  time = (long long int) val;
+  time = (uint64_t) val;
+  unit = tu;
 }
 
@@ -64 +69 @@
 {
   time = t.time;
+  unit = t.unit;
+  return *this;
 }
 
 
-const string 
+const std::string 
 sc_time::to_string () const
 {
-        char  res[32];
-  const char* unit;
-        if (time == 0)
-  {
-    unit = "s";
-  } else
-    unit = "ns";
-  sprintf (res, "%lld %s", time, unit);
-  return (string)res;
+        std::ostringstream o;
+        o << time << ' ' << unit_repr_string[unit];
+        return o.str();
 }