Changeset 27 for sources/src

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

Location:

sources/src

Files:

• Makefile (deleted)
• Makefile.am (copied) (copied from branches/with_autoconf/src/Makefile.am)
• Options.def (deleted)
• SystemCASS.bib (deleted)
• alias.cc (modified) (1 diff)
• assert.h (deleted)
• bit2string.cc (modified) (1 diff)
• casc.h (modified) (1 diff)
• data_field.h (modified) (1 diff)
• dump_dot.cc (modified) (1 diff)
• dump_used_env.cc (modified) (1 diff)
• dump_used_options.cc (modified) (2 diffs)
• entity.cc (modified) (13 diffs)
• entity.h (modified) (1 diff)
• figures (deleted)
• fsm_rules.h (modified) (1 diff)
• gen_code.cc (modified) (14 diffs)
• gen_code.h (modified) (4 diffs)
• global_functions.cc (modified) (3 diffs)
• global_functions.h (modified) (1 diff)
• graph.cc (modified) (2 diffs)
• graph_cass.cc (modified) (1 diff)
• graph_signals.cc (modified) (1 diff)
• guess_endianness.cc (deleted)
• guess_os.sh (deleted)
• hex2string.cc (modified) (1 diff)
• methodprocess_dependency.cc (modified) (4 diffs)
• module_hierarchy.cc (modified) (2 diffs)
• module_hierarchy2dot.cc (modified) (2 diffs)
• mouchard_scheduling.cc (modified) (1 diff)
• port_dependency.cc (modified) (2 diffs)
• process_dependency.cc (modified) (1 diff)
• sc_bigint.h (modified) (1 diff)
• sc_biguint.h (modified) (1 diff)
• sc_bit.h (modified) (1 diff)
• sc_bv.h (modified) (1 diff)
• sc_clock.cc (modified) (3 diffs)
• sc_clock.h (modified) (1 diff)
• sc_event.cc (modified) (1 diff)
• sc_event.h (modified) (1 diff)
• sc_event_finder.cc (modified) (1 diff)
• sc_event_finder.h (modified) (1 diff)
• sc_int.h (modified) (1 diff)
• sc_interface.cc (modified) (3 diffs)
• sc_interface.h (modified) (1 diff)
• sc_logic.cc (modified) (1 diff)
• sc_logic.h (modified) (1 diff)
• sc_lv.h (modified) (1 diff)
• sc_main.cc (modified) (4 diffs)
• sc_module.cc (modified) (6 diffs)
• sc_module.h (modified) (1 diff)
• sc_module_ext.h (modified) (1 diff)
• sc_module_name.h (modified) (1 diff)
• sc_numrep.cc (modified) (1 diff)
• sc_object.cc (modified) (7 diffs)
• sc_pat_trace.cc (modified) (1 diff)
• sc_port.cc (modified) (8 diffs)
• sc_port.h (modified) (1 diff)
• sc_port_ext.h (modified) (6 diffs)
• sc_sensitive.cc (modified) (1 diff)
• sc_sensitive.h (modified) (1 diff)
• sc_signal.h (modified) (10 diffs)
• sc_time.cc (modified) (1 diff)
• sc_trace.cc (modified) (11 diffs)
• sc_uint.h (modified) (1 diff)
• sc_uint_subref_r.cc (modified) (1 diff)
• sc_unsigned.h (modified) (1 diff)
• sc_vcd_trace.cc (modified) (2 diffs)
• sc_ver.cc (modified) (2 diffs)
• schedulers.cc (modified) (9 diffs)
• schedulers.h (modified) (1 diff)
• serialization.cc (modified) (5 diffs)
• serialization.h (modified) (1 diff)
• serialization_ext.h (modified) (1 diff)
• signal_dependency.cc (modified) (1 diff)
• simplify_string.cc (modified) (1 diff)
• systemc (modified) (1 diff)

sources/src/alias.cc

@@ -33 +33 @@
  */
 
-#include"alias.h"
-#include<iostream>
+#include "alias.h"
+#include <iostream>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 const char * alias ()

sources/src/bit2string.cc

@@ -41 +41 @@
 #include <cstdlib>
 #include <iostream>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
         
 using namespace std;

sources/src/casc.h

