Changeset 112 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration

Timestamp:

Mar 18, 2009, 11:36:26 PM (16 years ago)

Author:

rosiere

Message:

1) Stat_list : fix retire old and new register bug
2) Stat_list : remove read_counter and valid flag, because validation of destination is in retire step (not in commit step)
3) Model : add class Model (cf Morpheo.sim)
4) Allocation : alloc_interface_begin and alloc_interface_end to delete temporary array.
5) Script : add distexe.sh
6) Add Comparator, Multiplier, Divider. But this component are not implemented
7) Software : add Dhrystone

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration

Files:

• include/Parameters.h (modified) (1 diff)
• src/Configuration_header.cpp (modified) (1 diff)
• src/Instance.cpp (modified) (1 diff)
• src/Instance_fromInternalStructure.cpp (modified) (2 diffs)
• src/Simulator_fromFile.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Configuration/include/Parameters.h

@@ -53 +53 @@
   public : uint32_t              * _nb_reg_free                                   ;//[nb_rename_bloc]
   public : uint32_t              * _nb_rename_unit_bank                           ;//[nb_rename_bloc]
-  public : uint32_t              * _size_read_counter                             ;//[nb_rename_bloc]
+//   public : uint32_t              * _size_read_counter                             ;//[nb_rename_bloc]
  
     // Read bloc

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

@@ -59 +59 @@
     str += toString(MSG_INFORMATION)+_("                         Kamel    Chekkal   - VHDL\n"    );
     str += toString(MSG_INFORMATION)+_("                         Stéphane Dubuisson - XMLLight\n");
+    str += toString(MSG_INFORMATION)+_("                         Ramsis   Farhat    - VHDL\n"    );
     str += toString(MSG_INFORMATION)+_("                         Vincent  Moulu     - VHDL\n"    );
     str += toString(MSG_INFORMATION)+"\n";

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

@@ -150 +150 @@
         DELETE1(_param->_size_reservation_station               ,_param->_nb_read_bloc);
         DELETE1(_param->_size_read_queue                        ,_param->_nb_read_bloc);
-        DELETE1(_param->_size_read_counter                      ,_param->_nb_rename_bloc);
+//         DELETE1(_param->_size_read_counter                      ,_param->_nb_rename_bloc);
         DELETE1(_param->_nb_rename_unit_bank                    ,_param->_nb_rename_bloc);
         DELETE1(_param->_nb_reg_free                            ,_param->_nb_rename_bloc);

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

@@ -113 +113 @@
     ALLOC1(_param->_nb_reg_free                      ,uint32_t         ,_param->_nb_rename_bloc);
     ALLOC1(_param->_nb_rename_unit_bank              ,uint32_t         ,_param->_nb_rename_bloc);
-    ALLOC1(_param->_size_read_counter                ,uint32_t         ,_param->_nb_rename_bloc);
+//     ALLOC1(_param->_size_read_counter                ,uint32_t         ,_param->_nb_rename_bloc);
 
     for (uint32_t i=0; i<_param->_nb_rename_bloc; ++i)
@@ -128 +128 @@
         _param->_nb_reg_free                       [i] = fromString<uint32_t         > (getParam("nb_reg_free"                      , "rename_bloc",toString(i).c_str(),""));
         _param->_nb_rename_unit_bank               [i] = fromString<uint32_t         > (getParam("nb_rename_unit_bank"              , "rename_bloc",toString(i).c_str(),""));
-        _param->_size_read_counter                 [i] = fromString<uint32_t         > (getParam("size_read_counter"                , "rename_bloc",toString(i).c_str(),""));
+//         _param->_size_read_counter                 [i] = fromString<uint32_t         > (getParam("size_read_counter"                , "rename_bloc",toString(i).c_str(),""));
       }   
 

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

@@ -7 +7 @@
 
 #include "Behavioural/Configuration/include/Simulator.h"
+#include "Behavioural/include/Simulation.h"
 #include "Common/include/FromString.h"
 #include <fstream>
@@ -80 +81 @@
             testNodeName   (xml,"component");
             testSingleton  (xml,true);
+
+            attributes_t      attributes = xml->getAttributes();
+            
+            std::string       value_name  = getAttribute(xml,attributes,"name" );
+            model_type_t      value_model = fromString<model_type_t     >(getAttribute(xml,attributes,"model"));
+            debug_verbosity_t value_debug = fromString<debug_verbosity_t>(getAttribute(xml,attributes,"debug"));
+            
+            testAttributesEmpty(xml,attributes);
+            
+            _model.set_model(value_name, value_model, value_debug);
           }
       }