Changeset 8 for branches/with_autoconf/src/sc_signal.h

Timestamp:

Jun 25, 2008, 1:08:04 PM (16 years ago)

Author:

nipo

Message:

Checkin autotools magic

File:

• branches/with_autoconf/src/sc_signal.h (modified) (8 diffs)

branches/with_autoconf/src/sc_signal.h

@@ -15 +15 @@
 
 // Define registers writing method
-#include<iostream>
-#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 "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 {
@@ -41 +44 @@
         ///////////////////// 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.
 
@@ -97 +100 @@
                 post_multiwrite (pointer_,value_);
         } else {
-#if defined(DEBUG)
+#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)) {
@@ -105 +108 @@
                 exit (-1);
         }
-#endif // DEBUG
+#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 !
@@ -244 +247 @@
                 << " 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  
@@ -256 +259 @@
 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)) {
@@ -265 +268 @@
         }               
 #endif
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
   if (get_pointer() == NULL)
   {
@@ -272 +275 @@
   }
 #endif
-#ifdef CHECK_MULTIWRITING2REGISTER
+#ifdef CONFIG_CHECK_MULTIWRITING2REGISTER
   pending_writing2register_record_and_check (get_pointer ());
 #endif