Changeset 107 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/src/Address_management_transition.cpp

Timestamp:

Feb 11, 2009, 12:03:25 AM (15 years ago)

Author:

rosiere

Message:

1) Fix test in Direction_Glue for Conditionnal Branch
2) Fix Instruction Address Compute

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/src/Address_management_transition.cpp (modified) (2 diffs)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Front_end/Front_end/Ifetch_unit/Address_management/src/Address_management_transition.cpp

@@ -35 +35 @@
         reg_PC_NEXT          = 0x100>>2;
         reg_PC_NEXT_IS_DS_TAKE                  = 0;
-        reg_PC_NEXT_INSTRUCTION_ENABLE [0]      = 1;
-        for (uint32_t i=1; i<_param->_nb_instruction; i++)
+        uint32_t index = reg_PC_NEXT % _param->_nb_instruction;
+        for (uint32_t i=0; i<_param->_nb_instruction; i++)
         reg_PC_NEXT_INSTRUCTION_ENABLE [i]      = 0;
+        reg_PC_NEXT_INSTRUCTION_ENABLE [index]  = 1;
         reg_PC_NEXT_INST_IFETCH_PTR             = 0;
         reg_PC_NEXT_BRANCH_STATE                = 0;
@@ -182 +183 @@
 //          reg_PC_NEXT_BRANCH_UPDATE_PREDICTION_ID = 0;
             
-            reg_PC_NEXT_INSTRUCTION_ENABLE [0]      = 1; // only the instruction at the event address is valid, because we have no information on the branch presence in the instruction bundle.
-            for (uint32_t i=1; i<_param->_nb_instruction; i++)
-              reg_PC_NEXT_INSTRUCTION_ENABLE [i] = 0;
+            // only the instruction at the event address is valid, because we have no information on the branch presence in the instruction bundle.
+            uint32_t index = reg_PC_NEXT % _param->_nb_instruction;
+            for (uint32_t i=0; i<_param->_nb_instruction; i++)
+            reg_PC_NEXT_INSTRUCTION_ENABLE [i]      = 0;
+            reg_PC_NEXT_INSTRUCTION_ENABLE [index]  = 1;
 
             reg_PC_NEXT_NEXT_VAL                    = PORT_READ(in_EVENT_ADDRESS_NEXT_VAL);