Changeset 27 for sources/src/sc_module.cc

Timestamp:

May 4, 2009, 8:51:56 PM (16 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_module.cc (modified) (6 diffs)

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