Changeset 88 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src

Timestamp:

Dec 10, 2008, 7:31:39 PM (16 years ago)

Author:

rosiere

Message:

Almost complete design
with Test and test platform

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src

Files:

• Parameters.cpp (modified) (1 diff)
• RegisterFile_Monolithic.cpp (modified) (3 diffs)
• RegisterFile_Monolithic_allocation.cpp (modified) (1 diff)
• RegisterFile_Monolithic_deallocation.cpp (modified) (1 diff)
• RegisterFile_Monolithic_end_cycle.cpp (modified) (2 diffs)
• RegisterFile_Monolithic_transition.cpp (modified) (4 diffs)

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

@@ -32 +32 @@
   };
   
-  Parameters::Parameters (Parameters & param) :
-    _nb_port_read      (param._nb_port_read ),
-    _nb_port_write     (param._nb_port_write),
-    _nb_port_read_write(param._nb_port_read_write),
-    _nb_word           (param._nb_word      ),
-    _size_word         (param._size_word    ),
-    _size_address      (param._size_address ),
-    _have_port_address (param._have_port_address)
+//   Parameters::Parameters (Parameters & param) :
+//     _nb_port_read      (param._nb_port_read ),
+//     _nb_port_write     (param._nb_port_write),
+//     _nb_port_read_write(param._nb_port_read_write),
+//     _nb_word           (param._nb_word      ),
+//     _size_word         (param._size_word    ),
+//     _size_address      (param._size_address ),
+//     _have_port_address (param._have_port_address)
+//   {
+//     test();
+//   };
+
+  Parameters::~Parameters () 
   {
-    test();
   };
 
-  Parameters::~Parameters () 
-  { };
+  void Parameters::copy (void) 
+  { 
+  };
 
 }; // end namespace registerfile_monolithic

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

@@ -33 +33 @@
     log_printf(FUNC,RegisterFile_Monolithic,"RegisterFile_Monolithic","Begin");
 
+#if DEBUG_RegisterFile_Monolithic == true
+    log_printf(INFO,RegisterFile_Monolithic,FUNCTION,_("<%s> Parameters"),_name.c_str());
+
+    std::cout << *param << std::endl;
+#endif    
+
     log_printf(INFO,RegisterFile_Monolithic,"RegisterFile_Monolithic","Allocation");
     allocation ();
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       statistics_declaration(param_statistics);
 #endif
@@ -47 +53 @@
 
 #ifdef SYSTEMC
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         SC_METHOD (transition);
@@ -102 +108 @@
   {
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       delete _stat;
 #endif

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

@@ -120 +120 @@
 
     // ----- Register
-    reg_DATA = new Tdata_t [_param->_nb_word];
+    if (usage_is_set(_usage,USE_SYSTEMC))
+      reg_DATA = new Tdata_t [_param->_nb_word];
     
 #ifdef POSITION
-    _component->generate_file();
+    if (usage_is_set(_usage,USE_POSITION))
+      _component->generate_file();
 #endif
   };

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

@@ -18 +18 @@
     delete _component;
 
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         delete    in_CLOCK;

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

@@ -20 +20 @@
 
 #ifdef STATISTICS
-    _stat->end_cycle();
+    if (usage_is_set(_usage,USE_STATISTICS))
+      _stat->end_cycle();
 #endif    
 
@@ -27 +28 @@
     
 //  sc_start(0);
-    _interfaces->testbench();
+    if (usage_is_set(_usage,USE_VHDL_TESTBENCH))
+      _interfaces->testbench();
 #endif
 

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

@@ -24 +24 @@
           {
 #ifdef STATISTICS
-            (*_stat_nb_write) ++;
+            if (usage_is_set(_usage,USE_STATISTICS))
+              (*_stat_nb_write) ++;
 #endif    
 
@@ -49 +50 @@
               {
 #ifdef STATISTICS
-                (*_stat_nb_write) ++;
+                if (usage_is_set(_usage,USE_STATISTICS))
+                  (*_stat_nb_write) ++;
 #endif    
                 
@@ -67 +69 @@
             else
               {
-                (*_stat_nb_read) ++;
+                if (usage_is_set(_usage,USE_STATISTICS))
+                  (*_stat_nb_read) ++;
               }
 #endif    
@@ -74 +77 @@
 
 #ifdef STATISTICS
-    for (uint32_t i=0; i<_param->_nb_port_read; i++)
-      if ( PORT_READ(in_READ_VAL [i]) == 1)
-        (*_stat_nb_read) ++;
+    if (usage_is_set(_usage,USE_STATISTICS))
+      for (uint32_t i=0; i<_param->_nb_port_read; i++)
+        if ( PORT_READ(in_READ_VAL [i]) == 1)
+          (*_stat_nb_read) ++;
 #endif