Changes in sources/src/sc_signal.h [17:27]

File:

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

sources/src/sc_signal.h

@@ -15 +15 @@
 
 // Define registers writing method
-#include<iostream>
-#include<cstdlib>
-#include"sc_fwd.h"
-#include"sc_nbdefs.h"
-//#include"sc_event_finder.h"
-//#include"sc_event.h"
-#include"sc_time.h" // SC_ZERO_TIME
-#include"sc_object.h"
-#include"sc_interface.h"
-#include"internal_ext.h"
+#include <iostream>
+#include <cstdlib>
+#include "sc_fwd.h"
+#include "sc_nbdefs.h"
+//#include "sc_event_finder.h"
+//#include "sc_event.h"
+#include "sc_time.h" // SC_ZERO_TIME
+#include "sc_object.h"
+#include "sc_interface.h"
+#include "internal_ext.h"
+
+#ifdef CONFIG_CHECK_FSM_RULES
 #include "fsm_rules.h"
+#endif
 
 namespace sc_core {
@@ -42 +45 @@
         ///////////////////// DEPRECATED
 // C ANSI-only since it is needed to link with extern "C"
-// this declaration is not in casc.h since the CHECK_FSM_RULES macro
+// this declaration is not in casc.h since the CONFIG_CHECK_FSM_RULES macro
 // is not defined.
 
@@ -79 +82 @@
         size_t size = (sizeof (T)-1) / sizeof (base_type);
         size_t i = 0;
-        const base_type *pvalue = (const base_type*)(&value_);
+        const base_type *pvalue = (const base_type*)(void*)(&value_);
         do {
 #if 0
@@ -91 +94 @@
                         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 {
-#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);
-        }
-#endif // DEBUG
-  pending_write_vector[pending_write_vector_nb].pointer = pointer_;
+  std::cout << "sizeof (T) = " << sizeof (T) 
+            << " (base_type = " << sizeof (base_type) << "\n";
+#endif
+  post_multiwrite (pointer_,value_);
+  } else {
+#if defined(CONFIG_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);
+    }
+#endif // CONFIG_DEBUG
+    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 +124 @@
                 return;
 #endif
-        };
+  };
 }
 
 inline bool is_posted_write ()
 {
-                return pending_write_vector_nb > 0;
+  return pending_write_vector_nb > 0;
 }
 
@@ -139 +142 @@
 class sc_signal_base : public sc_object, public sc_interface
 {
-        //////
-        // Internal
+  //////
+  // Internal
   friend class sc_clock;
   friend class sc_port_base;
   void init ();
-        //////                           
+  //////                                 
   
 
@@ -158 +161 @@
   sc_signal_base(const char* name_);
   sc_signal_base(const char* name_, void*);
-        ~sc_signal_base();
+  ~sc_signal_base();
 };
 
@@ -165 +168 @@
 {
 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 () 
   {}
@@ -227 +232 @@
 sc_signal<T>::init()
 {
-  set_pointer ((tab_t*)&val);
+        set_pointer ((tab_t*)(void*)&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. */
@@ -245 +250 @@
                 << " on signal " << name () << "\n";
 #endif
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         // we can read value from sc_signal type (used like a register) at any time
 #endif  
@@ -257 +262 @@
 sc_signal<T>::write( const data_type& value_ )
 {
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         if ((casc_fsm_step != TRANSITION) 
                         && ( casc_fsm_step != STIMULI)) {
@@ -266 +271 @@
         }               
 #endif
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
   if (get_pointer() == NULL)
   {
@@ -273 +278 @@
   }
 #endif
-#ifdef CHECK_MULTIWRITING2REGISTER
+#ifdef CONFIG_CHECK_MULTIWRITING2REGISTER
   pending_writing2register_record_and_check (get_pointer ());
 #endif