Changeset 100 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_vhdl_declaration.cpp

Timestamp:

Jan 8, 2009, 2:06:27 PM (15 years ago)

Author:

rosiere

Message:

1) Bug fix (Operation, Instruction)
2) Modif Return Address Stack
3) Add Soft Test
4) Add Soc Test

Location:

trunk

Files:

• . (modified) (1 prop)
• IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_vhdl_declaration.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/src/Queue_vhdl_declaration.cpp

@@ -24 +24 @@
     
     vhdl->set_signal  ("reg_DATA             ", "Tqueue");
-    vhdl->set_signal  ("reg_FULL             ", 1);
-    vhdl->set_signal  ("reg_EMPTY            ", 1);
-    if (_param->_size_queue > 1)
-      {
-        vhdl->set_signal  ("reg_PTR_READ         ", log2(_param->_size_queue));
-        vhdl->set_signal  ("reg_PTR_WRITE        ", log2(_param->_size_queue));
-      }
+
     vhdl->set_signal  ("signal_READ          ", 1);
     vhdl->set_signal  ("signal_WRITE         ", 1);
-    vhdl->set_signal  ("signal_PTR_EQUAL     ", 1);
+    vhdl->set_signal  ("signal_EMPTY         ", 1);
+    vhdl->set_signal  ("signal_FULL          ", 1);
 
     if (_param->_size_queue > 1)
       {
-        vhdl->set_signal  ("signal_NEXT_PTR_READ ", log2(_param->_size_queue));
-        vhdl->set_signal  ("signal_NEXT_PTR_WRITE", log2(_param->_size_queue));
+    vhdl->set_signal  ("reg_PTR_READ         ", log2(_param->_size_queue));
+    vhdl->set_signal  ("signal_NEXT_PTR_READ ", log2(_param->_size_queue));
+    vhdl->set_signal  ("signal_PTR_READ      ", log2(_param->_size_queue));
+    vhdl->set_signal  ("signal_PTR_WRITE     ", log2(_param->_size_queue));
       }
 
+    if (_param->_nb_port_slot>1)
+      {
+    vhdl->set_signal  ("reg_NB_ELT           ", log2(_param->_size_queue+1));
+    vhdl->set_signal  ("signal_NEXT_NB_ELT   ", log2(_param->_size_queue+1));
+    for (uint32_t i=0; i<_param->_nb_port_slot; ++i)
+    vhdl->set_signal  ("signal_SLOT_"+toString(i), log2(_param->_size_queue));
+      }
+    else
+      {
+    if (_param->_size_queue > 1)
+      {
+    vhdl->set_signal  ("reg_PTR_WRITE        ", log2(_param->_size_queue));
+    vhdl->set_signal  ("signal_NEXT_PTR_WRITE", log2(_param->_size_queue));
+      }
+    vhdl->set_signal  ("reg_FULL             ", 1);
+    vhdl->set_signal  ("reg_EMPTY            ", 1);
     vhdl->set_signal  ("signal_NEXT_FULL     ", 1);
     vhdl->set_signal  ("signal_NEXT_EMPTY    ", 1);
-    
+    vhdl->set_signal  ("signal_PTR_EQUAL     ", 1);
+      }
+
     if (_param->_size_queue > 1)
       {