Index: trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp
===================================================================
--- trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp	(revision 55)
+++ trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/RegisterFile_Monolithic/src/RegisterFile_Monolithic.cpp	(revision 57)
@@ -14,24 +14,25 @@
 namespace registerfile_monolithic    {
 
-  RegisterFile_Monolithic::RegisterFile_Monolithic (
+  RegisterFile_Monolithic::RegisterFile_Monolithic 
+  (
 #ifdef SYSTEMC
-						    sc_module_name name,
+   sc_module_name name,
 #else
-						    string name        ,
+   string name        ,
 #endif
 #ifdef STATISTICS
-						    morpheo::behavioural::Parameters_Statistics            * param_statistics,
+   morpheo::behavioural::Parameters_Statistics            * param_statistics,
 #endif
-						    morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters * param ):
-    _name   (name),
-    _param (param)
+   morpheo::behavioural::generic::registerfile::registerfile_monolithic::Parameters * param,
+   morpheo::behavioural::Tusage_t usage
+   ):
+    _name  (name),
+    _param (param),
+    _usage (usage)
   {
     log_printf(FUNC,RegisterFile_Monolithic,"RegisterFile_Monolithic","Begin");
 
-#ifdef SYSTEMC
     log_printf(INFO,RegisterFile_Monolithic,"RegisterFile_Monolithic","Allocation");
-
     allocation ();
-#endif
 
 #ifdef STATISTICS
@@ -47,42 +48,45 @@
 
 #ifdef SYSTEMC
-    SC_METHOD (transition);
-    dont_initialize ();
-    sensitive_pos << *(in_CLOCK);
+    if (_usage & USE_SYSTEMC)
+      {
+	SC_METHOD (transition);
+	dont_initialize ();
+	sensitive_pos << *(in_CLOCK);
+	
+	SC_METHOD (genMealy_read);
+	dont_initialize ();
+	sensitive_neg << *(in_CLOCK);
+	for (uint32_t i=0; i<_param->_nb_port_read; i++)
+	  sensitive << *(in_READ_VAL     [i])
+		    << *(in_READ_ADDRESS [i]);
+	for (uint32_t i=0; i<_param->_nb_port_read_write; i++)
+	  sensitive << *(in_READ_WRITE_VAL     [i])
+		    << *(in_READ_WRITE_RW      [i])
+		    << *(in_READ_WRITE_ADDRESS [i]);
+	
+#  ifdef SYSTEMCASS_SPECIFIC
+	// List dependency information
+	for (uint32_t i=0; i<_param->_nb_port_read; i++)
+	  {
+	    (*(out_READ_DATA  [i])) (*( in_READ_VAL     [i]));
+	    (*(out_READ_DATA  [i])) (*( in_READ_ADDRESS [i]));
+	  }
+	for (uint32_t i=0; i<_param->_nb_port_read_write; i++)
+	  {  
+	    (*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_VAL     [i]));
+	    (*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_RW      [i]));
+	    (*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_ADDRESS [i]));
+	  }
+#  endif    
+	
+	for (uint32_t i=0; i<_param->_nb_port_read       ; i++)
+	  PORT_WRITE(out_READ_ACK        [i], 1);
+	for (uint32_t i=0; i<_param->_nb_port_write      ; i++)
+	  PORT_WRITE(out_WRITE_ACK       [i], 1);
+	for (uint32_t i=0; i<_param->_nb_port_read_write ; i++)
+	  PORT_WRITE(out_READ_WRITE_ACK  [i], 1);
+      }
+#endif
     
-    SC_METHOD (genMealy_read);
-    dont_initialize ();
-    sensitive_neg << *(in_CLOCK);
-    for (uint32_t i=0; i<_param->_nb_port_read; i++)
-      sensitive << *(in_READ_VAL     [i])
-		<< *(in_READ_ADDRESS [i]);
-    for (uint32_t i=0; i<_param->_nb_port_read_write; i++)
-      sensitive << *(in_READ_WRITE_VAL     [i])
-		<< *(in_READ_WRITE_RW      [i])
-		<< *(in_READ_WRITE_ADDRESS [i]);
-
-#ifdef SYSTEMCASS_SPECIFIC
-    // List dependency information
-    for (uint32_t i=0; i<_param->_nb_port_read; i++)
-      {
-	(*(out_READ_DATA  [i])) (*( in_READ_VAL     [i]));
-	(*(out_READ_DATA  [i])) (*( in_READ_ADDRESS [i]));
-      }
-    for (uint32_t i=0; i<_param->_nb_port_read_write; i++)
-      {  
-	(*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_VAL     [i]));
-	(*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_RW      [i]));
-	(*(out_READ_WRITE_RDATA [i])) (*( in_READ_WRITE_ADDRESS [i]));
-      }
-#endif    
-
-    for (uint32_t i=0; i<_param->_nb_port_read       ; i++)
-      PORT_WRITE(out_READ_ACK        [i], 1);
-    for (uint32_t i=0; i<_param->_nb_port_write      ; i++)
-      PORT_WRITE(out_WRITE_ACK       [i], 1);
-    for (uint32_t i=0; i<_param->_nb_port_read_write ; i++)
-      PORT_WRITE(out_READ_WRITE_ACK  [i], 1);
-#endif
-
     log_printf(FUNC,RegisterFile_Monolithic,"RegisterFile_Monolithic","End");
   };
@@ -95,7 +99,5 @@
 #endif
 
-#ifdef SYSTEMC
     deallocation ();
-#endif
   };
 
