Changeset 88 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/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/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src

Files:

• Direction.cpp (modified) (5 diffs)
• Direction_allocation.cpp (modified) (3 diffs)
• Direction_deallocation.cpp (modified) (1 diff)
• Direction_end_cycle.cpp (modified) (2 diffs)
• Parameters.cpp (modified) (4 diffs)
• Parameters_print.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Direction.cpp

@@ -38 +38 @@
     log_printf(FUNC,Direction,FUNCTION,"Begin");
 
+#if DEBUG_Direction == true
+    log_printf(INFO,Direction,FUNCTION,_("<%s> Parameters"),_name.c_str());
+
+    std::cout << *param << std::endl;
+#endif
+
     log_printf(INFO,Direction,FUNCTION,"Allocation");
 
@@ -47 +53 @@
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       { 
         log_printf(INFO,Direction,FUNCTION,"Allocation of statistics");
@@ -56 +62 @@
 
 #ifdef VHDL
-    if (_usage & USE_VHDL)
+    if (usage_is_set(_usage,USE_VHDL))
       {
         // generate the vhdl
@@ -66 +72 @@
 
 #ifdef SYSTEMC
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         log_printf(INFO,Direction,FUNCTION,"Method - transition");
@@ -90 +96 @@
 
 #ifdef STATISTICS
-    if (_usage & USE_STATISTICS)
+    if (usage_is_set(_usage,USE_STATISTICS))
       {
         statistics_deallocation();

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Direction_allocation.cpp

@@ -63 +63 @@
       ALLOC1_VALACK_IN ( in_PREDICT_VAL        ,VAL);
       ALLOC1_VALACK_OUT(out_PREDICT_ACK        ,ACK);
-      ALLOC1_SIGNAL_IN ( in_PREDICT_ADDRESS_SRC,"address_src",Taddress_t,_param->_size_address);
+      ALLOC1_SIGNAL_IN ( in_PREDICT_ADDRESS_SRC,"address_src",Taddress_t,_param->_size_instruction_address);
       ALLOC1_SIGNAL_IN ( in_PREDICT_STATIC     ,"static"     ,Tcontrol_t,1);
       ALLOC1_SIGNAL_IN ( in_PREDICT_LAST_TAKE  ,"last_take"  ,Tcontrol_t,1);
@@ -76 +76 @@
       ALLOC1_VALACK_IN ( in_UPDATE_VAL      ,VAL);
       ALLOC1_VALACK_OUT(out_UPDATE_ACK      ,ACK);
-      ALLOC1_SIGNAL_IN ( in_UPDATE_ADDRESS  ,"address"  ,Taddress_t,_param->_size_address);
+      ALLOC1_SIGNAL_IN ( in_UPDATE_ADDRESS  ,"address"  ,Taddress_t,_param->_size_instruction_address);
       ALLOC1_SIGNAL_IN ( in_UPDATE_HISTORY  ,"history"  ,Thistory_t,_param->_size_history);
       ALLOC1_SIGNAL_IN ( in_UPDATE_DIRECTION,"direction",Tcontrol_t,1);
@@ -182 +182 @@
 
 #ifdef POSITION
-    _component->generate_file();
+    if (usage_is_set(_usage,USE_POSITION))
+      _component->generate_file();
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Direction_deallocation.cpp

@@ -23 +23 @@
     log_printf(FUNC,Direction,FUNCTION,"Begin");
 
-    if (_usage & USE_SYSTEMC)
+    if (usage_is_set(_usage,USE_SYSTEMC))
       {
         delete    in_CLOCK ;

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Direction_end_cycle.cpp

@@ -25 +25 @@
 
 #ifdef STATISTICS
-    _stat->end_cycle();
+    if (usage_is_set(_usage,USE_STATISTICS))
+      _stat->end_cycle();
 #endif    
 
@@ -31 +32 @@
     // Evaluation before read the ouput signal
 //  sc_start(0);
-    _interfaces->testbench();
+    if (usage_is_set(_usage,USE_VHDL_TESTBENCH))
+      _interfaces->testbench();
 #endif
 

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Parameters.cpp

@@ -29 +29 @@
                           uint32_t     pht_size_counter       [3],
                           uint32_t     pht_nb_counter         [3],
-                          uint32_t     pht_size_address_share [3])
+                          uint32_t     pht_size_address_share [3],
+                          bool         is_toplevel)
   {
     log_printf(FUNC,Direction,FUNCTION,"Begin");
@@ -36 +37 @@
     _nb_inst_predict        = nb_inst_predict       ;
     _nb_inst_update         = nb_inst_update        ;
-    _size_address           = size_address          ;
+//  _size_address           = size_address          ;
     
     for (uint32_t i=0; i<3; i++)
@@ -141 +142 @@
     _have_port_history = (_size_history > 0);
 
+    test();
+
     _param_glue = new morpheo::behavioural::core::multi_front_end::front_end::prediction_unit::direction::direction_glue::Parameters
       (_predictor_scheme,
        _nb_inst_predict ,
        _nb_inst_update  ,
-       _size_address    ,
+        size_address    ,
        _size_history    );
 
-    test();
-
+    if (is_toplevel)
+      {
+        _size_instruction_address = size_address;
+
+        copy ();
+      }
+    
     log_printf(FUNC,Direction,FUNCTION,"End");
   };
@@ -172 +180 @@
   };
 
+#undef  FUNCTION
+#define FUNCTION "Direction::copy"
+  void Parameters::copy (void) 
+  {
+    log_printf(FUNC,Direction,FUNCTION,"Begin");
+
+    COPY(_param_glue);
+
+    log_printf(FUNC,Direction,FUNCTION,"End");
+  };
+
 }; // end namespace direction
 }; // end namespace prediction_unit

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Prediction_unit/Direction/src/Parameters_print.cpp

@@ -30 +30 @@
     xml.singleton_begin("nb_inst_predict                   "); xml.attribut("value",toString(_nb_inst_predict )); xml.singleton_end();
     xml.singleton_begin("nb_inst_update                    "); xml.attribut("value",toString(_nb_inst_update  )); xml.singleton_end();
-    xml.singleton_begin("size_address                      "); xml.attribut("value",toString(_size_address    )); xml.singleton_end();
+//  xml.singleton_begin("size_address                      "); xml.attribut("value",toString(_size_address    )); xml.singleton_end();
 
     xml.comment("predictor_scheme : ");