Changeset 1020 for branches/reconfiguration/modules/dspin_router/caba/source

Timestamp:

Oct 13, 2015, 4:21:08 PM (9 years ago)

Author:

cfuguet

Message:

reconf: improving dspin_router transition function.

File:

• branches/reconfiguration/modules/dspin_router/caba/source/src/dspin_router.cpp (modified) (1 diff)

branches/reconfiguration/modules/dspin_router/caba/source/src/dspin_router.cpp

@@ -321 +321 @@
         const size_t ymax = (data >> (flit_width - 20)) & 0x1F;
 
-        int bhpos = NORMAL;
-        bool recovery = false;
-        if (is_reconfigurable()) {
-            bhpos    = blackhole_position();
-            recovery = is_recovery_routing_enabled();
-        }
-
-        const bool is_n  = recovery and (bhpos == N_OF_X);
-        const bool is_s  = recovery and (bhpos == S_OF_X);
-        const bool is_w  = recovery and (bhpos == W_OF_X);
-        const bool is_e  = recovery and (bhpos == E_OF_X);
-        const bool is_nw = recovery and (bhpos == NW_OF_X);
-        const bool is_ne = recovery and (bhpos == NE_OF_X);
-        const bool is_sw = recovery and (bhpos == SW_OF_X);
-        const bool is_se = recovery and (bhpos == SE_OF_X);
-
-        const bool special = ((data & 0x2) != 0) and recovery;
+        const int bhpos  = is_reconfigurable() ? blackhole_position() : NORMAL;
+        const bool is_n  = (bhpos == N_OF_X);
+        const bool is_s  = (bhpos == S_OF_X);
+        const bool is_w  = (bhpos == W_OF_X);
+        const bool is_e  = (bhpos == E_OF_X);
+        const bool is_nw = (bhpos == NW_OF_X);
+        const bool is_ne = (bhpos == NE_OF_X);
+        const bool is_sw = (bhpos == SW_OF_X);
+        const bool is_se = (bhpos == SE_OF_X);
+
+        const bool special = ((data & 0x2) != 0) and (bhpos != NORMAL);
 
         int sel = REQ_NOP;