Changeset 14 for trunk

Timestamp:

Apr 8, 2010, 6:07:01 PM (15 years ago)

Author:

simerabe

Message:

fixing bug related to broadcast

File:

• trunk/modules/half_gateway_target_2/caba/source/include/half_gateway_target_2.h (modified) (9 diffs)

trunk/modules/half_gateway_target_2/caba/source/include/half_gateway_target_2.h

@@ -32 +32 @@
 #include "gate_ports_2.h"
 
-#define HT_DEBUG
+//#define HT_DEBUG
 //#define HT_DEBUG_FSM
 
@@ -157 +157 @@
 
 #ifdef HT_DEBUG_FSM
-    std::cout << "--------------------------------------------" << std::endl;
-    std::cout             << " ring cmd fsm = " << ring_cmd_fsm_state_str_ht[r_ring_cmd_fsm] << std::endl
-                          << " ring rsp fsm = " << ring_rsp_fsm_state_str_ht[r_ring_rsp_fsm] << std::endl;
+if( trace(sc_time_stamp()))
+    std::cout << sc_time_stamp() << " - " << m_name
+                                 << " - ring cmd = " << ring_cmd_fsm_state_str_ht[r_ring_cmd_fsm]
+                                 << " - ring rsp = " << ring_rsp_fsm_state_str_ht[r_ring_rsp_fsm] 
+                                 << std::endl;
 #endif
         
@@ -182 +184 @@
           << " -- ring rok : " <<  p_ring_in.rsp_w
           << " -- ringin rsp grant : " << p_ring_in.rsp_grant
-          << " -- ringin rsp data  : " << p_ring_in.rsp_data
+          << " -- fifo rsp data  : " << std::hex << m_rsp_fifo.read()
           << std::endl;
 #endif    
@@ -192 +194 @@
 
                 case DEFAULT:  
-                        
-                        if ( m_rsp_fifo.rok()) // && p_ring_in.rsp_r ) 
-                        {
 #ifdef HT_DEBUG
 if( trace(sc_time_stamp()))
@@ -200 +199 @@
           << " -- fifo_rsp_data : " << std::hex << m_rsp_fifo.read()
           << std::endl;
-#endif
+#endif                  
+                        if ( m_rsp_fifo.rok()) // && p_ring_in.rsp_r ) 
+                        {
+
                                 rsp_fifo_get = p_ring_in.rsp_r; //true;
                                 r_ring_rsp_fsm = KEEP;
@@ -240 +242 @@
                 {
                         vci_addr_t rtgtid = (vci_addr_t) ((p_ring_in.cmd_data >> 1) << 2);
-                        uint32_t cluster = (uint32_t) ((p_ring_in.cmd_data >> 24) & 0xF); // a voir FF
+                        int cluster =  (int) (p_ring_in.cmd_data >> 24) & 0xF; // a voir FF
                         bool brdcst = (IntTab(cluster) == m_ringid) && ((p_ring_in.cmd_data & 0x1) == 0X1) ;                       
                         bool loc = !((p_ring_in.cmd_data & 0x1) == 0x1) && !m_lt[rtgtid] && !m_local;
@@ -249 +251 @@
 std::cout     << sc_time_stamp() << " -- " << m_name 
               << " -- ring_cmd_fsm -- CMD_IDLE "
-              << " -- in rok : " << p_ring_in.cmd_w
-              << " -- addr : " << std::hex << rtgtid
-              << " -- brdcst : " << brdcst
-              << " -- eop : " << eop
-              << " -- isloc : " << loc 
-              << " -- in wok : " << p_ring_in.cmd_r
-              << " -- fifo wok : " << m_cmd_fifo.wok()
-//            << " -- cluster : " << std::hex << cluster
-//            << " -- intTab : " << IntTab(cluster)
+              << " - in rok : " << p_ring_in.cmd_w
+              << " - addr : " << std::hex << rtgtid
+              << " - brdcst : " << brdcst
+              << " - eop : " << eop
+              << " - isloc : " << loc 
+              << " - in wok : " << p_ring_in.cmd_r
+              << " - fifo wok : " << m_cmd_fifo.wok()
+              << " - ringid  : " << m_ringid
+              << " - cluster : " << cluster
+              << " - intTab : " << IntTab(cluster)
               << std::endl;
 }
@@ -427 +430 @@
 
         p_gate_target.rsp_r= m_rsp_fifo.wok();
+
 } // end genMoore
 
@@ -478 +482 @@
 
                         vci_addr_t rtgtid = (vci_addr_t) ((p_ring_in.cmd_data >> 1) << 2);
-                        uint32_t cluster = (uint32_t) ((p_ring_in.cmd_data >> 24) & 0xF); // a voir FF
+                        int cluster = (int) (p_ring_in.cmd_data >> 24) & 0xF; // a voir FF
                         bool brdcst = (IntTab(cluster) == m_ringid) && ((p_ring_in.cmd_data & 0x1) == 0X1) ;
                         bool loc = !((p_ring_in.cmd_data & 0x1) == 0x1) && !m_lt[rtgtid] && !m_local;