Changeset 137 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit

Timestamp:

Feb 16, 2010, 1:35:48 PM (14 years ago)

Author:

rosiere

Message:

Various modif (add test, and vhdl)

File:

• trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_vhdl_body.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Core/Multi_Execute_loop/Execute_loop/Multi_Execute_unit/Execute_unit/Functionnal_unit/src/Functionnal_unit_vhdl_body.cpp

@@ -370 +370 @@
     vhdl->set_body (1,std_logic_cst(1,0)+"when others;");
 
-#ifdef SYSTEMC_VHDL_COMPATIBILITY
     vhdl->set_body (0,"with reg_EXECUTE_IN_TYPE select");
     vhdl->set_body (0,"sig_EXECUTE_OUT_ADDRESS <=");
     vhdl->set_body (1,"sig_ADDR_BRANCH when "+std_logic_cst(_param->_size_type,TYPE_BRANCH)+",");
+#ifdef SYSTEMC_VHDL_COMPATIBILITY
     vhdl->set_body (1,"sig_A_OR_B("+toString(_param->_size_instruction_address-1)+" downto 0) when "+std_logic_cst(_param->_size_type,TYPE_SPECIAL)+",");
     vhdl->set_body (1,std_logic_cst(_param->_size_instruction_address,0)+" when others;");
 #else
-    vhdl->set_body (0,"with reg_EXECUTE_IN_TYPE select");
-    vhdl->set_body (0,"sig_EXECUTE_OUT_ADDRESS <=");
-    vhdl->set_body (1,"sig_ADDR_BRANCH when "+std_logic_cst(_param->_size_type,TYPE_BRANCH)+",");
-    vhdl->set_body (1,"sig_A_OR_B when others;");
+    vhdl->set_body (1,"sig_A_OR_B ("+toString(_param->_size_instruction_address-1)+" downto 0) when others;");
 //    vhdl->set_body (0,"sig_EXECUTE_OUT_ADDRESS <= sig_ADDR_BRANCH;");
 #endif