Changeset 22 for sources/src/sc_signal.h

Timestamp:

Apr 16, 2009, 2:46:01 PM (15 years ago)

Author:

buchmann

Message:

Fix:

• add missing system header include
• add a namespace path to atoi

And... code cleanup:

• bunch of various operators that share the same implementation now are using the same #define.
• indent and tab/space

File:

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

sources/src/sc_signal.h

@@ -91 +91 @@
                         const T          value_)
 {
-        if (sizeof (T) > sizeof (base_type)) {
+  if (sizeof (T) > sizeof (base_type)) {
 #if 0
-    cout << "sizeof (T) = " << sizeof (T) << " (base_type = " << sizeof
-(base_type) << "\n";
-#endif
-                post_multiwrite (pointer_,value_);
-        } else {
+  std::cout << "sizeof (T) = " << sizeof (T) 
+            << " (base_type = " << sizeof (base_type) << "\n";
+#endif
+  post_multiwrite (pointer_,value_);
+  } else {
 #if defined(DEBUG)
-        if (pending_write_vector_nb >= pending_write_vector_capacity) {
-        //if (pending_write_vector_nb >= pending_write_vector_capacity * sizeof(pending_write)) {
-                std::cerr << "Error : The array for posted writing on register is too small.\n";
-                std::cerr << "Up to 1 writing per register is allowed during a cycle.\n";
-                std::cerr << "Please check the hardware description.\n";
-                exit (-1);
-        }
+    if (pending_write_vector_nb >= pending_write_vector_capacity) {
+      //if (pending_write_vector_nb >= pending_write_vector_capacity * sizeof(pending_write)) {
+      std::cerr << "Error : The array for posted writing on register is too small.\n";
+      std::cerr << "Up to 1 writing per register is allowed during a cycle.\n";
+      std::cerr << "Please check the hardware description.\n";
+      exit (-1);
+    }
 #endif // DEBUG
-  pending_write_vector[pending_write_vector_nb].pointer = pointer_;
+    pending_write_vector[pending_write_vector_nb].pointer = pointer_;
 //      pending_write_vector[pending_write_vector_nb++].value = *(reinterpret_cast<const base_type*const>(&value_)); => bug !
-  pending_write_vector[pending_write_vector_nb++].value = value_; // => bug avec blues !
+    pending_write_vector[pending_write_vector_nb++].value = value_; // => bug avec blues !
 
         // -> fix to use user-defined struct in sc_signal/sc_in/sc_out/sc_inout
@@ -121 +121 @@
                 return;
 #endif
-        };
+  };
 }
 
 inline bool is_posted_write ()
 {
-                return pending_write_vector_nb > 0;
+  return pending_write_vector_nb > 0;
 }
 
@@ -139 +139 @@
 class sc_signal_base : public sc_object, public sc_interface
 {
-        //////
-        // Internal
+  //////
+  // Internal
   friend class sc_clock;
   friend class sc_port_base;
   void init ();
-        //////                           
+  //////                                 
   
 
@@ -158 +158 @@
   sc_signal_base(const char* name_);
   sc_signal_base(const char* name_, void*);
-        ~sc_signal_base();
+  ~sc_signal_base();
 };
 
@@ -165 +165 @@
 {
 private:
-        T val;
-  typedef T  data_type;
+  T val;
+  typedef T                data_type;
   typedef sc_signal < T >  this_type;
-        ///////////
-        // Internal
-        public: void init ();
-        ///////////
-//  virtual void update ();
+
+  ///////////
+  // Internal
+public: void init ();
+  ///////////
+
+  //  virtual void update ();
   void check_writer ();
 public:
   // constructors, destructor 
   sc_signal () 
-        { init (); }
+  { init (); }
   explicit sc_signal (const char *name_): sc_signal_base(name_)
-        { init (); }
+  { init (); }
   /*virtual */~ sc_signal () 
   {}
@@ -229 +231 @@
   set_pointer ((tab_t*)&val);
   set_kind    (kind_string);
-        sc_interface::init (sizeof (data_type)); 
+  sc_interface::init (sizeof (data_type)); 
   val = 0; /* The simulator initializes the signal/register to 0.    */
            /* However, hardware initialization still has to be done. */