Changeset 62 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/RegisterFile/SelfTest

Timestamp:

Dec 4, 2007, 2:31:54 PM (17 years ago)

Author:

rosiere

Message:

Modification en profondeur de Component-port_map.
Compilation ok pour Register_unit ... a tester (systemC et vhdl)

Location:

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

Files:

• config-size.cfg (added)
• include/test.h (modified) (1 diff)
• src/main.cpp (modified) (2 diffs)
• src/test.cpp (modified) (3 diffs)

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

@@ -21 +21 @@
 using namespace morpheo::behavioural;
 using namespace morpheo::behavioural::generic;
-
 using namespace morpheo::behavioural::generic::registerfile;
 

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

@@ -50 +50 @@
   const uint32_t    nb_port_write_by_bank = atoi(argv[8]);
   const Tcrossbar_t crossbar              = fromString<Tcrossbar_t>(argv[9]);
-  const Tinstance_t instance              = (strcmp(argv[10], "0") == 0)?instance_RegisterFile_Monolithic:instance_RegisterFile_Multi_Banked;
+  const morpheo::behavioural::generic::registerfile::Tinstance_t instance              = (strcmp(argv[10], "0") == 0)?instance_RegisterFile_Monolithic:instance_RegisterFile_Multi_Banked;
 
   try 
@@ -60 +60 @@
           morpheo::behavioural::generic::registerfile::registerfile_monolithic  ::Parameters * param1 = new morpheo::behavioural::generic::registerfile::registerfile_monolithic  ::Parameters (nb_port_read         ,
                                                                                                                                                                                                 nb_port_write        ,
+                                                                                                                                                                                                0                    ,
                                                                                                                                                                                                 nb_word              ,
                                                                                                                                                                                                 size_word            );

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

@@ -33 +33 @@
   cout << "<" << name << "> : Simulation SystemC" << endl;
 
+#ifdef STATISTICS
+  morpheo::behavioural::Parameters_Statistics * _param_stat = new morpheo::behavioural::Parameters_Statistics(5,50);
+#endif
+  
   RegisterFile * _RegisterFile = new RegisterFile (name.c_str(),
-#ifdef STATISTICS
-                                             morpheo::behavioural::Parameters_Statistics(5,50),
+#ifdef STATISTICS     
+                                                   _param_stat,
 #endif
-                                             *_param);
+                                                   _param);
   
 #ifdef SYSTEMC
@@ -74 +78 @@
       (*(_RegisterFile-> in_READ_VAL      [i]))        (READ_VAL      [i]);
       (*(_RegisterFile->out_READ_ACK      [i]))        (READ_ACK      [i]);
+      if (_param->_have_port_address == true)
       (*(_RegisterFile-> in_READ_ADDRESS  [i]))        (READ_ADDRESS  [i]);
       (*(_RegisterFile->out_READ_DATA     [i]))        (READ_DATA     [i]);
@@ -82 +87 @@
       (*(_RegisterFile-> in_WRITE_VAL     [i]))        (WRITE_VAL     [i]);
       (*(_RegisterFile->out_WRITE_ACK     [i]))        (WRITE_ACK     [i]);
+      if (_param->_have_port_address == true)
       (*(_RegisterFile-> in_WRITE_ADDRESS [i]))        (WRITE_ADDRESS [i]);
       (*(_RegisterFile-> in_WRITE_DATA    [i]))        (WRITE_DATA    [i]);