Changeset 71 for trunk/IPs/systemC/processor/Morpheo/Common/include/Test.h

Timestamp:

Jan 19, 2008, 12:09:01 PM (16 years ago)

Author:

rosiere

Message:

Modification of Statisctics
Add a new systemC component : Load_Store_Queue (tested with one benchmark and one configuration). Store don't supported the Data Buss Error (Load is supported)

File:

• trunk/IPs/systemC/processor/Morpheo/Common/include/Test.h (modified) (6 diffs)

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

@@ -5 +5 @@
 #include <sstream>
 #include <stdint.h>
+#include "Common/include/Message.h"
 #include "Common/include/ErrorMorpheo.h"
-using namespace std;
+#include "Common/include/ToString.h"
 
 //-----[ Routine de test ]---------------------------------------
@@ -12 +13 @@
 static uint32_t num_test;
 
-void test_ko_error (void)
+inline void test_ko_error (void)
 {
-  string msg = "Test ko : error in test \""+toString(num_test)+"\"";
-  throw (ErrorMorpheo (msg));
+  string msg = "Test ko : error in test \""+morpheo::toString(num_test)+"\"";
+  throw (morpheo::ErrorMorpheo (msg));
 }
   
 template <class T>
-void test_ko (char * file, uint32_t line, T exp1, T exp2)
+inline void test_ko (char * file, uint32_t line, T exp1, T exp2)
 {
   cerr << "[" << num_test << "] : Test KO"
@@ -27 +28 @@
        << "   - Line : " << line                      << endl
        << " * Expression is different"                << endl
-       << "   - exp1 : "+toString(exp1)               << endl
-       << "   - exp2 : "+toString(exp2)               << endl;
+       << "   - exp1 : "+morpheo::toString(exp1)               << endl
+       << "   - exp2 : "+morpheo::toString(exp2)               << endl;
 
   test_ko_error ();
 };
 
-void test_ko (char * file, uint32_t line)
+inline void test_ko (char * file, uint32_t line)
 {
   cerr << "[" << num_test << "] : Test KO"
@@ -44 +45 @@
 };
 
-void test_ok ()
+inline void test_ok ()
 {
-  cout << "[" << num_test << "] : Test OK"            << endl;
+  msg (_("[%d] : Test OK\n"), num_test);
 
   num_test ++;
 };
 
-void test_ok (char * file, uint32_t line)
+inline void test_ok (char * file, uint32_t line)
 {
-  cout << "[" << num_test << "] : Test OK"
-       << "\tline " << line                           << endl
-//     << " * Localisation"                           << endl
-//     << "   - File : " << file                      << endl
-//     << "   - Line : " << line                      << endl
-    ;
+  msg (_("[%d] : Test OK\n"), num_test);
+  msg (_("\tline %d\n"), line);
 
   num_test ++;
@@ -64 +61 @@
 
 template <class T>
-void test_ok (char * file, uint32_t line, T exp)
+inline void test_ok (char * file, uint32_t line, T exp)
 {
-  cout << "[" << num_test << "] : Test OK"
-       << "\tline " << line                           
-       << "\tvalue : " << toString(exp)               << endl
-//     << " * Localisation"                           << endl
-//     << "   - File : " << file                      << endl
-//     << "   - Line : " << line                      << endl
-//     << " * Expression"                             << endl
-//     << "   - exp  : "+toString(exp)                << endl
-    ;
+  msg (_("[%d] : Test OK\n"), num_test);
+  msg (_("\tline %d\n"), line);
+  msg (_("\tvalue %s\n"), (morpheo::toString(exp)).c_str());
 
   num_test ++;
@@ -80 +71 @@
 
 template <class T>
-void test(char * file, uint32_t line, T exp1, T exp2)
+inline void test(char * file, uint32_t line, T exp1, T exp2)
 {
   if (exp1 != exp2)