Changeset 42

Timestamp:

Aug 24, 2009, 1:12:39 PM (15 years ago)

Author:

buchmann

Message:

Changes:

• code cleanup
• now prints correctly unsigned/signed (serialization.cc)

Fix:

• when the --help option is used, there is no simulation performed.

Location:

sources/src

Files:

• dump_used_env.cc (modified) (1 diff)
• dump_used_options.cc (modified) (2 diffs)
• global_functions.cc (modified) (4 diffs)
• sc_main.cc (modified) (1 diff)
• serialization.cc (modified) (1 diff)

sources/src/dump_used_env.cc

@@ -43 +43 @@
 sc_core::get_used_env()
 {
-  const char *compiler = getenv ("GCC");
+  const char *compiler    = getenv ("GCC");
   const char *systemc_dir = getenv ("SYSTEMCASS");
   const char *target_arch = getenv ("TARGET_ARCH");

sources/src/dump_used_options.cc

@@ -71 +71 @@
   "CONFIG_CHECK_FSM_RULES, "
 #endif
-#ifdef COMPIL_DEBUG  
-  "COMPIL_DEBUG,"       
+#ifdef CONFIG_CHECK_MULTIWRITING2PORT     
+  "CONFIG_CHECK_MULTIWRITING2PORT, "
+#endif
+#ifdef CONFIG_CHECK_MULTIWRITING2REGISTER     
+  "CONFIG_CHECK_MULTIWRITING2REGISTER, "
+#endif
+#ifdef CONFIG_DEFAULT_RUNTIME_COMPILATION     
+  "CONFIG_DEFAULT_RUNTIME_COMPILATION, "
+#endif
+#ifdef CONFIG_OS_DARWIN     
+  "CONFIG_OS_DARWIN, "
+#endif
+#ifdef CONFIG_OS_LINUX     
+  "CONFIG_OS_LINUX, "
+#endif
+#ifdef CONFIG_PAT_TRACE_FORMAT     
+  "CONFIG_PAT_TRACE_FORMAT, "
 #endif
 #ifdef CONFIG_DEBUG
@@ -82 +97 @@
 #ifdef INIT_SIGNALS_TO_ZERO
   "INIT_SIGNALS_TO_ZERO, "
+#endif
+#ifdef _OPENMP
+  "_OPENMP, "
 #endif
   "...";

sources/src/global_functions.cc

@@ -98 +98 @@
                    const equi_list_t &el)
 {
-        equi_list_t::const_iterator i;
-        for (i = el.begin (); i != el.end(); ++i) {
-                equi_t::const_iterator j;
-                for (j = i->begin (); j != i->end (); ++j) {
-                        if (j->kind () == sc_clock::kind_string)
-                                c.insert ((const sc_clock*)j->object);
-          }
-        }
+  equi_list_t::const_iterator i;
+  for (i = el.begin (); i != el.end(); ++i) {
+    equi_t::const_iterator j;
+    for (j = i->begin (); j != i->end (); ++j) {
+      if (j->kind () == sc_clock::kind_string)
+        c.insert ((const sc_clock*)j->object);
+    }
+  }
 }
 
@@ -234 +234 @@
 #endif
   
-        link (lib_absolutepath);
+  link (lib_absolutepath);
 }
 
@@ -277 +277 @@
   else
     pending_write_vector = (pending_write_vector_t) realloc (pending_write_vector, sizeof (pending_write_t) * pending_write_vector_capacity);
-        
+  
   // create the clock list
   clock_list_t clock_list;
@@ -295 +295 @@
   // Check if any constructor wrote into registers
   if (pending_write_vector_nb != 0)
-        {
-                cerr << "Error : Register/Signal writing is not allowed before sc_initialize.\n"
-                        "Move initializations from constructors/sc_main to module reset sequences.\n";
-                // we are unable to dump register(s) name(s) 
-                // because the table binding is not yet completed.
-                exit (24);
-        }
+  {
+    cerr << "Error : Register/Signal writing is not allowed before sc_initialize.\n"
+      "Move initializations from constructors/sc_main to module reset sequences.\n";
+    // we are unable to dump register(s) name(s) 
+    // because the table binding is not yet completed.
+    exit (24);
+  }
  
   string base_name = get_scheduling (scheduling_method);

sources/src/sc_main.cc

@@ -266 +266 @@
             cerr << get_used_options  () << "\n";
             cerr << get_used_env () << "\n";
-            continue;
+            cerr << sc_version () << "\n\n";
+            exit (0);
           case 'u' : 
             if (strcmp (argv[i]+2, "usage") == 0)

sources/src/serialization.cc

@@ -98 +98 @@
   } else if (bit_number <= 16) {
     uint16 v = *((const uint16*)val);
-    sprintf (buf, "%d", v);
+    sprintf (buf, "%u", (uint32) v);
   } else if (bit_number <= 32) {
     uint32 v = *((const uint32*)val);
-    sprintf (buf, "%d", v);
+    sprintf (buf, "%u", v);
   } else if (bit_number <= 64) {
     uint64 v = *((const uint64*)val);
-    sprintf (buf, "%lld", v);
+    sprintf (buf, "%llu", v);
   }
 }