Changeset 59 for sources/src/sc_signal.h

Timestamp:

Feb 6, 2017, 11:35:42 AM (7 years ago)

Author:

meunier

Message:

• Fixed memory leaks
• Fixed indentation in some files

File:

• sources/src/sc_signal.h (modified) (10 diffs)

sources/src/sc_signal.h

@@ -18 +18 @@
 #include <iostream>
 #include <cstdlib>
+#include <typeinfo> // for typeid
 
 #include "sc_fwd.h"
@@ -53 +54 @@
     base_type * pointer;
     base_type value;
-    //pending_write_t(base_type * const pointer_, const base_type value_) {
-    //    pointer = pointer_;
-    //    value = value_;
-    //}
     
     friend std::ostream & operator << (std::ostream & o, const pending_write_t & p) {
@@ -76 +73 @@
 
 template < typename T >
-inline void post_write(base_type * const pointer_, const T value_) /*INLINE*/;
-
-template < typename T >
-inline void post_multiwrite(base_type * const pointer_, const T value_) {
+inline void post_write(base_type * const pointer_, const T & value_) /*INLINE*/;
+
+template < typename T >
+inline void post_multiwrite(base_type * const pointer_, const T & value_) {
     size_t size = (sizeof(T) - 1) / sizeof(base_type);
     size_t i = 0;
-    const base_type * pvalue = (const base_type *) (void *) (& value_);
+    const base_type * pvalue = (const base_type *) (void *) (&value_);
     do {
         post_write(pointer_ + i, pvalue[i]);
@@ -89 +86 @@
 
 template < typename T >
-inline void post_write(base_type * const pointer_, const T value_) {
+inline void post_write(base_type * const pointer_, const T & value_) {
     if (sizeof(T) > sizeof(base_type)) {
-        post_multiwrite(pointer_,value_);
+        post_multiwrite(pointer_, value_);
     }
     else {
@@ -166 +163 @@
 
     private:
+
     T val;
+
     typedef T data_type;
     typedef sc_signal < T > this_type;
@@ -182 +181 @@
     // constructors, destructor 
     sc_signal() {
+        if (typeid(data_type) == typeid(double) || typeid(data_type) == typeid(float)) {
+            std::cerr << "Error: SystemCASS does not support sc_signal<T> with T of type " << typeid(data_type).name() << std::endl;
+            exit(1);
+        }
         init();
     }
@@ -215 +218 @@
     }
 
-    const data_type & get_new_value() const;
+    const data_type & get_new_value() const {
+        // Warning: untested and doesn't support variable size
+        unsigned int i = 0;
+        for (i = 0; i < pending_write_vector_capacity; i++) {
+            if (pending_write_vector[i].pointer == get_pointer()) {
+                return pending_write_vector[i].value;
+            }
+        }
+        return val;
+    }
 
     //  void trace (sc_trace_file * tf) const;
@@ -235 +247 @@
     set_kind(kind_string);
     sc_interface::init(sizeof(data_type)); 
-    val = 0; /* The simulator initializes the signal/register to 0.    */
+    val = (T) 0; /* The simulator initializes the signal/register to 0.    */
     /* However, hardware initialization still has to be done. */
     /* This kind of initialization is for trace diffing.      */
@@ -245 +257 @@
 /*virtual*/ inline const T & sc_signal< T >::read() const {
 #ifdef DUMP_READ
-    std::cerr << "read " << READ_SIGNAL(const T, get_pointer()) << " on signal " << name() << "\n";
-#endif
-    return READ_SIGNAL(const T, get_pointer());
+    std::cerr << "read " << READ_SIGNAL(const data_type, get_pointer()) << " on signal " << name() << "\n";
+#endif
+    // QM
+    return READ_SIGNAL(T, get_pointer());
 }
 
@@ -266 +279 @@
     std::cerr << "write (posted) " << value_ << " on sc_signal (writing into register) '" << name() << "'\n";
 #endif
+    
     post_write(/*(tab_t*)&val*/ get_pointer(), value_);
 }