Changeset 97 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp

Timestamp:

Dec 19, 2008, 4:34:00 PM (16 years ago)

Author:

rosiere

Message:

1) Update Prediction Table : statistics
2) Size instruction address on 30 bits
3) Change Log File
4) Add debug_level in simulation configuration file

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp (modified) (3 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/src/Configuration.cpp

@@ -23 +23 @@
     log_begin(Configuration,FUNCTION);
 
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Simulator configuration
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     _simulator = new Simulator (filename_simulator);
-    _generator = new Generator (filename_generator);
-    _instance  = new Instance  (filename_instance ,
-                                _generator,
-                                get_custom_information);
 
     //--------------------------------------------------
-    // Name
+    // Directory
     //--------------------------------------------------
-    _name      = _instance->getName();
+    directory_init (_simulator->getParam("directory_statistics"),
+                    _simulator->getParam("directory_vhdl"      ),
+                    _simulator->getParam("directory_position"  ),
+                    _simulator->getParam("directory_log"       ));
 
     //--------------------------------------------------
-    // Parameters
+    // Debug & Log File
     //--------------------------------------------------
-    _param     = _instance->_param;
+    debug_init (fromString<debug_verbosity_t>(_simulator->getParam("debug_level")));
+
+    log_init(fromString<bool>(_simulator->getParam("debug_have_log_file")),
+             MORPHEO_LOG);
 
     //--------------------------------------------------
@@ -64 +70 @@
 
     //--------------------------------------------------
+    // Header
+    //--------------------------------------------------
+
+    if (usage_is_set(_usage,USE_HEADER))
+      std::cout << header();
+
+    //--------------------------------------------------
     // Parameters_Statistics
     //--------------------------------------------------
@@ -75 +88 @@
                      fromString<double>(_simulator->getParam("simulation_nb_instruction")));
 
+
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Generator configuration + Instance
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    _generator = new Generator (filename_generator);
+    _instance  = new Instance  (filename_instance ,
+                                _generator,
+                                get_custom_information);
+
     //--------------------------------------------------
-    // Directory
+    // Name
     //--------------------------------------------------
-    directory_init (_simulator->getParam("directory_statistics"),
-                    _simulator->getParam("directory_vhdl"      ),
-                    _simulator->getParam("directory_position"  ),
-                    _simulator->getParam("directory_log"       ));
+    _name      = _instance->getName();
+
+    //--------------------------------------------------
+    // Parameters
+    //--------------------------------------------------
+    _param     = _instance->_param;
+
 
     log_end(Configuration,FUNCTION);