@@ -48 +48 @@
 EXTERN void simulate_1_cycle (void) 
 {
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = TRANSITION;
 #endif
   transition ();
   update     ();
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = GEN_MOORE;
 #endif
   moore_generation ();
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = GEN_MEALY;
 #endif
   mealy_generation (); 
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = STIMULI;
 #endif

sources/src/data_field.h

@@ -13 +13 @@
 #define __DATA_FIELD_H__
 
-#include <endianness.h>
-
 template<int      WIDTH,
          int      PADDING,
          typename data_type>
-struct val_field { /* try to work with little endianess */
-#if defined(little_endian)
-  /* little endian */
-//  data_type pad:PADDING;
+struct val_field {
   data_type valW:WIDTH;
-#elif defined(big_endian)
-  /* big endian */
-  data_type pad:PADDING;
-  data_type valW:WIDTH;
-#else
-#error You must define endianness.
-#endif
 };
 

sources/src/dump_dot.cc

@@ -40 +40 @@
 #include "simplify_string.h"
 #include "sc_ver.h" // sc_version
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 typedef std::list<sc_core::sc_port_base*> port_list_t;

sources/src/dump_used_env.cc

@@ -36 +36 @@
 #include <cstdlib>
 #include "dump_used_env.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 std::string

sources/src/dump_used_options.cc

@@ -35 +35 @@
 
 #include "dump_used_options.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 namespace sc_core {
@@ -65 +68 @@
   "DUMP_STAGE, "
 #endif
-#ifdef CHECK_FSM_RULES     
-  "CHECK_FSM_RULES, "
+#ifdef CONFIG_CHECK_FSM_RULES     
+  "CONFIG_CHECK_FSM_RULES, "
 #endif
 #ifdef COMPIL_DEBUG  
   "COMPIL_DEBUG,"       
 #endif
-#ifdef DEBUG
-  "DEBUG, "          
+#ifdef CONFIG_DEBUG
+  "CONFIG_DEBUG, "          
 #endif
 #ifdef UINT64              

sources/src/entity.cc

@@ -35 +35 @@
  */
 
-#include<cstring>
-#include<iomanip>
-#include<list>
-#include<map>
-#include<vector>
-
-#include"assert.h"
-#include"entity.h"
-#include"sc_port.h"
-#include"sc_signal.h"
-#include"sc_module.h"
+#include <cstring>
+#include <iomanip>
+#include <list>
+#include <map>
+#include <vector>
+
+#include <cassert>
+#include "entity.h"
+#include "sc_port.h"
+#include "sc_signal.h"
+#include "sc_module.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -175 +178 @@
     typedef std::map<const tab_t *,equi_list_t::iterator,predic4tab_t2equi_t_t> tab_t2equi_it_t;
     static tab_t2equi_it_t tab2equi_map;
-    ASSERT(pointer != NULL);
+    assert(pointer != NULL);
 
     // boost
@@ -240 +243 @@
         {
                 equi_t::const_iterator top_iter = e.begin ();
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
                 if (top_iter == e.end ()) {
                         cerr << "Internal error : no signal in " << e << endl;
@@ -357 +360 @@
         }
         
-#if defined(DUMP_SIGNALS_STATS)
+#if defined(DUMP_SIGNAL_STATS)
         static unsigned int equi_real_size;
 #endif
@@ -389 +392 @@
     unsigned int table_size = get_sizeof_signals_table ();
                 equi_table = new tab_t[table_size]; //(0xCD);
-#if defined(DUMP_SIGNALS_STATS)
+#if defined(DUMP_SIGNAL_STATS)
                 equi_real_size = table_size;
 #endif
@@ -403 +406 @@
   bind_equi_to_table (equi_t &e, tab_t * const pointer)
   {
-    ASSERT(pointer != NULL);
+    assert(pointer != NULL);
     equi_t::iterator i;
     for (i = e.begin (); i != e.end (); ++i) {
@@ -455 +458 @@
     o << ")";
 #else
-   ASSERT(e.object != NULL); 
+   assert(e.object != NULL); 
    o << e.object->name ();
 #endif
@@ -494 +497 @@
   print_table_stats (ostream &o)
   {
-#if defined(DUMP_SIGNALS_STATS)
+#if defined(DUMP_SIGNAL_STATS)
                 int nb_reg = 0;
                 int nb_sig = 0;
@@ -537 +540 @@
         }
         const entity &ent = *(eq.begin ());
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (ent.type != sc_core::entity::SIGNAL)
                 exit(28);
@@ -544 +547 @@
         const char *sig_name = ent.object->name ();
         const char *sep  = strchr (sig_name,'.');
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (sep == NULL) {
                 exit (30);
@@ -595 +598 @@
 #endif
 
-#if defined(DUMP_SIGNALS_STATS)
+#if defined(DUMP_SIGNAL_STATS)
 static unsigned int equi_real_size;
 #endif
@@ -603 +606 @@
 {
 #if 0 
-//defined(DEBUG)
+//defined(CONFIG_DEBUG)
   equi_list_t::iterator x_equi = get_equi (x);
   if ((x_equi != equi_list.end())) {
@@ -640 +643 @@
 tbind (sc_port_base &x,T &y)
 {
-//  ASSERT(x.get_pointer () != NULL); // x pointer may be NULL
-//  ASSERT(y.get_pointer () != NULL); // y pointer may be NULL
+//  assert(x.get_pointer () != NULL); // x pointer may be NULL
+//  assert(y.get_pointer () != NULL); // y pointer may be NULL
   equi_list_t::iterator x_equi = get_equi (x);
   equi_list_t::iterator y_equi = get_equi (y);

sources/src/entity.h

@@ -14 +14 @@
 #define __ENTITY_H__
 
-#include<iostream>
-#include<list>
-#include"sc_fwd.h"
-#include"sc_port.h"
-#include"sc_signal.h"
+#include <iostream>
+#include <list>
+#include "sc_fwd.h"
+#include "sc_port.h"
+#include "sc_signal.h"
 
 namespace sc_core {

sources/src/fsm_rules.h

@@ -13 +13 @@
 #define __FSM_RULES_H__
 
-#ifdef CHECK_FSM_RULES
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef CONFIG_CHECK_FSM_RULES
 
 namespace sc_core {

sources/src/gen_code.cc

@@ -34 +34 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef _WIN32
+#if defined(__linux__)
 #include <linux/limits.h>
-#else
+#elif defined(WIN32)
 #include <windows.h>
 #endif
@@ -45 +45 @@
 #include<fstream>
 
-#include"internal.h"
-#include"gen_code.h"
-#include"sc_module.h"
-#include"sc_ver.h"
-#include"process_dependency.h"
-
-#ifdef CHECK_FSM_RULES
-#define fsm_check_flag "-DCHECK_FSM_RULES"
+#include "internal.h"
+#include "gen_code.h"
+#include "sc_module.h"
+#include "sc_ver.h"
+#include "process_dependency.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef CONFIG_CHECK_FSM_RULES
+#include "fsm_rules.h"
+#define fsm_check_flag "-DCONFIG_CHECK_FSM_RULES"
 #else
 #define fsm_check_flag
 #endif
 
-#define casc_cflags CFLAGS " " fsm_check_flag
-
-#if defined(darwin)
-#define macosx
-#endif
+#define casc_cflags GENERATED_MODULE_CFLAGS " " fsm_check_flag
+
+// Enable CPP call, this is useful for typeinfo-enabled classes
+#define CPP_CALL
 
 using namespace std;
@@ -91 +94 @@
                 << m.module->name() << "->" << m.name << "()\\n\");\n";
   o << " p.integer = " << func << ";\n";
-#if CPP_CALL
+#ifdef CPP_CALL
   o << " (((sc_module*)(" << m.module << "))->*(p.pmf)) (); /* " 
                 << m.module->name () << "->" << m.name << "() */\n";
@@ -143 +146 @@
   }
 
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
   cerr << "opened temporary filename : " << temp << "\n";
 #endif
@@ -268 +271 @@
 
   o << "// generated by " << sc_version () << endl
-                << "#include<casc.h>\n\n"
-                << "#include<cstdio>\n\n"
-//              << "#include<iostream>\n\n"
+                << "#include <casc.h>\n\n"
+                << "#include <cstdio>\n\n"
+//              << "#include <iostream>\n\n"
                 << "namespace sc_core {\n"
     << " typedef void (sc_module::*SC_ENTRY_FUNC)();\n"
@@ -329 +332 @@
 
   o << "// generated by " << sc_version () << endl
-                << "#include<casc.h>\n\n"
-                << "#include<cstdio>\n\n"
-//              << "#include<iostream>\n\n"
+                << "#include <casc.h>\n\n"
+                << "#include <cstdio>\n\n"
+//              << "#include <iostream>\n\n"
                 << "namespace sc_core {\n"
     << " typedef void (sc_module::*SC_ENTRY_FUNC)();\n"
@@ -377 +380 @@
 //  const char *target_arch = getenv ("TARGET_ARCH");
         const char *default_compiler =
-#if CPP_CALL
+#ifdef CPP_CALL
                 "g++";
 #else
@@ -418 +421 @@
   /* COMPILE */
   /* ******* */
-#if defined(macosx)
-    sprintf(compil_str, 
-                                "(cd %s ; %s %s -DSCHEDULING_BY_CASC -I%s/include -fno-common -dynamic -o %s -c %s)",
-        temporary_dir,
-                                compiler, 
-                                casc_cflags, 
-                                systemc_dir, 
-                                target_name,
-                                source_name);
-//    sprintf(compil_str,""); 
-#elif defined(linux)
-    sprintf(compil_str, 
-                                "(cd %s ; libtool --mode=compile %s %s -DSCHEDULING_BY_CASC -I%s/include -shared -o %s -c %s)",
-        temporary_dir,
-                                compiler, 
-                                casc_cflags, 
-                                systemc_dir, 
-                                target_name,
-                                source_name);
+  const char *commandline_template =
+#if defined(CONFIG_OS_DARWIN)
+          "(cd %s ;"                     " %s %s -DSCHEDULING_BY_CASC -I%s/include -fno-common -dynamic -o %s -c %s)"
+#elif defined(CONFIG_OS_LINUX)
+          "(cd %s ; libtool --mode=compile %s %s -DSCHEDULING_BY_CASC -I%s/include -shared -o %s -c %s)"
 #else
-    sprintf(compil_str, 
-                                "(cd %s ; %s %s -DSCHEDULING_BY_CASC -I%s/include -dynamiclib -o %s -c %s)",
-        temporary_dir,
-                                compiler, 
-                                casc_cflags, 
-                                systemc_dir, 
-                                target_name,
-                                source_name);
-#endif
+          "(cd %s ;"                     " %s %s -DSCHEDULING_BY_CASC -I%s/include -dynamiclib -o %s -c %s)"
+#endif
+          ;
+  sprintf(compil_str, 
+                  commandline_template,
+                  temporary_dir,
+                  compiler, 
+                  casc_cflags, 
+                  systemc_dir, 
+                  target_name,
+                  source_name);
 
   if (dump_stage) 
@@ -461 +452 @@
   sprintf (target_name, "%s.so", base_name);
 
-#if defined(linux)
+#ifdef CONFIG_OS_LINUX
   sprintf (source_name, "%s.lo", base_name);
   sprintf(compil_str, "(cd %s ; pwd ; libtool --mode=link %s %s -shared -rdynamic -o %s %s)", /* -L. -L%s/lib-%s */ 
@@ -560 +551 @@
   for (i = 0; i < n; ++i)
   {
-#if 0 //defined(DEBUG)
+#if 0 //defined(CONFIG_DEBUG)
     sc_module *m = (sc_module*)(fc.instance[i]);
     cerr << m->name () << endl;
@@ -575 +566 @@
 void static_simulate_1_cycle (void) 
 {
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = TRANSITION;
 #endif
   call_functions (pf[0]); // transition
   update     ();
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = GEN_MOORE;
 #endif
   call_functions (pf[1]); // moore generation
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = GEN_MEALY;
 #endif
   call_functions (pf[2]); // mealy generation
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = STIMULI;
 #endif
@@ -634 +625 @@
 void quasistatic_simulate_1_cycle (void) 
 {
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = TRANSITION;
 #endif
@@ -644 +635 @@
   }
   update     ();
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = GEN_MOORE;
 #endif
@@ -652 +643 @@
     Call (m);
   }
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = GEN_MEALY;
 #endif
   quasistatic_mealy_generation ();
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = STIMULI;
 #endif

sources/src/gen_code.h

@@ -14 +14 @@
 #define __GEN_CODE_H__
 
-#include"internal.h"
-#include"global_functions.h"
-#include"graph.h"
-#include"sc_port.h"
-#include"sc_trace.h"
-#include"process_dependency.h"
+#include "internal.h"
+#include "global_functions.h"
+#include "graph.h"
+#include "sc_port.h"
+#include "sc_trace.h"
+#include "process_dependency.h"
 
 //-------------------------------------------------------------------
@@ -105 +105 @@
 internal_sc_cycle0( double duration )  // in default time units
 {
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         // Check dynamic linkage
   if ((func_combinationals == NULL) || (func_simulate_1_cycle == NULL)) {
@@ -121 +121 @@
 #endif
         update ();
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
                 casc_fsm_step = GEN_MEALY;
 #endif
@@ -132 +132 @@
   if (is_posted_write ()) {
     update ();
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
                 casc_fsm_step = GEN_MEALY;
 #endif

sources/src/global_functions.cc

@@ -35 +35 @@
  */
 
-#include<iostream>
-#include<dlfcn.h>
-#include"schedulers.h" // get_scheduling & run_schedule_editor
-#include"sc_module.h" // check_all_method_process
-#include"gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
-#include"sc_clock_ext.h" // clock list
-#include"usage.h"
-#include"module_hierarchy2dot.h"
-#include"assert.h"
+#include <iostream>
+#include <dlfcn.h>
+#include "schedulers.h" // get_scheduling & run_schedule_editor
+#include "sc_module.h" // check_all_method_process
+#include "gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
+#include "sc_clock_ext.h" // clock list
+#include "usage.h"
+#include "module_hierarchy2dot.h"
+#include "assert.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef CONFIG_CHECK_FSM_RULES
+#include "fsm_rules.h"
+#endif
 
 using namespace std;
@@ -218 +225 @@
    
   char lib_absolutepath[256]; 
-#if defined(darwin) //macosx)
+#if defined(CONFIG_OS_DARWIN)
   sprintf(lib_absolutepath, "/tmp/%s.so", base_name);
-#elif defined(linux)
+#elif defined(CONFIG_OS_LINUX)
   sprintf(lib_absolutepath, "/tmp/%s.so", base_name);
 #else
@@ -255 +262 @@
   }
   // Init variables to be able to run combinational functions
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         casc_fsm_step = STIMULI;
 #endif

sources/src/global_functions.h

@@ -13 +13 @@
 #define __GLOBAL_FUNCTIONS_H__
 
-#include"sc_fwd.h"
-#include"sc_time.h"
+#include "sc_fwd.h"
+#include "sc_time.h"
 
 extern int sc_main(int, char **);

sources/src/graph.cc

@@ -113 +113 @@
 #include "sc_module.h"
 #include "sc_port.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -154 +157 @@
 {
 Arc *a;
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if ((u == NULL) || (v == NULL))
                 exit(29042004);

sources/src/graph_cass.cc

@@ -130 +130 @@
 #include "simplify_string.h" // simplify_string
 #include "sc_ver_ext.h"      // sc_version for dumping to DOT
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/graph_signals.cc

@@ -138 +138 @@
 #include "sc_module.h"
 #include "sc_port.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/hex2string.cc

@@ -41 +41 @@
 #include <cstdlib>
 #include <iostream>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
         
 using namespace std;

sources/src/methodprocess_dependency.cc

@@ -34 +34 @@
  */
 
-#include "assert.h"
+#include <cassert>
 #include "methodprocess_dependency.h"
 #include "simplify_string.h"
@@ -40 +40 @@
 #include <iostream>
 #include <fstream>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -47 +50 @@
 get_name (const method_process_t *method)
 {
-  ASSERT(method != NULL);
+  assert(method != NULL);
   const sc_module *module = method->module;
-  ASSERT(module != NULL);
+  assert(module != NULL);
   const char *module_name = module->name ();
   const char *function_name = method->name;
@@ -85 +88 @@
     const SignalDependency &sd = *it;
     const equi_t           *source_equi     = sd.source;
-    ASSERT(source_equi != NULL);
+    assert(source_equi != NULL);
           const method_process_t *source_method   = table[source_equi];
     if (source_method == NULL)

sources/src/module_hierarchy.cc

@@ -36 +36 @@
 #include "module_hierarchy.h"
 #include "sc_module.h"
-#include "assert.h"
+#include <cassert>
 #include <map>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <cstdlib>
 #include <cstring>
@@ -73 +76 @@
       return; //obj_list = &top_level_objects;
     else {
-      ASSERT(parent != &obj);
+      assert(parent != &obj);
       const sc_object *pobj      = (const sc_module *) parent;
       obj_list = &(object2childs[pobj]);

sources/src/module_hierarchy2dot.cc

@@ -43 +43 @@
 #include "sc_signal.h"
 #include "entity.h"
-#include "assert.h"
+#include <cassert>
 #include "internal.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -88 +91 @@
       const entity &in_entity  = *it;
       sc_object    *in_obj     = in_entity.object;
-      ASSERT(in_obj != NULL);
+      assert(in_obj != NULL);
       const sc_module *in_parent = NULL;
       switch (in_entity.type) {

sources/src/mouchard_scheduling.cc

@@ -45 +45 @@
 #include "sc_module.h"
 #include "sc_ver.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/port_dependency.cc

@@ -45 +45 @@
 #include "sc_port.h"
 #include "sc_ver_ext.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -108 +111 @@
         p.destination = &b;
         aPortDependencyGraph.push_back (p);
-#if DUMP_PORT_DEPENDENCY
+#ifdef DUMP_PORT_DEPENDENCY
         if (a) {
                 cerr << "'" << ((sc_object&)b).name()

sources/src/process_dependency.cc

@@ -44 +44 @@
 #include "sc_module.h"
 #include "sc_ver.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/sc_bigint.h

@@ -22 +22 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_nbdefs.h"
+#include "sc_nbdefs.h"
 
 namespace sc_dt {

sources/src/sc_biguint.h

@@ -18 +18 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_nbdefs.h"
+#include "sc_nbdefs.h"
 
 namespace sc_dt {

sources/src/sc_bit.h

@@ -13 +13 @@
 #define __SC_BIT_H__
 
-#include"sc_nbdefs.h"
-#include"sc_fwd.h"
-#include"sc_logic.h"
-#include"sc_string.h"
-#include"sc_numrep.h"
+#include "sc_nbdefs.h"
+#include "sc_fwd.h"
+#include "sc_logic.h"
+#include "sc_string.h"
+#include "sc_numrep.h"
 
 // ----------------------------------------------------------------------------

sources/src/sc_bv.h

@@ -18 +18 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_nbdefs.h"
-#include"sc_logic.h"
-#include"sc_unsigned.h"
-#include"sc_signed.h"
-#include"sc_uint.h"
-#include"sc_int.h"
+#include "sc_nbdefs.h"
+#include "sc_logic.h"
+#include "sc_unsigned.h"
+#include "sc_signed.h"
+#include "sc_uint.h"
+#include "sc_int.h"
 
 namespace sc_dt {

sources/src/sc_clock.cc

@@ -35 +35 @@
  */
 
-#include"sc_clock.h"
-#include"assert.h"
+#include "sc_clock.h"
+#include <cassert>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -69 +72 @@
 {
         init ();
-  ASSERT(period_     == 1);
-  ASSERT(duty_cycle_ == 0.5);
-  ASSERT(start_time_ == SC_ZERO_TIME);
+  assert(period_     == 1);
+  assert(duty_cycle_ == 0.5);
+  assert(start_time_ == SC_ZERO_TIME);
   posedge_first = posedge_first_;
 }
@@ -82 +85 @@
 {
         init ();
-  ASSERT(period_     == 1);
-  ASSERT(duty_cycle_ == 0.5);
-  ASSERT(start_time_ == SC_ZERO_TIME);
+  assert(period_     == 1);
+  assert(duty_cycle_ == 0.5);
+  assert(start_time_ == SC_ZERO_TIME);
   posedge_first = posedge_first_;
 }

sources/src/sc_clock.h

@@ -14 +14 @@
 #define __SC_CLOCK_H__
 
-#include"sc_clock_ext.h"
+#include "sc_clock_ext.h"
 
 

sources/src/sc_event.cc

@@ -35 +35 @@
 
 
-#include<iostream>
-#include"sc_event.h"
-#include"sc_interface.h"
-#include"sc_port_ext.h"
+#include <iostream>
+#include "sc_event.h"
+#include "sc_interface.h"
+#include "sc_port_ext.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/sc_event.h

@@ -13 +13 @@
 #define __SC_EVENT_H__
 
-#include"sc_fwd.h"
+#include "sc_fwd.h"
+#include <iostream>
 #include<iostream>
 

sources/src/sc_event_finder.cc

@@ -35 +35 @@
 
 
-#include"sc_event_finder.h"
+#include "sc_event_finder.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 namespace sc_core {

sources/src/sc_event_finder.h

@@ -13 +13 @@
 #define __SC_EVENT_FINDER_H__
 
-#include"sc_fwd.h"
+#include "sc_fwd.h"
 
 namespace sc_core {

sources/src/sc_int.h

@@ -29 +29 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_nbdefs.h"
+#include "sc_nbdefs.h"
 
 namespace sc_dt {

sources/src/sc_interface.cc

@@ -34 +34 @@
  */
 
-#include"sc_interface.h"
-#include"sc_event.h"
-#include"assert.h"
-#include<iostream>
-#include<map>
+#include "sc_interface.h"
+#include "sc_event.h"
+#include "assert.h"
+#include <iostream>
+#include <map>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include <cstdlib>  //exit
 #include<cstdlib>  //exit
 
@@ -106 +110 @@
 {
         interface2infos_t::iterator i = interface2infos.find (this);
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (i == interface2infos.end ()) {
                 cerr << "Internal error : can't find data size of " << this << "\n";
@@ -119 +123 @@
 {
         interface2infos_t::iterator i = interface2infos.find (this);
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (i == interface2infos.end ()) {
                 cerr << "Internal error : can't find default event of " << this << "\n";

sources/src/sc_interface.h

@@ -13 +13 @@
 #define __SC_INTERFACE_H__
 
-#include"sc_fwd.h"
-#include"internal_ext.h"
+#include "sc_fwd.h"
+#include "internal_ext.h"
 
 namespace sc_core {

sources/src/sc_logic.cc

@@ -39 +39 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_logic.h"
+#include "sc_logic.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 namespace sc_dt {

sources/src/sc_logic.h

@@ -18 +18 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_nbdefs.h"
-#include"sc_fwd.h"
+#include "sc_nbdefs.h"
+#include "sc_fwd.h"
 
 namespace sc_dt {

sources/src/sc_lv.h

@@ -18 +18 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_nbdefs.h"
-#include"sc_logic.h"
-#include"sc_unsigned.h"
-#include"sc_signed.h"
-#include"sc_uint.h"
-#include"sc_int.h"
+#include "sc_nbdefs.h"
+#include "sc_logic.h"
+#include "sc_unsigned.h"
+#include "sc_signed.h"
+#include "sc_uint.h"
+#include "sc_int.h"
 
 

sources/src/sc_main.cc

@@ -35 +35 @@
  */
 
-#include<sstream>
-#include<list>
-#include<set>
-#include<cstring> // strcmp
-
-#include"internal.h"
-#include"global_functions.h"
-#include"sc_ver.h"
-#include"sc_module.h"
-#include"sc_signal.h" // pending_write_vector
-#include"dump_dot.h"
-#include"dump_used_options.h"
-#include"dump_used_env.h"
-#include"assert.h"
+#include <sstream>
+#include <list>
+#include <set>
+#include <cstring> // strcmp
+#include <cassert>
+
+#include "internal.h"
+#include "global_functions.h"
+#include "sc_ver.h"
+#include "sc_module.h"
+#include "sc_signal.h" // pending_write_vector
+#include "dump_dot.h"
+#include "dump_used_options.h"
+#include "dump_used_env.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 //
@@ -60 +64 @@
 
 bool        check_port_dependencies = false;
+#ifdef CONFIG_DEFAULT_RUNTIME_COMPILATION
+bool        dynamic_link_of_scheduling_code = true;
+#else
 bool        dynamic_link_of_scheduling_code = false;
+#endif
 bool        dump_netlist_info       = false;
 bool        dump_funclist_info      = false;
@@ -108 +116 @@
   switch (scheduling_method) {
   case CASS_SCHEDULING :
-    ASSERT(use_port_dependency == false);
+    assert(use_port_dependency == false);
     break;
   case BUCHMANN_SCHEDULING :
@@ -125 +133 @@
     exit (33);
   }
-  ASSERT(use_port_dependency || use_sensitivity_list);
+  assert(use_port_dependency || use_sensitivity_list);
 }
 

sources/src/sc_module.cc

@@ -48 +48 @@
 #include "sc_clock.h" // is_clock
 #include "entity.h"
-#include "assert.h"
+#include <cassert>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 //
@@ -160 +163 @@
   sensitivity_list_t::iterator i;
   for (i = sensitivity_list.begin (); i != sensitivity_list.end (); ++i) {
-#if defined(_DEBUG)
+#if defined(CONFIG_DEBUG) && 0
     if (i->get_interface() == NULL)
     {
@@ -238 +241 @@
           sensitive (this)
 {
-  ASSERT(nm != NULL);
+  assert(nm != NULL);
 #if 0
   cerr << "sc_module constructor with const char * parameter\n";
@@ -498 +501 @@
   if (m_pushed == false)
     return;
-  ASSERT(sc_core::module_name_stack.empty () == false);
+  assert(sc_core::module_name_stack.empty () == false);
   sc_core::module_name_stack.pop_back ();
         modules_stack.pop ();
@@ -504 +507 @@
   cout << "~sc_module_name <- " << m_name << endl;
 #endif
-  ASSERT(temp_list.empty () == false);
+  assert(temp_list.empty () == false);
   sc_module *last1 = temp_list.back();
   temp_list.pop_back();
@@ -526 +529 @@
   if (m.dont_initialize == false)
   {
-    ASSERT(m.module != NULL);
-#if DEBUG
+    assert(m.module != NULL);
+#ifdef CONFIG_DEBUG
     std::cerr << "Warning : SystemCASS doesn't perform SC_METHOD(S) initializations.\n"
               << "Please turn off automatic initialization for '" << m.name 

sources/src/sc_module.h

@@ -16 +16 @@
 #include "sc_module_ext.h"
 
-#include<list>
-#include<set>
-#include<stack>
-#include"sc_fwd.h"
-#include"internal.h"
-#include"sc_object.h"
-#include"sc_sensitive.h"
+#include <list>
+#include <set>
+#include <stack>
+#include "sc_fwd.h"
+#include "internal.h"
+#include "sc_object.h"
+#include "sc_sensitive.h"
 
 namespace sc_core {

sources/src/sc_module_ext.h

@@ -38 +38 @@
 #define __SC_MODULE_EXT_H__
 
-#include"sc_fwd.h"
-#include"internal_ext.h"
-#include"sc_object.h"
-#include"sc_sensitive.h"
-#include"serialization_ext.h"
+#include "sc_fwd.h"
+#include "internal_ext.h"
+#include "sc_object.h"
+#include "sc_sensitive.h"
+#include "serialization_ext.h"
 
 namespace sc_core {

sources/src/sc_module_name.h

@@ -14 +14 @@
 #define __SC_MODULE_NAME_H__
 
-#include"sc_fwd.h"
+#include "sc_fwd.h"
 
 namespace sc_core {

sources/src/sc_numrep.cc

@@ -36 +36 @@
 #include <string>
 #include "sc_numrep.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 namespace sc_dt {

sources/src/sc_object.cc

@@ -40 +40 @@
 #include <map>
 
-#include "assert.h"
+#include <cassert>
 #include "sc_object.h"
 //#include "sc_port.h"
@@ -46 +46 @@
 #include "sc_signal.h"
 #include "module_hierarchy.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -71 +74 @@
 //    out += ".";
   }
-//  ASSERT(name != NULL);
+//  assert(name != NULL);
   if (name)
     out += name;
@@ -203 +206 @@
 {
         object2name_t::iterator i = object2fullname.find (this);
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (i == object2fullname.end ()) {
                 cerr << "Internal error : can't find name of " << this << "\n";
@@ -217 +220 @@
 /*
         object2name_t::iterator i = object2fullname.find (this);
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (i == object2fullname.end ()) {
                 cerr << "Internal error : can't find name of " << this << "\n";
@@ -235 +238 @@
     string     out;
     sc_object* obj = *it;
-    ASSERT(obj != NULL);
+    assert(obj != NULL);
     build_full_name (out, *obj);
   }
@@ -243 +246 @@
 {
         object2infos_t::iterator i = object2infos.find (this);
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (i == object2infos.end ()) {
                 cerr << "Internal error : can't find kind of " << this << "\n";

sources/src/sc_pat_trace.cc

@@ -36 +36 @@
 
 
-#include"sc_trace.h"
-#include"sc_pat_trace.h"
-#include"sc_ver.h"
-#include"internal.h" // notrace
+#include "sc_trace.h"
+#include "sc_pat_trace.h"
+#include "sc_ver.h"
+#include "internal.h" // notrace
 
-#include<ctime>
+#include <ctime>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
-#ifdef PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
 
 //-----------------------------------------

sources/src/sc_port.cc

@@ -36 +36 @@
 
 
-#include<iomanip>
-#include<map>
-
-#include"sc_port.h"
-#include"sc_signal.h"
-#include"sc_module.h"
-#include"entity.h"
-#include"global_functions.h"
-#include"assert.h"
+#include <iomanip>
+#include <map>
+#include <cassert>
+
+#include "sc_port.h"
+#include "sc_signal.h"
+#include "sc_module.h"
+#include "entity.h"
+#include "global_functions.h"
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 extern "C" {
@@ -54 +58 @@
 using namespace std;
 
-#ifdef CHECK_FSM_RULES
-#include"fsm_rules.h"
+#ifdef CONFIG_CHECK_FSM_RULES
+#include "fsm_rules.h"
 namespace sc_core {
 casc_fsm_step_t casc_fsm_step = ELABORATION;
@@ -108 +112 @@
 sc_port_base::init ()
 {
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
         if (modules_stack.empty ()) {
                 cerr << "Internal error : modules stack empty\n";
@@ -233 +237 @@
 #endif
 #define iter (sc_core::pending_write_vector[i])
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
                 if (iter.pointer == NULL) {
                         cerr << "Internal error : trying to apply a posted write from an unassigned signal/port\n";
@@ -255 +259 @@
   cerr << "done.\n";
 #endif
-#if defined(CHECK_MULTIWRITING2REGISTER)
+#if defined(CONFIG_CHECK_MULTIWRITING2REGISTER)
   sc_core::pending_writing2register_clear ();
 #endif
@@ -310 +314 @@
 {
   const tab_t *pointer = port.get_pointer ();
-  //ASSERT(pointer != NULL);
+  //assert(pointer != NULL);
   if (pointer == NULL)
     return false; // case : sc_in not bound
@@ -343 +347 @@
   {
     /*const*/ sc_port_base *port = i->first;
-    ASSERT(port != NULL);
+    assert(port != NULL);
     check_port (*port);
   }
@@ -350 +354 @@
 }
 
-#if defined(CHECK_MULTIWRITING2REGISTER)
+#if defined(CONFIG_CHECK_MULTIWRITING2REGISTER)
 typedef set<const tab_t*> pending_writing2register_set_t;
 pending_writing2register_set_t pending_writing2register_set;

sources/src/sc_port.h

@@ -14 +14 @@
 #define __SC_PORT_H__
 
-#include"sc_port_ext.h"
-#include"sc_fwd.h"
-//#include"internal_ext.h"
+#include "sc_port_ext.h"
+#include "sc_fwd.h"
+//#include "internal_ext.h"
 
 #include <list>

sources/src/sc_port_ext.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_object.h"
-#include"sc_interface.h"
-#include"internal_ext.h"
-#include"port_dependency_ext.h"
-#include"fsm_rules.h"
+#include <iostream>
+#include <cstdlib>
+#include "sc_fwd.h"
+#include "sc_nbdefs.h"
+//#include "sc_event_finder.h"
+#include "sc_event.h"
+#include "sc_object.h"
+#include "sc_interface.h"
+#include "internal_ext.h"
+#include "port_dependency_ext.h"
+#include "fsm_rules.h"
 
 
@@ -54 +54 @@
         ///////////////////// 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.
 
@@ -184 +184 @@
                 << " on signal " << name () << "\n";
 #endif
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         if (casc_fsm_step == GEN_MOORE) {
                 std::cerr << "FSM rules error : trying to read on input port '" 
@@ -294 +294 @@
                 << " on signal " << name () << "\n";
 #endif
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         if (casc_fsm_step == GEN_MOORE) {
                 std::cerr << "FSM rules error : trying to read on input/output port " 
@@ -316 +316 @@
             << " on in/out port (writing into a signal) '" << name () << "'\n";
 #endif
-#ifdef CHECK_FSM_RULES
+#ifdef CONFIG_CHECK_FSM_RULES
         if ((casc_fsm_step != GEN_MOORE) && ( casc_fsm_step != GEN_MEALY)) {
                 std::cerr << "FSM rules error : trying to write on output port " 
@@ -325 +325 @@
 #endif
 //      T& ref = *(T*)(get_pointer());
-#if defined(CHECK_MULTIWRITING2PORT)
+#if defined(CONFIG_CHECK_MULTIWRITING2PORT)
   check_multiwriting2port ();
 #endif

sources/src/sc_sensitive.cc

@@ -35 +35 @@
 
 
-#include"sc_sensitive.h"
-#include"sc_port.h"
-#include"sc_event.h"
-#include"sc_event_finder.h"
-#include"sc_module.h"
-#include"internal.h"
+#include "sc_sensitive.h"
+#include "sc_port.h"
+#include "sc_event.h"
+#include "sc_event_finder.h"
+#include "sc_module.h"
+#include "internal.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/sc_sensitive.h

@@ -13 +13 @@
 #define __SC_SENSITIVE_H__
 
-#include<list>
-#include"sc_fwd.h"
-//#include"sc_event.h"
-//#include"sc_interface.h"
-//#include"internal_ext.h"
+#include <list>
+#include "sc_fwd.h"
+//#include "sc_event.h"
+//#include "sc_interface.h"
+//#include "internal_ext.h"
 
 namespace sc_core {

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

sources/src/sc_time.cc

@@ -35 +35 @@
 
 
-#include"sc_time.h"
+#include "sc_time.h"
 #include <ctime>
 #include <sys/time.h>
 #include <string>
 #include <sstream>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 namespace sc_core {

sources/src/sc_trace.cc

@@ -41 +41 @@
 #include "bit2string.h"
 #include "hex2string.h"
-#include "assert.h"
-
+
+#include <cassert>
 #include <list>
 #include <cstdio>
@@ -48 +48 @@
 #include <cstring> //strlen
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 //-----------------------------------------
 
@@ -53 +57 @@
 
 //-----------------------------------------
-#ifdef PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
 
 extern "C" {
@@ -63 +67 @@
 #include <cstdio>
 
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 //-----------------------------------------
 
@@ -165 +169 @@
     {
       sc_trace_file *tf = *ptf;
-      ASSERT(tf != NULL);
+      assert(tf != NULL);
                 trace (*tf, part);
     }
@@ -173 +177 @@
 }
 
-#if PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
 static void
 pat_set_value (char *buf, const signal2trace &s)
@@ -283 +287 @@
 {
 }
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 
 static
@@ -414 +418 @@
   else
     vcd_signal_table = (tab_t*) malloc (sizeof (tab_t) * size);
-#if DEBUG
+#ifdef CONFIG_DEBUG
   if (vcd_signal_table == NULL)
   {
@@ -486 +490 @@
       vcd_trace_init (tf);
   } else {
-#if defined(DEBUG)
+#if defined(CONFIG_DEBUG)
       if (vcd_signal_table == NULL)
       {
@@ -580 +584 @@
 &name)
 {
-#ifdef PAT_TRACE_FORMAT
+#ifdef CONFIG_PAT_TRACE_FORMAT
         //exemple:
         //DECLAR ("a", ":2", "X", IN, "3  downto 0", "" );
@@ -630 +634 @@
 #endif
         DECLAR ((char*)(name.c_str ()), ":1", format, dir,(char *) downto.c_str(), "" );
-#endif // PAT_TRACE_FORMAT
+#endif // CONFIG_PAT_TRACE_FORMAT
 }
 

sources/src/sc_uint.h

@@ -25 +25 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_nbdefs.h"
+#include "sc_nbdefs.h"
 
 namespace sc_dt {

sources/src/sc_uint_subref_r.cc

@@ -36 +36 @@
 #include <iostream>
 #include "sc_uint.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/sc_unsigned.h

@@ -18 +18 @@
 // ----------------------------------------------------------------------------
 
-#include"sc_nbdefs.h"
-#include"sc_logic.h"
+#include "sc_nbdefs.h"
+#include "sc_logic.h"
 
 

sources/src/sc_vcd_trace.cc

@@ -36 +36 @@
 
 
-#include"sc_trace.h"
-#include"sc_vcd_trace.h"
-#include"sc_ver.h"
-#include"internal.h"
-#include"assert.h"
+#include "sc_trace.h"
+#include "sc_vcd_trace.h"
+#include "sc_ver.h"
+#include "internal.h"
 
-#include<ctime>
-#include<string>
+#include <cassert>
+#include <ctime>
+#include <string>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 //-----------------------------------------*/
@@ -58 +62 @@
   if (notrace)
     return NULL;
-  ASSERT(name != NULL);
+  assert(name != NULL);
         string filename;
         filename = name;

sources/src/sc_ver.cc

@@ -40 +40 @@
 #include <cstdlib> //exit
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 namespace sc_core {
 
@@ -61 +65 @@
         "\n"
         "         Cycle Accurate System Simulator\n"
-#ifdef DEBUG
+#ifdef CONFIG_DEBUG
   "            DEBUG version\n"
 #endif

sources/src/schedulers.cc

@@ -35 +35 @@
  */
 
-#include<iostream>
-#include<algorithm> //std::sort
-#include"sc_module.h" // method_process_t
-#include"gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
-#include"internal.h"  // dump_all_graph
-#include"graph_cass.h" // makegraph
-#include"process_dependency.h" // MakeProcessDependencyList
-#include"signal_dependency.h" // MakeSignalDependencyGraph
-#include"mouchard_scheduling.h" // MakeMouchardScheduling
-#include"graph_signals.h" // makegraph
-//#include"module_hierarchy2dot.h"
-#include"assert.h"
+#include "sc_module.h" // method_process_t
+#include "gen_code.h"  // gen_scheduling_code_for_dynamic_link & gen_scheduling_code_for_static_func
+#include "internal.h"  // dump_all_graph
+#include "graph_cass.h" // makegraph
+#include "process_dependency.h" // MakeProcessDependencyList
+#include "signal_dependency.h" // MakeSignalDependencyGraph
+#include "mouchard_scheduling.h" // MakeMouchardScheduling
+#include "graph_signals.h" // makegraph
+//#include "module_hierarchy2dot.h"
+
+#include <cassert>
+#include <iostream>
+#include <algorithm> //std::sort
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -95 +100 @@
                          const method_process_t *a2)
 {
-  ASSERT(a1 != NULL);
-  ASSERT(a2 != NULL);
+  assert(a1 != NULL);
+  assert(a2 != NULL);
   sc_module *m1 = a1->module;
   sc_module *m2 = a2->module;
@@ -114 +119 @@
     addr1.func = a1->func;
     addr2.func = a2->func;
-    ASSERT(addr1.addr_ll != addr2.addr_ll);
+    assert(addr1.addr_ll != addr2.addr_ll);
     if ( sizeof(SC_ENTRY_FUNC) == 4 ) {
         return (addr1.addr_l < addr2.addr_l);
@@ -130 +135 @@
                     const method_process_t *a2)
 {
-  ASSERT(a1 != NULL);
-  ASSERT(a2 != NULL);
+  assert(a1 != NULL);
+  assert(a2 != NULL);
   return (a1->module < a2->module);
 }
@@ -140 +145 @@
                  const method_process_t *a2)
 {
-    ASSERT(a1 != NULL);
-    ASSERT(a2 != NULL);
+    assert(a1 != NULL);
+    assert(a2 != NULL);
     union {
         SC_ENTRY_FUNC func;
@@ -237 +242 @@
 {
   SignalDependencyGraph *sig_graph = MakeAcyclicSignalDependencyGraph ();
-  ASSERT(sig_graph != NULL);
+  assert(sig_graph != NULL);
   // Create the process evaluation list
   ProcessDependencyList* process_list = MakeMouchardScheduling (*sig_graph);
-  ASSERT(process_list != NULL);
+  assert(process_list != NULL);
 
   if (dump_all_graph)
@@ -284 +289 @@
     // Uses port dependancies like Dr. Mouchard.
     ProcessDependencyList* process_list = BuchmannScheduling ();
-    base_name = gen_scheduling_code_for_dynamic_link (transition_func_list, moore_func_list,*process_list);
-    gen_scheduling_code_for_static_func (transition_func_list, moore_func_list, *process_list);
+        if (dynamic_link_of_scheduling_code)
+                base_name = gen_scheduling_code_for_dynamic_link (transition_func_list, moore_func_list,*process_list);
+        else
+                gen_scheduling_code_for_static_func (transition_func_list, moore_func_list, *process_list);
     break;
   }
@@ -295 +302 @@
     // and does not use an event-driven scheduler.
     ProcessDependencyList* process_list = MouchardScheduling ();
-    base_name = gen_scheduling_code_for_dynamic_link(transition_func_list, moore_func_list,*process_list);
-    gen_scheduling_code_for_static_func (transition_func_list, moore_func_list, *process_list);
+        if (dynamic_link_of_scheduling_code)
+                base_name = gen_scheduling_code_for_dynamic_link(transition_func_list, moore_func_list,*process_list);
+        else
+                gen_scheduling_code_for_static_func (transition_func_list, moore_func_list, *process_list);
     break;
   }
@@ -307 +316 @@
       graph2dot("module_graph", *g);
     strong_component_list_t *strong_list = strong_component (g);
-    base_name = gen_scheduling_code_for_dynamic_link(transition_func_list, moore_func_list,*strong_list);
-    gen_scheduling_code_for_quasistatic_func (transition_func_list, moore_func_list, *strong_list);
+        if (dynamic_link_of_scheduling_code)
+                base_name = gen_scheduling_code_for_dynamic_link(transition_func_list, moore_func_list,*strong_list);
+        else
+                gen_scheduling_code_for_quasistatic_func (transition_func_list, moore_func_list, *strong_list);
     break;
   }

sources/src/schedulers.h

@@ -13 +13 @@
 #define __SCHEDULERS_H__
 
-#include"sc_fwd.h"
-#include"sc_time.h"
+#include "sc_fwd.h"
+#include "sc_time.h"
 
 namespace sc_core {

sources/src/serialization.cc

@@ -35 +35 @@
 
 
-#include<map>
-#include<fstream>
-//#include<vector> // save_module_hierarchy
-
-#include"internal_ext.h" // tab_t
-#include"serialization.h"
-#include"entity.h"
-#include"sc_module.h"
-#include"sc_object.h"
-#include"hex2string.h"
-#include"assert.h"
+#include "internal_ext.h" // tab_t
+#include "serialization.h"
+#include "entity.h"
+#include "sc_module.h"
+#include "sc_object.h"
+#include "hex2string.h"
+
+#include <cassert>
+#include <map>
+#include <fstream>
+//#include <vector> // save_module_hierarchy
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;
@@ -84 +88 @@
             int          bit_number)
 {
-  ASSERT(bit_number <= 64);
+  assert(bit_number <= 64);
   if (bit_number == 1) {
     bool v = *((const bool*) val);
@@ -140 +144 @@
                     save_fct_t1      fct)
 {
-  //ASSERT(fct != NULL);
+  //assert(fct != NULL);
   //sc_module2save_fct_t1::value_type pair(&mod,fct);
   //save_handler_table.insert (pair);
@@ -158 +162 @@
     const sc_module *mod = it->first;
     save_fct_t1      fct = it->second;
-    ASSERT(mod != NULL);
-//    ASSERT(fct != NULL);
+    assert(mod != NULL);
+//    assert(fct != NULL);
     //o << mod->name () << endl;
     fprintf (o,"module\n%s\n",mod->name ());
@@ -185 +189 @@
   file.close ();
   FILE *f = fopen (filename, "a+");
-  ASSERT(f != NULL);
+  assert(f != NULL);
   save_modules (f);
   fclose (f);

sources/src/serialization.h

@@ -13 +13 @@
 #define __SERIALIZATION_H__
 
-#include"serialization_ext.h"
-#include"sc_fwd.h"
+#include "serialization_ext.h"
+#include "sc_fwd.h"
 
 namespace sc_core {

sources/src/serialization_ext.h

@@ -37 +37 @@
 #define __SERIALIZATION_EXT_H__
 
-#include<iostream>
-#include"sc_fwd.h"
+#include <iostream>
+#include "sc_fwd.h"
 
 namespace sc_core {

sources/src/signal_dependency.cc

@@ -43 +43 @@
 #include "sc_module.h"
 #include "sc_ver_ext.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/simplify_string.cc

@@ -35 +35 @@
 
 #include "simplify_string.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 using namespace std;

sources/src/systemc

@@ -29 +29 @@
 #include"sc_vcd_trace.h"
 #include"sc_pat_trace.h"
-#include"endianness.h"
 
 #endif