Changeset 4 for sources/src/sc_time.h

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.h (modified) (5 diffs)

sources/src/sc_time.h

@@ -13 +13 @@
 #define __SC_TIME_H__
 
-#include <iostream>
 #include <string>
-#include "sc_nbdefs.h"
-#include "internal_ext.h"
+#include <stdint.h>
 
 namespace sc_core {
@@ -41 +39 @@
 extern sc_time SC_CURRENT_TIME;
 
-extern uint64 nb_cycles;
+extern uint64_t nb_cycles;
 
 inline double sc_simulation_time()   // in default time units
@@ -54 +52 @@
 {
   friend const sc_time &sc_time_stamp ();
-  long long int time;
+  uint64_t time;
+  enum sc_time_unit unit;
 public:
-//  sc_time (); LRM 2.1
   sc_time (double val, sc_time_unit tu);
   sc_time (const sc_time& = SC_ZERO_TIME);
@@ -62 +60 @@
   sc_time& operator= (const sc_time &);
  
-  /*sc_dt::*/uint64 value     () const { return (/*sc_dt::*/uint64) time;}
-  double        to_double () const { return time * 1000;}
-  double        to_seconds() const { return time / (double)1000000000;};
-  operator      double    () const { return to_double ();};
+  uint64_t      value     () const { return time;}
+  inline double        to_double () const;
+  inline double        to_seconds() const;
+  inline operator      double    () const { return to_double ();}
   const std::string to_string () const;
 };
@@ -75 +73 @@
 }
 
+double
+sc_time::to_double () const
+{
+        double fact = 1;
+        switch(unit) {
+        case SC_FS: fact = 1e-6; break;
+        case SC_PS: fact = 1e-3; break;
+        case SC_NS: fact = 1; break;
+        case SC_US: fact = 1e3; break;
+        case SC_MS: fact = 1e6; break;
+        case SC_SEC: fact = 1e9; break;
+        }
+        return (double)time * fact;
+}
+
+double
+sc_time::to_seconds() const
+{
+        double fact = 1;
+        switch(unit) {
+        case SC_FS: fact = 1e-15; break;
+        case SC_PS: fact = 1e-12; break;
+        case SC_NS: fact = 1e-9; break;
+        case SC_US: fact = 1e-6; break;
+        case SC_MS: fact = 1e-3; break;
+        case SC_SEC: fact = 1; break;
+        }
+        return (double)time * fact;
+}
+
 } // end of namespace sc_core
 
-using sc_core::sc_simulation_time;
-using sc_core::sc_time;
-using sc_core::sc_time_stamp;
-
 #endif /* __SC_TIME_H__ */