Changeset 124 for trunk/Platforms/Test/src

Timestamp:

Jun 17, 2009, 2:11:25 PM (16 years ago)

Author:

rosiere

Message:

1) Add test and configuration
2) Fix Bug
3) Add log file in load store unit
4) Fix Bug in environment

File:

• trunk/Platforms/Test/src/test.cpp (modified) (2 diffs)

trunk/Platforms/Test/src/test.cpp

@@ -493 +493 @@
   cerr << "<test> Simulation Start" << endl;
 
-  Time * _time_global = new Time();
-
-  for (uint32_t i=0; i<morpheo->_nb_thread; ++i)
-    INTERRUPT_ENABLE[i]->write(0);
-
-  NRESET->write(0);
-  SC_START(5);
-  NRESET->write(1);  
-
-  // Infinite loop
-  do
-    {
-//       Time * _time_local = new Time();
-      SC_START(100000);
-//       delete _time_local;
-    } while (not morpheo    ->simulation_end() and // morpheo condition stop
-             not environment->simulation_end());   // test ok
-  delete _time_global;
+  bool morpheo_error = false;
+  try 
+    {
+      Time * _time_global = new Time();
+      
+      for (uint32_t i=0; i<morpheo->_nb_thread; ++i)
+        INTERRUPT_ENABLE[i]->write(0);
+      
+      NRESET->write(0);
+      SC_START(5);
+      NRESET->write(1);  
+      
+      // Infinite loop
+      do
+        {
+          //       Time * _time_local = new Time();
+          SC_START(100000);
+          //       delete _time_local;
+        } while (not morpheo    ->simulation_end() and // morpheo condition stop
+                 not environment->simulation_end());   // test ok
+      delete _time_global;
+    }
+  catch (morpheo::ErrorMorpheo & error)
+    {
+      std::cerr << error.what() << std::endl
+                << STR_KO << std::endl;
+
+      morpheo_error = true;
+    }
 
   bool morpheo_end     = morpheo->simulation_end();
@@ -626 +637 @@
 
   bool test_ok = false;
-  if (not morpheo_end and not environment_end)
-    {
-      cerr << "<test> Simulation End : Unknow" << endl;
-    }
-  else
-    {
-      if (morpheo_end)
-        cout << "<test> Simulation End : MORPHEO" << endl;
-      if (environment_end)
+  if (not morpheo_error)
+    {
+      if (not morpheo_end and not environment_end)
         {
-          cout << "<test> Simulation End : ENVIRONMENT" << endl;
-          test_ok = true;
+          cerr << "<test> Simulation End : Unknow" << endl;
         }
-    }
-      
+      else
+        {
+          if (morpheo_end)
+            {
+              cout << "<test> Simulation End : MORPHEO" << endl;
+              test_ok = true;
+            }
+          if (environment_end)
+            {
+              cout << "<test> Simulation End : ENVIRONMENT" << endl;
+              test_ok = true;
+            }
+        }
+    }
+
   if (test_ok)
     {