Changeset 103 for trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic

Timestamp:

Jan 16, 2009, 5:55:32 PM (16 years ago)

Author:

moulu

Message:

1) write queue vhdl
2) bug fix : in generic queue

Location:

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue

Files:

• include/Queue.h (modified) (1 diff)
• src/Queue_vhdl_body.cpp (modified) (2 diffs)
• src/Queue_vhdl_declaration.cpp (modified) (1 diff)

trunk/IPs/systemC/processor/Morpheo/Behavioural/Generic/Queue/include/Queue.h

@@ -75 +75 @@
 
     // ~~~~~[ Interface "slot" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  public    : SC_OUT(Tcontrol_t)           ** out_SLOT_VAL ;
-  public    : SC_OUT(Tdata_t   )           ** out_SLOT_DATA;
+  public    : SC_OUT(Tcontrol_t)           ** out_SLOT_VAL ; //[nb_port_slot]
+  public    : SC_OUT(Tdata_t   )           ** out_SLOT_DATA; //[nb_port_slot]
 
     // ~~~~~[ Interface "ptr" ]~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

@@ -46 +46 @@
             else
               vhdl->set_body   (0,"signal_SLOT_"+toString(i)+"           <= const_PTR_INIT when signal_SLOT_"+toString(i-1)+" = const_PTR_MAX else signal_SLOT_"+toString(i-1)+"+'1';");
+
           }
         
@@ -51 +52 @@
       {
         if (_param->_nb_port_slot > 1)
-          vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_VAL        <= '1' when reg_NB_ELT > "+std_logic_cst(log2(_param->_size_queue+1),i)+" else '0';");
-        else
-          vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_VAL        <= not signal_EMPTY;");
-        
+          vhdl->set_body   (0,"signal_SLOT_"+toString(i)+"_VAL     <= '1' when reg_NB_ELT > "+std_logic_cst(log2(_param->_size_queue+1),i)+" else '0';");
+        else
+          vhdl->set_body   (0,"signal_SLOT_"+toString(i)+"_VAL     <= not signal_EMPTY;");
+        
+        vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_VAL        <= signal_SLOT_"+toString(i)+"_VAL;");
+        
+#ifdef SYSTEMC_VHDL_COMPATIBILITY
+        std::string str_val_disable=std_logic_cst(_param->_size_data,0)+" when signal_SLOT_"+toString(i)+"_VAL='0' else";
+#endif
         if (_param->_nb_port_slot > 1)
-          vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_DATA       <= reg_DATA(conv_integer(signal_SLOT_"+toString(i)+"));");
+          {
+            vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_DATA       <= ");
+#ifdef SYSTEMC_VHDL_COMPATIBILITY
+            vhdl->set_body   (1,str_val_disable);
+#endif
+            vhdl->set_body   (1,"reg_DATA(conv_integer(signal_SLOT_"+toString(i)+"));");
+          }
         else
           if (_param->_size_queue > 1)
-            vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_DATA       <= reg_DATA(conv_integer(signal_PTR_READ));");
+            {
+              vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_DATA       <=");
+#ifdef SYSTEMC_VHDL_COMPATIBILITY
+              vhdl->set_body   (1,str_val_disable);
+#endif
+              vhdl->set_body   (1,"reg_DATA(conv_integer(signal_PTR_READ));");
+            }
           else
-            vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_DATA       <= reg_DATA(conv_integer(0));");
+            {
+              vhdl->set_body   (0,"out_SLOT_"+toString(i)+"_DATA       <=");
+#ifdef SYSTEMC_VHDL_COMPATIBILITY
+              vhdl->set_body   (1,str_val_disable);
+#endif
+              vhdl->set_body   (1,"reg_DATA(conv_integer(0));");
+            }
       }
 

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

@@ -38 +38 @@
       }
 
+    if (_param->_nb_port_slot>0)
+    for (uint32_t i=0; i<_param->_nb_port_slot; ++i)
+    vhdl->set_signal  ("signal_SLOT_"+toString(i)+"_VAL", 1);
+
     if (_param->_nb_port_slot>1)
       {