Changeset 82 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked

Timestamp:

May 1, 2008, 6:48:45 PM (16 years ago)

Author:

rosiere

Message:

• support locale (now must "just" translate)
• update all component with new test format
• update all component with usage
• New component : decod queue and prediction_unit

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked

Files:

• SelfTest/src/test.cpp (modified) (2 diffs)
• include/RegisterFile_Multi_Banked.h (modified) (3 diffs)
• include/Types.h (modified) (1 diff)
• src/RegisterFile_Multi_Banked.cpp (modified) (1 diff)
• src/RegisterFile_Multi_Banked_allocation.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/SelfTest/src/test.cpp

@@ -13 +13 @@
 #include "Common/include/Test.h"
 
-
-#define LABEL(str)                                                                       \
-{                                                                                        \
-  cout << "{"+toString(static_cast<uint32_t>(sc_simulation_time()))+"} " << str << endl; \
-} while(0)
-
-#define SC_START(cycle)                                        \
-do                                                             \
-{                                                              \
-  if (static_cast<uint32_t>(sc_simulation_time()) > CYCLE_MAX) \
-    {                                                          \
-      TEST_KO("Maximal cycles Reached");                       \
-    }                                                          \
-  sc_start(cycle);                                             \
-} while(0)
-
 void test (string name,
            morpheo::behavioural::generic::registerfile::registerfile_multi_banked::Parameters * _param)
@@ -39 +23 @@
 #endif
 
-  RegisterFile_Multi_Banked * _RegisterFile_Multi_Banked = new RegisterFile_Multi_Banked (name.c_str(),
+  RegisterFile_Multi_Banked * _RegisterFile_Multi_Banked = new RegisterFile_Multi_Banked 
+    (name.c_str(),
 #ifdef STATISTICS
-                                                                                          _param_stat,
+     _param_stat,
 #endif
-                                                                                          _param);
+     _param,
+     USE_ALL);
   
 #ifdef SYSTEMC

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/include/RegisterFile_Multi_Banked.h

@@ -26 +26 @@
 #include "Behavioural/include/Vhdl.h"
 #endif
+#include "Behavioural/include/Usage.h"
 
 namespace morpheo {
@@ -41 +42 @@
     // -----[ fields ]----------------------------------------------------
     // Parameters
-  protected : const std::string       _name;
-
+  protected : const std::string  _name;
   protected : const Parameters * _param;
-
+  private   : const Tusage_t     _usage;
+    
 #ifdef STATISTICS
   public    : Stat                           * _stat;
@@ -100 +101 @@
                                               morpheo::behavioural::Parameters_Statistics * param_statistics,
 #endif
-                                              Parameters                                  * param );
+                                              Parameters * param,
+                                              Tusage_t     usage);
                                                
   public  :          ~RegisterFile_Multi_Banked             (void);

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/include/Types.h

@@ -18 +18 @@
 namespace registerfile_multi_banked {
 
-  typedef uint32_t Taddress_t;
+//typedef uint32_t Taddress_t;
   typedef uint32_t Tdata_t;
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked.cpp

@@ -14 +14 @@
 namespace registerfile_multi_banked {
 
-
+  RegisterFile_Multi_Banked::RegisterFile_Multi_Banked 
+  (
 #ifdef SYSTEMC
-  RegisterFile_Multi_Banked::RegisterFile_Multi_Banked (sc_module_name name,
+   sc_module_name name,
 #else
-  RegisterFile_Multi_Banked::RegisterFile_Multi_Banked (string name,
+   std::string name,
 #endif
 #ifdef STATISTICS
-                              morpheo::behavioural::Parameters_Statistics * param_statistics,
+   morpheo::behavioural::Parameters_Statistics * param_statistics,
 #endif
-                              morpheo::behavioural::generic::registerfile::registerfile_multi_banked::Parameters * param ):
-                              _name              (name)
-                              ,_param            (param)
+   morpheo::behavioural::generic::registerfile::registerfile_multi_banked::Parameters * param,
+   Tusage_t usage):
+    _name              (name)
+    ,_param            (param)
+    ,_usage (usage)
   {
     log_printf(FUNC,RegisterFile_Multi_Banked,"RegisterFile_Multi_Banked","Begin");

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Multi_Banked/src/RegisterFile_Multi_Banked_allocation.cpp

@@ -20 +20 @@
     log_printf(FUNC,RegisterFile_Multi_Banked,"allocation","Begin");
 
-    _component   = new Component ();
+    _component   = new Component (_usage);
 
     Entity * entity = _component->set_entity (_name