Changeset 27 for sources/src/entity.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/entity.cc (modified) (13 diffs)

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);