Changeset 27 for sources/src/sc_signal.h

Timestamp:

May 4, 2009, 8:51:56 PM (15 years ago)

Author:

buchmann

Message:

SystemCASS now uses autoconf/automake to build the API. Regression tests still
use the old Makefiles.
(thanks to Nicolas Pouillon)

The library directory no longer is "lib-arch-system". The directory now is "lib-linux". Everyone needs to pay attention about SYSTEMCASS environment variable.

Changes:

• system header includes
• Add includes to config.h (generated by autoconf/automake)
• test:
  • linux preprocessor macro instead of _WIN32
  • CONFIG_DEBUG instead of DEBUG

Removes:

• Makefile
• guess_endianness.cc
• guess_os.sh
• assert.h (we now use standard assert.h)
• Options.def

File:

• sources/src/sc_signal.h (modified) (10 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
@@ -98 +101 @@
   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)) {
@@ -106 +109 @@
       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 !
@@ -229 +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)); 
@@ -247 +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  
@@ -259 +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)) {
@@ -268 +271 @@
         }               
 #endif
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
   if (get_pointer() == NULL)
   {
@@ -275 +278 @@
   }
 #endif
-#ifdef CHECK_MULTIWRITING2REGISTER
+#ifdef CONFIG_CHECK_MULTIWRITING2REGISTER
   pending_writing2register_record_and_check (get_pointer ());
 #endif