Changeset 131 for trunk/IPs/systemC/processor/Morpheo/Common

Timestamp:

Jul 8, 2009, 8:40:08 PM (15 years ago)

Author:

rosiere

Message:

1) add constant method
2) test with systemc 2.2.0

Location:

trunk/IPs/systemC/processor/Morpheo/Common

Files:

• include/Basename.h (added)
• include/Systemc.h (modified) (1 diff)
• include/Test.h (modified) (1 diff)
• src/Basename.cpp (added)
• src/Translation.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Common/include/Systemc.h

@@ -36 +36 @@
 
 #ifdef MTI_SYSTEMC
-# define simulation_run(x) do{ if (x>0) wait(TIME_PERIOD*x,TIME_UNIT); else for (int i=0; i<1000; ++i) wait(SC_ZERO_TIME); } while(0)
+#  define simulation_run(x) do{ if (x>0) wait(TIME_PERIOD*x,TIME_UNIT); else for (int i=0; i<1000; ++i) wait(SC_ZERO_TIME); } while(0)
 #else
-# define simulation_run(x) do{ sc_start(x); } while(0)
+# ifdef SYSTEMCASS_SPECIFIC
+#  define simulation_run(x) do{ sc_time t (x,TIME_UNIT); sc_start(t); } while(0)
+# else // systemc
+#  define simulation_run(x) do{ if(x==0) {sc_start(SC_ZERO_TIME);} else {sc_time t (x,TIME_UNIT); sc_start(t);}} while(0)
+# endif
 #endif
 
 #define simulation_cycle() sc_simulation_time()/TIME_PERIOD
-
+// #define simulation_cycle() sc_time_stamp()/TIME_PERIOD
 };
 #endif

trunk/IPs/systemC/processor/Morpheo/Common/include/Test.h

@@ -119 +119 @@
           TEST_KO("Maximal cycles Reached");                            \
         }                                                               \
-                                                                        \
+                                                                        \
       simulation_run(cycle_offset);                                     \
                                                                         \

trunk/IPs/systemC/processor/Morpheo/Common/src/Translation.cpp

@@ -12 +12 @@
 namespace morpheo {
 
+#ifdef TRANSLATION
   static bool translation_initialized;
+#endif
 
   void translation (void)