Changeset 1030 for trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba

Timestamp:

Jan 16, 2016, 7:44:23 PM (9 years ago)

Author:

alain

Message:

Fix a bug in debug_procid_id definition.
-This line, and those below, will be ignored--

M tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h
M tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp
M tsar_generic_iob/top.cpp

Location:

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source

Files:

• include/tsar_iob_cluster.h (modified) (1 diff)
• src/tsar_iob_cluster.cpp (modified) (6 diffs)

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

@@ -261 +261 @@
 
                     uint32_t                           frozen_cycles, 
-                    uint32_t                           start_debug_cycle,
-                    bool                               memc_debug_ok, 
-                    bool                               proc_debug_ok, 
-                    bool                               iob0_debug_ok ); 
+                    bool                               debug_ok,
+                    uint32_t                           debug_start_cycle,
+                    uint32_t                           debug_proc_id, 
+                    uint32_t                           debug_memc_id, 
+                    bool                               debug_iob ); 
 
   protected:

trunk/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -83 +83 @@
 
                     uint32_t                           frozen_cycles,
+                    bool                               debug_ok,
                     uint32_t                           debug_start_cycle,
-                    bool                               memc_debug_ok,
-                    bool                               proc_debug_ok,
-                    bool                               iob_debug_ok )
+                    uint32_t                           debug_proc_id,
+                    uint32_t                           debug_memc_id,
+                    bool                               debug_iob )
     : soclib::caba::BaseModule(insname),
       p_clk("clk"),
@@ -129 +130 @@
     //////////////////////////////////////////////////////////////////////////////////
 
+    size_t x_debug;
+    size_t y_debug;
+    size_t p_debug;
+
     ////////////  PROCS  /////////////////////////////////////////////////////////////
     for (size_t p = 0; p < nb_procs; p++)
     {
         std::ostringstream s_proc;
+        x_debug = (debug_proc_id >> (y_width + p_width)) & ((1<<x_width)-1);
+        y_debug = (debug_proc_id >> p_width            ) & ((1<<y_width)-1);
+        p_debug = (debug_proc_id                       ) & ((1<<p_width)-1);
+        
+        
         s_proc << "proc_" << x_id << "_" << y_id << "_" << p;
         proc[p] = new VciCcVCacheWrapper<vci_param_int,
@@ -155 +165 @@
                       frozen_cycles,                  // max frozen cycles
                       debug_start_cycle,
-                      proc_debug_ok);
+                      debug_ok and (x_id == x_debug) and (y_id == y_debug) and (p_debug == p) );
     }
 
@@ -161 +171 @@
     std::ostringstream s_memc;
     s_memc << "memc_" << x_id << "_" << y_id;
+    x_debug = (debug_memc_id >> y_width) & ((1<<x_width)-1);
+    y_debug = (debug_memc_id           ) & ((1<<y_width)-1);
     memc = new VciMemCache<vci_param_int,
                            vci_param_ext,
@@ -179 +191 @@
                      8,                                   // INVALIDATE TABLE DEPTH
                      debug_start_cycle,
-                     memc_debug_ok );
+                     debug_ok and (x_id == x_debug) and (y_id = y_debug) );
 
     std::ostringstream s_wi_memc;
@@ -437 +449 @@
                      8,                                     // IOTLB sets
                      debug_start_cycle,
-                     iob_debug_ok );
+                     debug_iob );
 
         std::ostringstream s_iob_ram_wi;