Changeset 114 for trunk/IPs/systemC/processor/Morpheo/Behavioural

Timestamp:

Apr 17, 2009, 12:35:37 AM (16 years ago)

Author:

rosiere

Message:

1) Fix bug with previous commit
2) Add test libc
3) Change Dhrystone

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural

Files:

• Configuration/src/Configuration.cpp (modified) (1 diff)
• Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp (modified) (1 diff)
• Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp (modified) (1 diff)
• Generic/Queue/lib (deleted)
• include/Version.h (modified) (1 diff)

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

@@ -66 +66 @@
     if (fromString<bool>(_simulator->getParam("use_statistics")))
       _usage = usage_set(_usage, USE_STATISTICS);
-    if (fromString<bool>(_simulator->getParam("use_information")))
-      _usage = usage_set(_usage, USE_INFORMATION);
+//     if (fromString<bool>(_simulator->getParam("use_information")))
+//       _usage = usage_set(_usage, USE_INFORMATION);
     if (fromString<bool>(_simulator->getParam("use_header")))
       _usage = usage_set(_usage, USE_HEADER);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Write_unit/Write_unit/Write_queue/src/Write_queue_allocation.cpp

@@ -141 +141 @@
 
     // ~~~~~[ Component ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~    
-    _param_queue = new morpheo::behavioural::generic::queue::Parameters
-      (_param->_size_queue,
-       _param->_size_internal_queue,
-       _param->_nb_bypass_write,
-       false,
-       false
-       );
-
-    std::string queue_name = _name + "_queue";
-    _component_queue = new morpheo::behavioural::generic::queue::Queue
-      (queue_name.c_str()
+#ifdef VHDL
+     if (usage_is_set(_usage,USE_VHDL))
+       {
+         _param_queue = new morpheo::behavioural::generic::queue::Parameters
+           (_param->_size_queue,
+            _param->_size_internal_queue,
+            _param->_nb_bypass_write,
+            false,
+            false
+            );
+         
+         std::string queue_name = _name + "_queue";
+         _component_queue = new morpheo::behavioural::generic::queue::Queue
+           (queue_name.c_str()
 #ifdef STATISTICS
-       ,NULL
+            ,NULL
 #endif
-       ,_param_queue
-       ,USE_VHDL);
-    
-    _component->set_component(_component_queue->_component
+            ,_param_queue
+            ,USE_VHDL);
+         
+         _component->set_component(_component_queue->_component
 #ifdef POSITION
-                              , 50, 50, 50, 50
+                                   , 50, 50, 50, 50
 #endif
-                              , INSTANCE_LIBRARY
-                              );
+                                   , INSTANCE_LIBRARY
+                                   );
+       }
+#endif
 
 #ifdef POSITION

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_OOO_Engine/OOO_Engine/Commit_unit/src/Commit_unit_transition.cpp

@@ -427 +427 @@
                 instruction_log_file [num_thread] 
                   << "[" << simulation_cycle() << "] "
-                  << "{" << ((retire_ok)?" OK ":"!KO!") << "} "
                   << std::hex
-                  << "0x" << entry->address << " (0x" << (entry->address<<2) << ") "
+                  << (entry->address<<2) << " (" << (entry->address) << ") "
                   << std::dec
                   << "[" << entry->cycle_rob_in << ", " << entry->cycle_commit << "] "
+                  << "{" << ((retire_ok)?" OK ":"!KO!") << "} "
                   << std::endl;
 #endif

trunk/IPs/systemC/processor/Morpheo/Behavioural/include/Version.h

@@ -10 +10 @@
 #define MORPHEO_MAJOR_VERSION "0"
 #define MORPHEO_MINOR_VERSION "2"
-#define MORPHEO_REVISION      "113"
+#define MORPHEO_REVISION      "114"
 #define MORPHEO_CODENAME      "Castor"
 
-#define MORPHEO_DATE_DAY      "14"  
+#define MORPHEO_DATE_DAY      "17"  
 #define MORPHEO_DATE_MONTH    "04"
 #define MORPHEO_DATE_YEAR     "2009"