Changeset 72 for trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component

Timestamp:

Jan 29, 2008, 1:34:47 PM (16 years ago)

Author:

rosiere

Message:

• SystemC de l'unite fonctionnelle.
• gestion des groupes / instructions custom

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component

Files:

• SelfTest/src/main.cpp (modified) (2 diffs)
• SelfTest/src/test.cpp (modified) (2 diffs)
• include/Parameters.h (modified) (1 diff)
• src/Parameters_print.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src/main.cpp

@@ -40 +40 @@
         );
       
-      msg(_("%s"),param->print(1).c_str()):
+      msg(_("%s"),param->print(1).c_str());
       
       test (name,param);
@@ -46 +46 @@
   catch (morpheo::ErrorMorpheo & error)
     {
-      msg (_("<%s> : %s.\n"),name, error.what ());
+      msg (_("<%s> : %s.\n"),name.c_str(), error.what ());
       exit (EXIT_FAILURE);
     }
   catch (...)
     {
-      
-      err (_("<%s> : This test must generate a error.\n"),name);
+      err (_("<%s> : This test must generate a error.\n"),name.c_str());
       exit (EXIT_FAILURE);
     }

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/SelfTest/src/test.cpp

@@ -13 +13 @@
 #define CYCLE_MAX     (128*NB_ITERATION)
 
-#define LABEL(str)                                                      \
+#define LABEL(str...)                                                   \
   {                                                                     \
-  msg (_("{%d} %s\n"),static_cast<uint32_t>(sc_simulation_time()),str); \
-} while(0)
+    msg (_("{%d} "),static_cast<uint32_t>(sc_simulation_time()));       \
+    msg (str);                                                          \
+    msg (_("\n"));                                                      \
+  } while(0)
 
 #define SC_START(cycle_offset)                                                       \
@@ -100 +102 @@
   for (uint32_t iteration=0; iteration<NB_ITERATION; iteration ++)
     {
-      LABEL("Iteration "+toString(iteration));
+      LABEL("Iteration %d",iteration);
 
       SC_START(1);

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/include/Parameters.h

@@ -26 +26 @@
   public : ~Parameters () ;
 
-  public : string msg_error (void);
+  public :        std::string   msg_error  (void);
 
-  public :        string   print      (uint32_t depth);
-  public : friend ostream& operator<< (ostream& output_stream,
-                                       morpheo::behavioural::@NAMESPACE_USE::Parameters & x);
+  public :        std::string   print      (uint32_t depth);
+  public : friend std::ostream& operator<< (std::ostream& output_stream,
+                                            morpheo::behavioural::@NAMESPACE_USE::Parameters & x);
   };
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/New_Component/src/Parameters_print.cpp

@@ -32 +32 @@
 #undef  FUNCTION
 #define FUNCTION "@COMPONENT::operator<<"
-  ostream& operator<< (ostream& output_stream ,
-                       morpheo::behavioural::@NAMESPACE_USE::Parameters & x)
+  std::stringostream& operator<< (std::stringostream& output_stream ,
+                                  morpheo::behavioural::@NAMESPACE_USE::Parameters & x)
   {
     log_printf(FUNC,@COMPONENT,FUNCTION,"Begin");