Changes in sources/src/gen_code.cc [27:17]

File:

• sources/src/gen_code.cc (modified) (14 diffs)

sources/src/gen_code.cc

@@ -34 +34 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#if defined(__linux__)
+#ifndef _WIN32
 #include <linux/limits.h>
-#elif defined(WIN32)
+#else
 #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 HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef CONFIG_CHECK_FSM_RULES
-#include "fsm_rules.h"
-#define fsm_check_flag "-DCONFIG_CHECK_FSM_RULES"
+#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"
 #else
 #define fsm_check_flag
 #endif
 
-#define casc_cflags GENERATED_MODULE_CFLAGS " " fsm_check_flag
-
-// Enable CPP call, this is useful for typeinfo-enabled classes
-#define CPP_CALL
+#define casc_cflags CFLAGS " " fsm_check_flag
+
+#if defined(darwin)
+#define macosx
+#endif
 
 using namespace std;
@@ -94 +91 @@
                 << m.module->name() << "->" << m.name << "()\\n\");\n";
   o << " p.integer = " << func << ";\n";
-#ifdef CPP_CALL
+#if CPP_CALL
   o << " (((sc_module*)(" << m.module << "))->*(p.pmf)) (); /* " 
                 << m.module->name () << "->" << m.name << "() */\n";
@@ -146 +143 @@
   }
 
-#ifdef CONFIG_DEBUG
+#ifdef DEBUG
   cerr << "opened temporary filename : " << temp << "\n";
 #endif
@@ -271 +268 @@
 
   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"
@@ -332 +329 @@
 
   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"
@@ -380 +377 @@
 //  const char *target_arch = getenv ("TARGET_ARCH");
         const char *default_compiler =
-#ifdef CPP_CALL
+#if CPP_CALL
                 "g++";
 #else
@@ -421 +418 @@
   /* COMPILE */
   /* ******* */
-  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)"
+#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);
 #else
-          "(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);
+    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
 
   if (dump_stage) 
@@ -452 +461 @@
   sprintf (target_name, "%s.so", base_name);
 
-#ifdef CONFIG_OS_LINUX
+#if defined(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 */ 
@@ -551 +560 @@
   for (i = 0; i < n; ++i)
   {
-#if 0 //defined(CONFIG_DEBUG)
+#if 0 //defined(DEBUG)
     sc_module *m = (sc_module*)(fc.instance[i]);
     cerr << m->name () << endl;
@@ -566 +575 @@
 void static_simulate_1_cycle (void) 
 {
-#ifdef CONFIG_CHECK_FSM_RULES
+#ifdef CHECK_FSM_RULES
         casc_fsm_step = TRANSITION;
 #endif
   call_functions (pf[0]); // transition
   update     ();
-#ifdef CONFIG_CHECK_FSM_RULES
+#ifdef CHECK_FSM_RULES
         casc_fsm_step = GEN_MOORE;
 #endif
   call_functions (pf[1]); // moore generation
-#ifdef CONFIG_CHECK_FSM_RULES
+#ifdef CHECK_FSM_RULES
         casc_fsm_step = GEN_MEALY;
 #endif
   call_functions (pf[2]); // mealy generation
-#ifdef CONFIG_CHECK_FSM_RULES
+#ifdef CHECK_FSM_RULES
         casc_fsm_step = STIMULI;
 #endif
@@ -625 +634 @@
 void quasistatic_simulate_1_cycle (void) 
 {
-#ifdef CONFIG_CHECK_FSM_RULES
+#ifdef CHECK_FSM_RULES
         casc_fsm_step = TRANSITION;
 #endif
@@ -635 +644 @@
   }
   update     ();
-#ifdef CONFIG_CHECK_FSM_RULES
+#ifdef CHECK_FSM_RULES
         casc_fsm_step = GEN_MOORE;
 #endif
@@ -643 +652 @@
     Call (m);
   }
-#ifdef CONFIG_CHECK_FSM_RULES
+#ifdef CHECK_FSM_RULES
         casc_fsm_step = GEN_MEALY;
 #endif
   quasistatic_mealy_generation ();
-#ifdef CONFIG_CHECK_FSM_RULES
+#ifdef CHECK_FSM_RULES
         casc_fsm_step = STIMULI;
 #endif