Changeset 3 for trunk/IPs/systemC/processor/Morpheo/Include

Timestamp:

Mar 6, 2007, 3:34:04 PM (18 years ago)

Author:

kane

Message:

1) Ajout d'un "printer" XML pour la configuration de paramètres

2) Fin du composant "Two_Level_Branch_Predictor"

validation * systemc

• vhdl

Location:

trunk/IPs/systemC/processor/Morpheo/Include

Files:

• Debug.h (modified) (1 diff)
• ErrorMorpheo.h (modified) (1 diff)
• Test.h (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Include/Debug.h

@@ -43 +43 @@
         fprintf(stdout,"In file %s, ",__FILE__);                                      \
         fprintf(stdout,"at line %d, ",__LINE__);                                      \
-        fprintf(stdout,"in function \"%s\" : ",func);                                \
+        fprintf(stdout,"in function \"%s\" : ",func);                                 \
         fprintf(stdout,str);                                                          \
         fprintf(stdout,"\n");                                                         \

trunk/IPs/systemC/processor/Morpheo/Include/ErrorMorpheo.h

@@ -29 +29 @@
   };
 
+  class TestMorpheo : public exception 
+  {
+    // -----[ fields ]----------------------------------------------------
+  private : string _msg;
+    
+    // -----[ methods ]---------------------------------------------------
+  public  :             TestMorpheo   ()           throw() { _msg = "Test error ...";}
+  public  :             TestMorpheo   (string msg) throw() { _msg = msg;}
+  public  :             ~TestMorpheo  (void)       throw() {}
+  public  : const char* what          ()    const  throw() { return ( _msg.c_str() );}
+  };
+
 }; // end namespace morpheo              
 

trunk/IPs/systemC/processor/Morpheo/Include/Test.h

@@ -5 +5 @@
 #include <sstream>
 #include <stdint.h>
+#include "Include/ErrorMorpheo.h"
 using namespace std;
 
@@ -14 +15 @@
 void test_ko (T exp1, T exp2, char * file, uint32_t line)
 {
-  cout << "{" << num_test << "} : Test KO" << endl
-       << " * Localisation"                << endl
-       << "   - File : " << file           << endl
-       << "   - Line : " << line           << endl
-       << " * Expression is different "    << endl
-       << "   - exp1 : " << exp1           << endl
-       << "   - exp2 : " << exp2           << endl;
-
-  exit (line);
+  string msg = ("{"+toString(num_test)+"} : Test KO\n" +
+                " * Localisation\n"                    +
+                "   - File : "+file+"\n"               +
+                "   - Line : "+toString(line)+"\n"     +
+                " * Expression is different\n"         +
+                "   - exp1 : "+toString(exp1)+"\n"     +
+                "   - exp2 : "+toString(exp2)+"\n");
+  
+  throw (ErrorMorpheo (msg));
 };